]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1769332 from trunk:
authorJim Jagielski <jim@apache.org>
Mon, 21 Nov 2016 12:17:46 +0000 (12:17 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 21 Nov 2016 12:17:46 +0000 (12:17 +0000)
commit87d8774489d998541365e968548afc7df5061baa
tree2a67b0acd018e591445bb2b029eb285a402b400d
parent9dfa9c4839b42b2821fdca370993368aa77fe429
Merge r1769332 from trunk:

ssl: clear the error queue before SSL_read/write/accept()

If other modules or libraries do not clear the OpenSSL error queue after
a failed operation, other code that relies on SSL_get_error() -- in
particular, code that deals with SSL_ERROR_WANT_READ/WRITE logic -- will
malfunction later on. To prevent this, explicitly clear the error queue
before calls like SSL_read/write/accept().

PR: 60223
Submitted by: Paul Spangler <paul.spangler ni.com>
Submitted by: jchampion
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1770673 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/ssl/ssl_engine_io.c