diff options
| author | Anatol Belski <ab@php.net> | 2015-02-13 13:40:10 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-13 13:40:10 +0100 |
| commit | b3d28d14d6cec9b3968dda5da41feb02d5b1b069 (patch) | |
| tree | 2e97c4c00dd5fd8a38e98ab94669c4e5caa4c1b2 | |
| parent | adc42657922be5da0e7fe5ac53027c6c4960ae3e (diff) | |
| parent | 5ff77b005b646e1ae497640d9ddfa37f486f09a8 (diff) | |
| download | php-git-b3d28d14d6cec9b3968dda5da41feb02d5b1b069.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix condition
| -rw-r--r-- | ext/openssl/xp_ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 70ec4591d7..96c282c30d 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1864,7 +1864,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; } |