diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-05 12:16:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-11-05 12:16:17 +0100 |
| commit | c849438bd0456d742299f369d52918daf1d2d9dc (patch) | |
| tree | e4695ba1adc6ae3479fa06a558e1b12ab1c939ec /ext/openssl | |
| parent | 22725639cc0512c40dcee35dada6175e3df9deee (diff) | |
| parent | 3e41ade638b215a1e9a5ece40ecf25485fcb9788 (diff) | |
| download | php-git-c849438bd0456d742299f369d52918daf1d2d9dc.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78775
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index b898c2b308..30863be6e9 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1963,6 +1963,7 @@ static int php_openssl_enable_crypto(php_stream *stream, do { struct timeval cur_time, elapsed_time; + ERR_clear_error(); if (sslsock->is_client) { n = SSL_connect(sslsock->ssl_handle); } else { @@ -2135,6 +2136,7 @@ static ssize_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, si } /* Now, do the IO operation. Don't block if we can't complete... */ + ERR_clear_error(); if (read) { nr_bytes = SSL_read(sslsock->ssl_handle, buf, (int)count); |