diff options
author | Brad Broerman <bbroerman@bbroerman.net> | 2015-01-28 22:36:41 -0500 |
---|---|---|
committer | Brad Broerman <bbroerman@bbroerman.net> | 2015-01-28 22:36:41 -0500 |
commit | 1482ed2d5660c3875add40706a18fe29e2b3ff70 (patch) | |
tree | 42a490958f5207ae6f705bf160bf1564d4362ea2 /ext/openssl/xp_ssl.c | |
parent | fd4641696cc67fedf494717b5e4d452019f04d6f (diff) | |
download | php-git-1482ed2d5660c3875add40706a18fe29e2b3ff70.tar.gz |
reneg and should_close are not yet members of sslsock. Removing...
Diffstat (limited to 'ext/openssl/xp_ssl.c')
-rw-r--r-- | ext/openssl/xp_ssl.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 53c48beca7..842829f384 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -242,15 +242,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz /* Now, do the IO operation. Don't block if we can't complete... */ if (read) { - nr_bytes = SSL_read(sslsock->ssl_handle, buf, count); - - if (sslsock->reneg && sslsock->reneg->should_close) { - /* renegotiation rate limiting triggered */ - php_stream_xport_shutdown(stream, (stream_shutdown_t)SHUT_RDWR); - nr_bytes = 0; - stream->eof = 1; - break; - } + nr_bytes = SSL_read(sslsock->ssl_handle, buf, count); } else { nr_bytes = SSL_write(sslsock->ssl_handle, buf, count); } |