clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

exec'd processes now get cleaned up even if the browser connections was

Browse Source 
aborted.
fixes: #8143
This commit is contained in:
Thies C. Arntzen 2001-01-10 13:08:14 +00:00
parent 2b3d9d7ec4
commit 6871b839b5
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/standard/exec.c
View File

@ -23,6 +23,7 @@
#include "php_string.h"
#include "safe_mode.h"
#include "ext/standard/head.h"
#include "ext/standard/file.h"
#include "exec.h"
#include "php_globals.h"
#include "SAPI.h"
@ -45,6 +46,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
int buflen = 0;
int t, l, ret, output=1;
int overflow_limit, lcmd, ldir;
int rsrc_id;
char *b, *c, *d=NULL;
PLS_FETCH();
@ -116,6 +118,13 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
array_init(array);
}
}
/* we register the resource so that case of an aborted connection the
* fd gets pclosed
*/
rsrc_id = ZEND_REGISTER_RESOURCE(NULL, fp, php_file_le_fopen());
if (type != 3) {
l=0;
while ( !feof(fp) || l != 0 ) {
@ -183,8 +192,10 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
if (output) (void)PUTC(buf[i]);
}
}
/* the zend_list_delete will pclose our popen'ed process */
zend_list_delete(rsrc_id);
ret = pclose(fp);
#if HAVE_SYS_WAIT_H
if (WIFEXITED(ret)) {
ret = WEXITSTATUS(ret);