com php-src: Revert "Merge branch 'PHP-5.5' into PHP-5.6": ext/openssl/xp_ssl.c

From: Date: Wed, 27 Aug 2014 13:28:06 +0000
Subject: com php-src: Revert "Merge branch 'PHP-5.5' into PHP-5.6": ext/openssl/xp_ssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81198@lists.php.net to get a copy of this message
Commit: 030a84a3f06f7c150aa7d081ddb139a7be769c22 Author: Ferenc Kovacs <tyrael@php.net> Wed, 27 Aug 2014 15:28:06 +0200 Parents: 8553a9f10cf9e3a46527541e67db062678723dc0 Branches: PHP-5.6.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=030a84a3f06f7c150aa7d081ddb139a7be769c22 Log: Revert "Merge branch 'PHP-5.5' into PHP-5.6" This reverts commit 98e67add15a6b889efe152c23ed15a61f022a63a, reversing changes made to 2cdc1a2b7473eff27c224c66dcb85118b553a147. Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 45b3d61..1eed2eb 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1798,59 +1798,13 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size } /* }}} */ -static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock TSRMLS_DC) -{ - int retval; - struct timeval *ptimeout; - - if (sock->socket == -1) { - return; - } - - sock->timeout_event = 0; - - if (sock->timeout.tv_sec == -1) - ptimeout = NULL; - else - ptimeout = &sock->timeout; - - while(1) { - retval = php_pollfd_for(sock->socket, PHP_POLLREADABLE, ptimeout); - - if (retval == 0) - sock->timeout_event = 1; - - if (retval >= 0) - break; - - if (php_socket_errno() != EINTR) - break; - } -} - static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) /* {{{ */ { php_openssl_netstream_data_t *sslsock = (php_openssl_netstream_data_t*)stream->abstract; - php_netstream_data_t *sock; int nr_bytes = 0; if (sslsock->ssl_active) { int retry = 1; - sock = (php_netstream_data_t*)stream->abstract; - - /* The SSL_read() function will block indefinitely waiting for data on a blocking - socket. If we don't poll for readability first this operation has the potential - to hang forever. To avoid this scenario we poll with a timeout before performing - the actual read. If it times out we're finished. - */ - if (sock->is_blocked) { - php_openssl_stream_wait_for_data(sock); - if (sock->timeout_event) { - stream->eof = 1; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL read operation timed out"); - return nr_bytes; - } - } do { nr_bytes = SSL_read(sslsock->ssl_handle, buf, count);

« previous php.cvs (#81198) next »