mirror of
https://github.com/php/php-src.git
synced 2024-11-26 19:33:55 +08:00
Make exec() fwork on Unix again
This commit is contained in:
parent
16c363182d
commit
8fd20c3ec7
@ -86,7 +86,11 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
|
||||
tmp = php_escape_shell_cmd(d);
|
||||
efree(d);
|
||||
d = tmp;
|
||||
#ifdef PHP_WIN32
|
||||
fp = V_POPEN(d, "rb");
|
||||
#else
|
||||
fp = V_POPEN(d, "r");
|
||||
#endif
|
||||
if (!fp) {
|
||||
php_error(E_WARNING, "Unable to fork [%s]", d);
|
||||
efree(d);
|
||||
@ -94,7 +98,11 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
|
||||
return -1;
|
||||
}
|
||||
} else { /* not safe_mode */
|
||||
#ifdef PHP_WIN32
|
||||
fp = V_POPEN(cmd, "rb");
|
||||
#else
|
||||
fp = V_POPEN(cmd, "r");
|
||||
#endif
|
||||
if (!fp) {
|
||||
php_error(E_WARNING, "Unable to fork [%s]", cmd);
|
||||
efree(buf);
|
||||
|
Loading…
Reference in New Issue
Block a user