gwynne Mon, 20 Jul 2009 11:48:04 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284431
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
U php/php-src/branches/PHP_5_3/ext/standard/proc_open.h
D
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt
D
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt
D
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt
D
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt
D
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt
D
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt
Log:
revert Nuno's commit of my patch
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-07-20 11:48:04 UTC (rev 284431)
@@ -5,8 +5,6 @@
Functors. (Christian Seiler)
- Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
Stas)
-- Added support for proc_open()'s bypass_shell feature for Unix systems
- (Gwynne, Nuno)
- Fixed bug #48929 (Double \r\n after HTTP headers when "header" context
option is an array). (David Zülke)
Modified: php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-07-20 11:48:04 UTC (rev 284431)
@@ -71,56 +71,6 @@
static int le_proc_open;
-#if !defined(PHP_WIN32) && !defined(NETWARE)
-/* {{{ _php_array_to_argv */
-static char **_php_array_to_argv(zval *arg_array, int is_persistent)
-{
- zval **element, temp;
- char **c_argv, **ap;
- HashTable *target_hash;
- HashPosition pos;
-
- target_hash = Z_ARRVAL_P(arg_array);
- ap = c_argv = (char **)pecalloc(zend_hash_num_elements(target_hash) + 1, sizeof(char *), is_persistent);
-
- /* skip first element */
- zend_hash_internal_pointer_reset_ex(target_hash, &pos);
- zend_hash_move_forward_ex(target_hash, &pos);
- for ( ;
- zend_hash_get_current_data_ex(target_hash, (void **) &element, &pos) == SUCCESS;
- zend_hash_move_forward_ex(target_hash, &pos)) {
-
- temp = **element;
- if (Z_TYPE_PP(element) != IS_STRING) {
- zval_copy_ctor(&temp);
- convert_to_string(&temp);
- }
- *ap++ = pestrndup(Z_STRVAL(temp), Z_STRLEN(temp), is_persistent);
- if (Z_TYPE_PP(element) != IS_STRING) {
- zval_dtor(&temp);
- }
- }
-
- return c_argv;
-}
-/* }}} */
-
-/* {{{ _php_free_argv */
-static void _php_free_argv(char **argv, int is_persistent)
-{
- if (argv) {
- char **ap = NULL;
-
- for (ap = argv; *ap; ap++) {
- pefree(*ap, is_persistent);
- }
- pefree(argv, is_persistent);
- }
-}
-/* }}} */
-
-#endif
-
/* {{{ _php_array_to_envp */
static php_process_env_t _php_array_to_envp(zval *environment, int is_persistent TSRMLS_DC)
{
@@ -227,6 +177,8 @@
}
assert(p - env.envp <= sizeenv);
+
+ zend_hash_internal_pointer_reset_ex(target_hash, &pos);
return env;
}
@@ -291,9 +243,6 @@
FG(pclose_ret) = -1;
#endif
_php_free_envp(proc->env, proc->is_persistent);
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- _php_free_argv(proc->argv, proc->is_persistent);
-#endif
pefree(proc->command, proc->is_persistent);
pefree(proc, proc->is_persistent);
@@ -516,7 +465,6 @@
Run a process with more control over it's file descriptors */
PHP_FUNCTION(proc_open)
{
- zval *command_with_args = NULL;
char *command, *cwd=NULL;
int command_len, cwd_len = 0;
zval *descriptorspec;
@@ -529,7 +477,6 @@
zval **descitem = NULL;
HashPosition pos;
struct php_proc_open_descriptor_item descriptors[PHP_PROC_OPEN_MAX_DESCRIPTORS];
- char** child_argv = NULL;
#ifdef PHP_WIN32
PROCESS_INFORMATION pi;
HANDLE childHandle;
@@ -541,6 +488,7 @@
UINT old_error_mode;
#endif
#ifdef NETWARE
+ char** child_argv = NULL;
char* command_dup = NULL;
char* orig_cwd = NULL;
int command_num_args = 0;
@@ -551,85 +499,43 @@
int is_persistent = 0; /* TODO: ensure that persistent procs will work */
#ifdef PHP_WIN32
int suppress_errors = 0;
-#endif
int bypass_shell = 0;
+#endif
#if PHP_CAN_DO_PTS
php_file_descriptor_t dev_ptmx = -1; /* master */
php_file_descriptor_t slave_pty = -1;
#endif
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zaz|s!a!a!", &command_with_args,
- &descriptorspec, &pipes, &cwd, &cwd_len, &environment,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "saz|s!a!a!", &command,
+ &command_len, &descriptorspec, &pipes, &cwd, &cwd_len, &environment,
&other_options) == FAILURE) {
RETURN_FALSE;
}
+ if (FAILURE == php_make_safe_mode_command(command, &command, is_persistent TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
+
+#ifdef PHP_WIN32
if (other_options) {
zval **item;
-#ifdef PHP_WIN32
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(other_options), "suppress_errors", sizeof("suppress_errors"), (void**)&item)) {
if ((Z_TYPE_PP(item) == IS_BOOL || Z_TYPE_PP(item) == IS_LONG) &&
Z_LVAL_PP(item)) {
suppress_errors = 1;
}
- }
-#endif
+ }
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(other_options), "bypass_shell", sizeof("bypass_shell"), (void**)&item)) {
if ((Z_TYPE_PP(item) == IS_BOOL || Z_TYPE_PP(item) == IS_LONG) &&
Z_LVAL_PP(item)) {
bypass_shell = 1;
}
- }
+ }
}
-
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- if (bypass_shell) {
- zval **item;
-
- if (Z_TYPE_P(command_with_args) != IS_ARRAY) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "first parameter must be array when bypass_shell is on");
- RETURN_FALSE;
- }
- if (zend_hash_num_elements(Z_ARRVAL_P(command_with_args)) < 1) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "arguments array must have at least one element");
- RETURN_FALSE;
- }
-
- zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(command_with_args), &pos);
- if (zend_hash_get_current_data_ex(Z_ARRVAL_P(command_with_args), (void **)&item, &pos) == SUCCESS) {
- if (Z_TYPE_PP(item) == IS_STRING && Z_STRLEN_PP(item) > 0) {
- command = Z_STRVAL_PP(item);
- } else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "first argument must be a nonempty string");
- RETURN_FALSE;
- }
- } else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "first argument must be at index 0");
- RETURN_FALSE;
- }
- } else {
#endif
- if (Z_TYPE_P(command_with_args) != IS_STRING) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s() expects parameter 1 to be string, %s given", get_active_function_name(TSRMLS_C),
- zend_zval_type_name(command_with_args));
- RETURN_FALSE;
- }
- command = Z_STRVAL_P(command_with_args);
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- }
-#endif
-
- if (FAILURE == php_make_safe_mode_command(command, &command, is_persistent TSRMLS_CC)) {
- RETURN_FALSE;
- }
+
command_len = strlen(command);
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- if (bypass_shell) {
- child_argv = _php_array_to_argv(command_with_args, is_persistent);
- }
-#endif
-
if (environment) {
env = _php_array_to_envp(environment, is_persistent TSRMLS_CC);
} else {
@@ -979,11 +885,7 @@
chdir(cwd);
}
- if (bypass_shell && env.envarray) {
- execve(command, child_argv, env.envarray);
- } else if (bypass_shell) {
- execv(command, child_argv);
- } else if (env.envarray) {
+ if (env.envarray) {
execle("/bin/sh", "sh", "-c", command, NULL, env.envarray);
} else {
execl("/bin/sh", "sh", "-c", command, NULL);
@@ -1019,9 +921,6 @@
proc->childHandle = childHandle;
#endif
proc->env = env;
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- proc->argv = child_argv;
-#endif
if (pipes != NULL) {
zval_dtor(pipes);
@@ -1096,9 +995,6 @@
return;
exit_fail:
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- _php_free_argv(child_argv, is_persistent);
-#endif
_php_free_envp(env, is_persistent);
pefree(command, is_persistent);
#if PHP_CAN_DO_PTS
Modified: php/php-src/branches/PHP_5_3/ext/standard/proc_open.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/proc_open.h 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.h 2009-07-20 11:48:04 UTC (rev 284431)
@@ -48,8 +48,5 @@
char *command;
int is_persistent;
php_process_env_t env;
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- char **argv;
-#endif
};
Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open03.phpt 2009-07-20 11:48:04 UTC (rev 284431)
@@ -1,32 +0,0 @@
---TEST--
-proc_open with bypass_shell
---SKIPIF--
-<?php # vim:syn=php
-if (!is_executable("/bin/cat")) echo "skip";
-if (!function_exists("proc_open")) echo "skip proc_open() is not available";
-if( substr(PHP_OS, 0, 3) == 'WIN' ) die("skip this test for non-Windows systems only ");
-?>
---FILE--
-<?php
-$ds = array(
- 0 => array("pipe", "r"),
- 1 => array("pipe", "w"),
- 2 => array("pipe", "w")
- );
-
-$cat = proc_open(
- array("/bin/cat"),
- $ds,
- $pipes,
- NULL,
- NULL,
- array('bypass_shell' => TRUE)
- );
-
-proc_close($cat);
-
-echo "I didn't segfault!\n";
-
-?>
---EXPECT--
-I didn't segfault!
Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open04.phpt 2009-07-20 11:48:04 UTC (rev 284431)
@@ -1,32 +0,0 @@
---TEST--
-proc_open with bypass_shell
---SKIPIF--
-<?php # vim:syn=php
-if (!is_executable("/bin/echo")) echo "skip";
-if (!function_exists("proc_open")) echo "skip proc_open() is not available";
-if( substr(PHP_OS, 0, 3) == 'WIN' ) die("skip this test for non-Windows systems only ");
-?>
---FILE--
-<?php
-$ds = array(
- 0 => array("pipe", "r"),
- 1 => array("pipe", "w"),
- 2 => array("pipe", "w")
- );
-
-$cat = proc_open(
- array("/bin/echo", "echo", "asdf"),
- $ds,
- $pipes,
- NULL,
- NULL,
- array('bypass_shell' => TRUE)
- );
-
-echo stream_get_contents($pipes[1]);
-
-proc_close($cat);
-
-?>
---EXPECT--
-asdf
Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open05.phpt 2009-07-20 11:48:04 UTC (rev 284431)
@@ -1,34 +0,0 @@
---TEST--
-proc_open with bypass_shell and environment
---SKIPIF--
-<?php # vim:syn=php
-if (!is_executable("/usr/bin/env")) echo "skip";
-if (!function_exists("proc_open")) echo "skip proc_open() is not available";
-if( substr(PHP_OS, 0, 3) == 'WIN' ) die("skip this test for non-Windows systems only ");
-?>
---FILE--
-<?php
-$ds = array(
- 0 => array("pipe", "r"),
- 1 => array("pipe", "w"),
- 2 => array("pipe", "w")
- );
-
-$cat = proc_open(
- array("/usr/bin/env", "env"),
- $ds,
- $pipes,
- NULL,
- array("TEST_ENV" => 42, "TEST_ENV_2" => 84),
- array('bypass_shell' => TRUE)
- );
-
-echo stream_get_contents($pipes[1]);
-
-proc_close($cat);
-
-// %A is put under EXPECTF as Valgrind will append extra environment
-?>
---EXPECTF--
-TEST_ENV=42
-TEST_ENV_2=84%A
Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open06.phpt 2009-07-20 11:48:04 UTC (rev 284431)
@@ -1,32 +0,0 @@
---TEST--
-proc_open with bypass_shell, environment, and non-string arguments
---SKIPIF--
-<?php # vim:syn=php
-if (!is_executable("/bin/echo")) echo "skip";
-if (!function_exists("proc_open")) echo "skip proc_open() is not available";
-if (substr(PHP_OS, 0, 3) == 'WIN') echo "skip this test for non-Windows systems only";
-?>
---FILE--
-<?php
-$ds = array(
- 0 => array("pipe", "r"),
- 1 => array("pipe", "w"),
- 2 => array("pipe", "w")
- );
-
-$cat = proc_open(
- array("/bin/echo", "echo", 1, 2, 3, 4, 5),
- $ds,
- $pipes,
- NULL,
- array("TEST_ENV" => 42, "TEST_ENV_2" => 84),
- array('bypass_shell' => TRUE)
- );
-
-echo stream_get_contents($pipes[1]);
-
-proc_close($cat);
-
-?>
---EXPECTF--
-1 2 3 4 5
Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open07.phpt 2009-07-20 11:48:04 UTC (rev 284431)
@@ -1,31 +0,0 @@
---TEST--
-proc_open with no argv
---SKIPIF--
-<?php # vim:syn=php
-if (!function_exists("proc_open")) echo "skip proc_open() is not available";
-if (substr(PHP_OS, 0, 3) == 'WIN') echo "skip this test for non-Windows systems only";
-?>
---FILE--
-<?php
-$ds = array(
- 0 => array("pipe", "r"),
- 1 => array("pipe", "w"),
- 2 => array("pipe", "w")
- );
-
-$cat = proc_open(
- array(),
- $ds,
- $pipes,
- NULL,
- array("TEST_ENV" => 42, "TEST_ENV_2" => 84),
- array('bypass_shell' => TRUE)
- );
-
-var_dump($cat);
-
-?>
---EXPECTF--
-
-Warning: proc_open(): arguments array must have at least one element in %s/proc_open07.php on line %d
-bool(false)
Deleted: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt 2009-07-20 11:47:33 UTC (rev 284430)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open08.phpt 2009-07-20 11:48:04 UTC (rev 284431)
@@ -1,44 +0,0 @@
---TEST--
-proc_open with only one argv
---DESCRIPTION--
-This test tries out a very esoteric functionality: Passing no argv[0] to a
-program. There's absolutely no reason anyone would do this in practice, but the
-entire point of the bypass_shell patch was to allow 100% control over the child
-process, so the option is there. Keep in mind that actually using this
-"feature" will probably crash most programs one could run, since the expression
-argc > 0 in a main() function is pretty much guaranteed by POSIX. It's
-interesting to note that PHP itself handles this case gracefully.
---SKIPIF--
-<?php # vim:syn=php
-if (!is_executable($_ENV['TEST_PHP_EXECUTABLE'])) echo "skip";
-if (!function_exists("proc_open")) echo "skip proc_open() is not available";
-if (substr(PHP_OS, 0, 3) == 'WIN') echo "skip this test for non-Windows systems only";
-?>
---FILE--
-<?php
-$ds = array(
- 0 => array("pipe", "r"),
- 1 => array("pipe", "w"),
- 2 => array("pipe", "w")
- );
-
-$cat = proc_open(
- array($_ENV['TEST_PHP_EXECUTABLE']),
- $ds,
- $pipes,
- NULL,
- NULL,
- array('bypass_shell' => TRUE)
- );
-
-fprintf($pipes[0], '<?php error_reporting(E_ALL); var_dump($argv); ?>');
-fclose($pipes[0]);
-
-echo stream_get_contents($pipes[1]);
-
-proc_close($cat);
-
-?>
---EXPECTF--
-Notice: Undefined variable: argv in %s- on line 1
-NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
