archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean up proc_open() implementation

Browse source 
Closes GH-5507.
This commit is contained in:
Alex Dowad 2020-05-01 13:03:16 +02:00 • committed by Nikita Popov
parent 66d57bf8d6
commit 51b0494e2f
3 changed files with 429 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

847
ext/standard/proc_open.c
View file

File diff suppressed because it is too large Load diff

2
ext/standard/proc_open.h
View file

@ -17,9 +17,11 @@
#ifdef PHP_WIN32 #ifdef PHP_WIN32
typedef HANDLE php_file_descriptor_t; typedef HANDLE php_file_descriptor_t;
typedef DWORD php_process_id_t; typedef DWORD php_process_id_t;
# define PHP_INVALID_FD INVALID_HANDLE_VALUE
#else #else
typedef int php_file_descriptor_t; typedef int php_file_descriptor_t;
typedef pid_t php_process_id_t; typedef pid_t php_process_id_t;
# define PHP_INVALID_FD (-1)
#endif #endif
/* Environment block under win32 is a NUL terminated sequence of NUL terminated /* Environment block under win32 is a NUL terminated sequence of NUL terminated

2
ext/standard/tests/general_functions/proc_open_redirect.phpt
View file

@ -53,7 +53,7 @@ proc_close($proc);
?> ?>
--EXPECTF-- --EXPECTF--
Missing redirection target Missing redirection target
Redirection target must be an integer Redirection target must be of type int, string given
Warning: proc_open(): Redirection target 42 not found in %s Warning: proc_open(): Redirection target 42 not found in %s