mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Fixed bug #41984 (Hangs on large SoapClient requests)
This commit is contained in:
parent
335cac3c6a
commit
78932ba2f9
1
NEWS
1
NEWS
@ -72,6 +72,7 @@ PHP NEWS
|
|||||||
- Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
|
- Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
|
||||||
(bob at mroczka dot com, Jani)
|
(bob at mroczka dot com, Jani)
|
||||||
- Fixed bug #41989 (move_uploaded_file() & relative path in ZTS mode). (Tony)
|
- 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 #41983 (Error Fetching http headers terminated by '\n'). (Dmitry)
|
||||||
- Fixed bug #41964 (strtotime returns a timestamp for non-time string of
|
- Fixed bug #41964 (strtotime returns a timestamp for non-time string of
|
||||||
pattern '(A|a) .+'). (Derick)
|
pattern '(A|a) .+'). (Derick)
|
||||||
|
@ -31,6 +31,10 @@
|
|||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MSG_DONTWAIT
|
||||||
|
# define MSG_DONTWAIT 0
|
||||||
|
#endif
|
||||||
|
|
||||||
php_stream_ops php_stream_generic_socket_ops;
|
php_stream_ops php_stream_generic_socket_ops;
|
||||||
PHPAPI php_stream_ops php_stream_socket_ops;
|
PHPAPI php_stream_ops php_stream_socket_ops;
|
||||||
php_stream_ops php_stream_udp_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;
|
ptimeout = &sock->timeout;
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
didwrite = send(sock->socket, buf, count, 0);
|
didwrite = send(sock->socket, buf, count, (sock->is_blocked && ptimeout) ? MSG_DONTWAIT : 0);
|
||||||
|
|
||||||
if (didwrite <= 0) {
|
if (didwrite <= 0) {
|
||||||
long err = php_socket_errno();
|
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;
|
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));
|
stream->eof = (nr_bytes == 0 || (nr_bytes == -1 && php_socket_errno() != EWOULDBLOCK));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user