diff options
author | Stanislav Malyshev <stas@php.net> | 2014-09-26 00:44:24 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-09-26 00:44:24 -0700 |
commit | 408b17201715cfebf4de464d525dcada1f83d843 (patch) | |
tree | 5f4955f6061a8c56d4816fb5d809a270e6732cb7 | |
parent | e64da8c20df3ec28bd2417924b207b870e9ab99f (diff) | |
download | php-git-408b17201715cfebf4de464d525dcada1f83d843.tar.gz |
Revert xp_ssl.c to the state of 5.4.32 due to regressions
-rw-r--r-- | ext/openssl/xp_ssl.c | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index b2a939df3d..3082c839d9 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); @@ -871,21 +825,6 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS case PHP_STREAM_AS_FD_FOR_SELECT: if (ret) { - /* OpenSSL has an internal buffer which select() cannot see. If we don't - * fetch it into the stream's buffer, no activity will be reported on the - * stream even though there is data waiting to be read - but we only fetch - * the lower of bytes OpenSSL has ready to give us or chunk_size since we - * weren't asked for any data at this stage. This is only likely to cause - * issues with non-blocking streams, but it's harmless to always do it. */ - size_t pending; - if (stream->writepos == stream->readpos - && sslsock->ssl_active - && (pending = (size_t)SSL_pending(sslsock->ssl_handle)) > 0) { - php_stream_fill_read_buffer(stream, pending < stream->chunk_size - ? pending - : stream->chunk_size); - } - *(int *)ret = sslsock->s.socket; } return SUCCESS; |