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

Commit: af88793d6dd28c207264fa0440ba5744d1fdc36f Author: Julien Pauli <jpauli@php.net> Wed, 1 Oct 2014 16:22:07 +0200 Parents: f68da34119af90223c7f7118ff6c73f50e9bcdd4 Branches: PHP-5.5.18 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af88793d6dd28c207264fa0440ba5744d1fdc36f Log: Revert "Merge branch 'PHP-5.4' into PHP-5.5" This reverts commit 5ac2e5f850c483394870dadca465c1322a4a51cf, reversing changes made to 58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec. Conflicts: ext/openssl/xp_ssl.c Changed paths: M ext/openssl/xp_ssl.c Diff: diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 6c92296..42e77d5 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -203,37 +203,7 @@ 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 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) /* {{{ */ +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; int nr_bytes = 0;