add backlock socket context option for stream_socket_server(),

which had a hardcoded backlog of 5 at two occurrances

diff --git a/main/streams/transports.c b/main/streams/transports.c
index cd44cba1c2f827ff4d40d570d471ab97cd51546f..56b869db5d3521a3d0430a2a7d89e90a41cf9381 100644 (file)
--- a/main/streams/transports.c
+++ b/main/streams/transports.c
@@ -157,7 +157,20 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, long namelen, int
                                        ERR_RETURN(error_string, error_text, "bind() failed: %s");
                                        failed = 1;
                                } else if (flags & STREAM_XPORT_LISTEN) {
-                                       if (0 != php_stream_xport_listen(stream, 5, &error_text TSRMLS_CC)) {
+                                       zval **zbacklog = NULL;
+                                       int backlog = 32;
+                                       
+                                       if (stream->context && php_stream_context_get_option(stream->context, "socket", "backlog", &zbacklog) == SUCCESS) {
+                                               zval *ztmp = *zbacklog;
+                                               
+                                               convert_to_long_ex(&ztmp);
+                                               backlog = Z_LVAL_P(ztmp);
+                                               if (ztmp != *zbacklog) {
+                                                       zval_ptr_dtor(&ztmp);
+                                               }
+                                       }
+                                       
+                                       if (0 != php_stream_xport_listen(stream, backlog, &error_text TSRMLS_CC)) {
                                                ERR_RETURN(error_string, error_text, "listen() failed: %s");
                                                failed = 1;
                                        }

diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index a84ceb64c2f34c7da7b63eb8540a363609a0d750..a260586e8b414d6aaa94435d0d900a98068bf4dd 100644 (file)
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -324,7 +324,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void
 
                        switch (xparam->op) {
                                case STREAM_XPORT_OP_LISTEN:
-                                       xparam->outputs.returncode = (listen(sock->socket, 5) == 0) ?  0: -1;
+                                       xparam->outputs.returncode = (listen(sock->socket, xparam->inputs.backlog) == 0) ?  0: -1;
                                        return PHP_STREAM_OPTION_RETURN_OK;
 
                                case STREAM_XPORT_OP_GET_NAME: