Fixed bug #41984 (Hangs on large SoapClient requests)

diff --git a/NEWS b/NEWS
index 7b1422caa9713a5d2331c0e233121696d173a541..9b051659ddd30e0a3d0c414fd9b805b456b71438 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,7 @@ PHP                                                                        NEWS
 - Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
   (bob at mroczka dot com, Jani)
 - Fixed bug #41989 (move_uploaded_file() & relative path in ZTS mode). (Tony)
+- Fixed bug #41984 (Hangs on large SoapClient requests). (Dmitry)
 - Fixed bug #41983 (Error Fetching http headers terminated by '\n'). (Dmitry)
 - Fixed bug #41964 (strtotime returns a timestamp for non-time string of
   pattern '(A|a) .+'). (Derick)

diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index e502489e3ad9dc0a0ed6d2f90d7c972b59a42d0e..778d1c7597d72c002c44187e32ad6b154dc8fe1d 100644 (file)
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -31,6 +31,10 @@
 #include <sys/un.h>
 #endif
 
+#ifndef MSG_DONTWAIT
+# define MSG_DONTWAIT 0
+#endif
+
 php_stream_ops php_stream_generic_socket_ops;
 PHPAPI php_stream_ops php_stream_socket_ops;
 php_stream_ops php_stream_udp_socket_ops;
@@ -59,7 +63,7 @@ static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count
                ptimeout = &sock->timeout;
 
 retry:
-       didwrite = send(sock->socket, buf, count, 0);
+       didwrite = send(sock->socket, buf, count, (sock->is_blocked && ptimeout) ? MSG_DONTWAIT : 0);
 
        if (didwrite <= 0) {
                long err = php_socket_errno();
@@ -148,7 +152,7 @@ static size_t php_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS
                        return 0;
        }
 
-       nr_bytes = recv(sock->socket, buf, count, 0);
+       nr_bytes = recv(sock->socket, buf, count, (sock->is_blocked && sock->timeout.tv_sec != -1) ? MSG_DONTWAIT : 0);
 
        stream->eof = (nr_bytes == 0 || (nr_bytes == -1 && php_socket_errno() != EWOULDBLOCK));