diff options
| author | Boris Lytochkin <lytboris@php.net> | 2013-05-03 19:23:46 +0400 |
|---|---|---|
| committer | Boris Lytochkin <lytboris@php.net> | 2013-05-03 19:23:46 +0400 |
| commit | f1269d80c575e535370c813e8da154e0339203d0 (patch) | |
| tree | 309692655ac9bd75d9a2308cc3f02426c0626c68 /ext/standard/streamsfuncs.c | |
| parent | aa448adc8347c072421103d1a92b0a7a75ec873f (diff) | |
| parent | b1ea0b7a7a580f074d889f9ff7a46566917088f2 (diff) | |
| download | php-git-f1269d80c575e535370c813e8da154e0339203d0.tar.gz | |
Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/push/php-src:
Fixed bug #64770 stream_select() fails with pipes
Diffstat (limited to 'ext/standard/streamsfuncs.c')
| -rw-r--r-- | ext/standard/streamsfuncs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 27042f6e5d..465d72d378 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -611,7 +611,7 @@ static int stream_array_to_fd_set(zval *stream_array, fd_set *fds, php_socket_t { zval **elem; php_stream *stream; - php_socket_t this_fd; + php_socket_t this_fd = 0; int cnt = 0; if (Z_TYPE_P(stream_array) != IS_ARRAY) { @@ -648,7 +648,7 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC) zval **elem, **dest_elem; php_stream *stream; HashTable *new_hash; - php_socket_t this_fd; + php_socket_t this_fd = 0; int ret = 0; if (Z_TYPE_P(stream_array) != IS_ARRAY) { |