dmitry Fri Nov 28 14:21:08 2008 UTC
Modified files:
/php-src/ext/soap php_http.c
Log:
Fixed bug #41534 (SoapClient over HTTPS fails to reestablish connection)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.114&r2=1.115&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.114 php-src/ext/soap/php_http.c:1.115
--- php-src/ext/soap/php_http.c:1.114 Wed Oct 1 13:13:49 2008
+++ php-src/ext/soap/php_http.c Fri Nov 28 14:21:08 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_http.c,v 1.114 2008/10/01 13:13:49 dmitry Exp $ */
+/* $Id: php_http.c,v 1.115 2008/11/28 14:21:08 dmitry Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -31,30 +31,6 @@
#define smart_str_append_const(str, const) \
smart_str_appendl(str,const,sizeof(const)-1)
-static int stream_alive(php_stream *stream TSRMLS_DC)
-{
- int socket;
- char buf;
-
- /* maybe better to use:
- * php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0,
NULL)
- * here instead */
-
- if (stream == NULL || stream->eof || php_stream_cast(stream,
PHP_STREAM_AS_FD_FOR_SELECT, (void**)&socket, 0) != SUCCESS) {
- return FALSE;
- }
- if (socket == -1) {
- return FALSE;
- } else {
- if (php_pollfd_for_ms(socket, PHP_POLLREADABLE, 0) > 0) {
- if (0 == recv(socket, &buf, sizeof(buf), MSG_PEEK) &&
php_socket_errno() != EAGAIN) {
- return FALSE;
- }
- }
- }
- return TRUE;
-}
-
/* Proxy HTTP Authentication */
void proxy_authentication(zval* this_ptr, smart_str* soap_headers TSRMLS_DC)
{
@@ -363,7 +339,7 @@
}
/* Check if keep-alive connection is still opened */
- if (stream != NULL && !stream_alive(stream TSRMLS_CC)) {
+ if (stream != NULL && php_stream_eof(stream)) {
php_stream_close(stream);
if (client->url) {
php_url_free(client->url);
@@ -917,6 +893,7 @@
efree(cookie);
}
+ /* See if the server requested a close */
if (http_1_1) {
http_close = FALSE;
if (use_proxy && !use_ssl) {
@@ -928,8 +905,35 @@
efree(connection);
}
}
+ if (http_close == FALSE) {
+ connection =
get_http_header_value(http_headers,"Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "close",
sizeof("close")-1) == 0) {
+ http_close = TRUE;
+ }
+ efree(connection);
+ }
+ }
} else {
http_close = TRUE;
+ if (use_proxy && !use_ssl) {
+ connection =
get_http_header_value(http_headers,"Proxy-Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
+ http_close = FALSE;
+ }
+ efree(connection);
+ }
+ }
+ if (http_close == TRUE) {
+ connection =
get_http_header_value(http_headers,"Connection: ");
+ if (connection) {
+ if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
+ http_close = FALSE;
+ }
+ efree(connection);
+ }
+ }
}
if (!get_http_body(stream, http_close, http_headers, &http_body,
&http_body_size TSRMLS_CC)) {
@@ -948,31 +952,6 @@
if (request != buf) {efree(request);}
- /* See if the server requested a close */
- http_close = TRUE;
- connection = get_http_header_value(http_headers,"Proxy-Connection: ");
- if (connection) {
- if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
- http_close = FALSE;
- }
- efree(connection);
-/*
- } else if (http_1_1) {
- http_close = FALSE;
-*/
- }
- connection = get_http_header_value(http_headers,"Connection: ");
- if (connection) {
- if (strncasecmp(connection, "Keep-Alive",
sizeof("Keep-Alive")-1) == 0) {
- http_close = FALSE;
- }
- efree(connection);
-/*
- } else if (http_1_1) {
- http_close = FALSE;
-*/
- }
-
if (http_close) {
php_stream_close(stream);
client->stream = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
