From: Pierre Joye Date: Wed, 8 Sep 2010 09:11:18 +0000 (+0000) Subject: - WS X-Git-Tag: php-5.4.0alpha1~191^2~984 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c57bf4a4d979118ecfd63f0b449a7c8c23fa736d;p=php - WS --- diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 6f4d88e942..3916bcccf0 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -119,7 +119,7 @@ static php_process_env_t _php_array_to_envp(zval *environment, int is_persistent } sizeenv += el_len+1; - + switch (zend_hash_get_current_key_ex(target_hash, &string_key, &string_length, &num_key, 0, &pos)) { case HASH_KEY_IS_STRING: if (string_length == 0) { @@ -220,7 +220,6 @@ static void proc_open_rsrc_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) } #ifdef PHP_WIN32 - WaitForSingleObject(proc->childHandle, INFINITE); GetExitCodeProcess(proc->childHandle, &wstatus); FG(pclose_ret) = wstatus;