com php-src: Revert "Bug #41631: Observe socket read timeouts in SSL streams": ext/openssl/xp_ssl.c

From: Date: Wed, 15 Oct 2014 12:38:12 +0000
Subject: com php-src: Revert "Bug #41631: Observe socket read timeouts in SSL streams": ext/openssl/xp_ssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82337@lists.php.net to get a copy of this message
Commit: 6d9c9f8f0468f8d90dc233d6fc70dc949349e6da Author: Julien Pauli <jpauli@php.net> Wed, 15 Oct 2014 14:38:12 +0200 Parents: bb3d43fa05be3c0ae46b5bcc92d2933b00d92d11 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6d9c9f8f0468f8d90dc233d6fc70dc949349e6da Log: Revert "Bug #41631: Observe socket read timeouts in SSL streams" This reverts commit 6569db88081562f68a4f79e52cba83482bdf05fc. Conflicts: ext/openssl/xp_ssl.c Bugs: https://bugs.php.net/41631 Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 5736caa..1ce9541 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -204,59 +204,13 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size return didwrite; } -static void php_openssl_stream_wait_for_data(php_netstream_data_t *sock) -{ - 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 && SSL_pending(sslsock->ssl_handle) == 0) { - 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 (#82337) next »