diff options
| author | Brad Broerman <bbroerman@bbroerman.net> | 2013-01-21 11:35:58 -0500 |
|---|---|---|
| committer | Brad Broerman <bbroerman@bbroerman.net> | 2013-01-21 11:35:58 -0500 |
| commit | fae955a1ae8705f39abc7df545cc9361c79e656c (patch) | |
| tree | 9d526ee5cd9ee55f68da71c03557fe3f5d960ab2 | |
| parent | 277efaffaba80bd0052587d8b445ec84a2c8c885 (diff) | |
| download | php-git-fae955a1ae8705f39abc7df545cc9361c79e656c.tar.gz | |
Updated to fix async reads/writes.
| -rw-r--r-- | ext/openssl/xp_ssl.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 6f9a45ae81..6445bcef7e 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -240,7 +240,7 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size if( errno == EAGAIN && ( err == SSL_ERROR_WANT_READ || SSL_ERROR_WANT_WRITE ) ) retry = 1; - if( retry ) { + if( retry && blocked ) { php_pollfd_for(sslsock->s.socket, (err == SSL_ERROR_WANT_READ) ? (POLLIN|POLLPRI) : (POLLOUT|POLLPRI), has_timeout ? &left_time : NULL); } @@ -249,9 +249,10 @@ static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size if( err == SSL_ERROR_NONE ) break; - - php_pollfd_for(sslsock->s.socket, (err == SSL_ERROR_WANT_READ) ? - (POLLIN|POLLPRI) : (POLLOUT|POLLPRI), has_timeout ? &left_time : NULL); + if( blocked ) { + php_pollfd_for(sslsock->s.socket, (err == SSL_ERROR_WANT_READ) ? + (POLLIN|POLLPRI) : (POLLOUT|POLLPRI), has_timeout ? &left_time : NULL); + } } } while(retry); @@ -347,7 +348,7 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun stream->eof = (retry == 0 && errno != EAGAIN && !SSL_pending(sslsock->ssl_handle)); - if( retry ) { + if( retry && blocked ) { php_pollfd_for(sslsock->s.socket, (err == SSL_ERROR_WANT_WRITE) ? (POLLOUT|POLLPRI) : (POLLIN|POLLPRI), has_timeout ? &left_time : NULL); } @@ -358,9 +359,10 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun if( err == SSL_ERROR_NONE ) break; - - php_pollfd_for(sslsock->s.socket, (err == SSL_ERROR_WANT_WRITE) ? - (POLLOUT|POLLPRI) : (POLLIN|POLLPRI), has_timeout ? &left_time : NULL); + if( blocked ) { + php_pollfd_for(sslsock->s.socket, (err == SSL_ERROR_WANT_WRITE) ? + (POLLOUT|POLLPRI) : (POLLIN|POLLPRI), has_timeout ? &left_time : NULL); + } } } while (retry); @@ -373,9 +375,7 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun php_set_sock_blocking(sslsock->s.socket, 1 TSRMLS_CC); sslsock->s.is_blocked = 1; } - } - else - { + } else { nr_bytes = php_stream_socket_ops.read(stream, buf, count TSRMLS_CC); } @@ -1104,3 +1104,4 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen, * vim<600: noet sw=4 ts=4 */ + |