cvs: php-src(PHP_4_3) /main network.c

From: Date: Sun, 23 May 2004 10:43:15 +0000
Subject: cvs: php-src(PHP_4_3) /main network.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-27421@lists.php.net to get a copy of this message
wez Sun May 23 06:43:15 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/main network.c Log: MFH: Bugfix for #23220: IIS messes up SSL shutdown http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.83.2.24&r2=1.83.2.25&ty=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.83.2.24 php-src/main/network.c:1.83.2.25 --- php-src/main/network.c:1.83.2.24 Mon Apr 19 08:43:26 2004 +++ php-src/main/network.c Sun May 23 06:43:15 2004 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.83.2.24 2004/04/19 12:43:26 wez Exp $ */ +/* $Id: network.c,v 1.83.2.25 2004/05/23 10:43:15 wez Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -746,6 +746,8 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "php_stream_sock_ssl_activate_with_method: failed to create an SSL context"); return FAILURE; } + + SSL_CTX_set_options(ctx, SSL_OP_ALL); sock->ssl_handle = php_SSL_new_from_context(ctx, stream TSRMLS_CC); @@ -846,6 +848,30 @@ } } +/* it doesn't matter that we do some hash traversal here, since it is done only + * in an error condition arising from a network connection problem */ +static int is_http_stream_talking_to_iis(php_stream *stream TSRMLS_DC) +{ + if (stream->wrapperdata && stream->wrapper && strcmp(stream->wrapper->wops->label, "HTTP") == 0) { + /* the wrapperdata is an array zval containing the headers */ + zval **tmp; + +#define SERVER_MICROSOFT_IIS "Server: Microsoft-IIS" + + zend_hash_internal_pointer_reset(Z_ARRVAL_P(stream->wrapperdata)); + while (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(stream->wrapperdata), (void**)&tmp)) { + + if (strncasecmp(Z_STRVAL_PP(tmp), SERVER_MICROSOFT_IIS, sizeof(SERVER_MICROSOFT_IIS)-1) == 0) { + return 1; + } + + zend_hash_move_forward(Z_ARRVAL_P(stream->wrapperdata)); + } + } + return 0; +} + + static int handle_ssl_error(php_stream *stream, int nr_bytes TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; @@ -870,8 +896,11 @@ case SSL_ERROR_SYSCALL: if (ERR_peek_error() == 0) { if (nr_bytes == 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, - "SSL: fatal protocol error"); + if (!is_http_stream_talking_to_iis(stream TSRMLS_CC)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "SSL: fatal protocol error"); + } + SSL_set_shutdown(sock->ssl_handle, SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); stream->eof = 1; retry = 0; } else {

« previous php.cvs (#27421) next »