diff options
| author | Anatol Belski <ab@php.net> | 2014-03-19 06:26:54 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-03-19 06:33:46 +0100 |
| commit | 62f6c5853f87259de320c54d12f7fb213aee4e27 (patch) | |
| tree | cdb2a0d0834752bd816c19a9766705e107ed76e7 /ext/standard/proc_open.c | |
| parent | a6f7fca637a1f872eea6e4d174251cd322539976 (diff) | |
| download | php-git-62f6c5853f87259de320c54d12f7fb213aee4e27.tar.gz | |
Fixes to various stream cast on win64
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
Diffstat (limited to 'ext/standard/proc_open.c')
| -rw-r--r-- | ext/standard/proc_open.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index f4c3b4738c..50ceb605ed 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -34,6 +34,7 @@ #include "exec.h" #include "php_globals.h" #include "SAPI.h" +#include "main/php_network.h" #ifdef NETWARE #include <proc.h> @@ -556,7 +557,7 @@ PHP_FUNCTION(proc_open) if (Z_TYPE_PP(descitem) == IS_RESOURCE) { /* should be a stream - try and dup the descriptor */ php_stream *stream; - int fd; + php_socket_t fd; php_stream_from_zval(stream, descitem); @@ -629,7 +630,7 @@ PHP_FUNCTION(proc_open) } else if (strcmp(Z_STRVAL_PP(ztype), "file") == 0) { zval **zfile, **zmode; - int fd; + php_socket_t fd; php_stream *stream; descriptors[ndesc].mode = DESC_FILE; |