diff options
Diffstat (limited to 'debian/patches/036-fd_setsize_fix.patch')
| -rw-r--r-- | debian/patches/036-fd_setsize_fix.patch | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/debian/patches/036-fd_setsize_fix.patch b/debian/patches/036-fd_setsize_fix.patch index 0adda07c8..c740c0712 100644 --- a/debian/patches/036-fd_setsize_fix.patch +++ b/debian/patches/036-fd_setsize_fix.patch @@ -3,8 +3,10 @@ Origin: vendor Forwarded: no Last-Update: 2010-01-18 ---- a/ext/sockets/sockets.c -+++ b/ext/sockets/sockets.c +Index: php-5.3.3RC3/ext/sockets/sockets.c +=================================================================== +--- php-5.3.3RC3.orig/ext/sockets/sockets.c ++++ php-5.3.3RC3/ext/sockets/sockets.c @@ -720,6 +720,7 @@ static int php_sock_array_to_fd_set(zval php_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket); @@ -13,15 +15,16 @@ Last-Update: 2010-01-18 PHP_SAFE_FD_SET(php_sock->bsd_socket, fds); if (php_sock->bsd_socket > *max_fd) { ---- a/ext/standard/streamsfuncs.c -+++ b/ext/standard/streamsfuncs.c -@@ -610,6 +610,9 @@ static int stream_array_to_fd_set(zval * +Index: php-5.3.3RC3/ext/standard/streamsfuncs.c +=================================================================== +--- php-5.3.3RC3.orig/ext/standard/streamsfuncs.c ++++ php-5.3.3RC3/ext/standard/streamsfuncs.c +@@ -610,6 +610,8 @@ static int stream_array_to_fd_set(zval * * is not displayed. * */ if (SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 1) && this_fd >= 0) { + if (this_fd > FD_SETSIZE) + continue; -+ - + PHP_SAFE_FD_SET(this_fd, fds); |