summaryrefslogtreecommitdiff
path: root/ext/openssl/xp_ssl.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-02-13 13:40:37 +0100
committerAnatol Belski <ab@php.net>2015-02-13 13:40:37 +0100
commitc17e007a293356a5b1e511626addb9f13d4eaaee (patch)
treec7ac00ca0d5cdd0c11149614624d9d72aad5c159 /ext/openssl/xp_ssl.c
parent627a2137617712696137a3b1791b5eeb25a56302 (diff)
parentb3d28d14d6cec9b3968dda5da41feb02d5b1b069 (diff)
downloadphp-git-c17e007a293356a5b1e511626addb9f13d4eaaee.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: fix condition
Diffstat (limited to 'ext/openssl/xp_ssl.c')
-rw-r--r--ext/openssl/xp_ssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 2008c118e6..2165091695 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -1840,7 +1840,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz
if (errno == EAGAIN && err == SSL_ERROR_WANT_READ && read) {
retry = 1;
}
- if (errno == EAGAIN && SSL_ERROR_WANT_WRITE && read == 0) {
+ if (errno == EAGAIN && err == SSL_ERROR_WANT_WRITE && read == 0) {
retry = 1;
}
@@ -2397,4 +2397,4 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, size_t protolen,
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
- */ \ No newline at end of file
+ */