You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@serf.apache.org by je...@apache.org on 2020/03/31 14:11:27 UTC
svn commit: r1875937 -
/serf/branches/1.3.x-ssltest/test/server/test_sslserver.c
Author: jerenkrantz
Date: Tue Mar 31 14:11:27 2020
New Revision: 1875937
URL: http://svn.apache.org/viewvc?rev=1875937&view=rev
Log:
Fix test case with OpenSSL 1.1.1e+.
OpenSSL now returns EOF on a read. Upstream OpenSSL commit:
https://github.com/openssl/openssl/commit/d924dbf4ae127c68463bcbece04b6e06abc58928
* test/server/test_sslserver.c
(ssl_socket_read): Handle new non-fatal error code from OpenSSL 1.1.1e+.
Reported by: James McCoy <ja...@debian.org>
Modified:
serf/branches/1.3.x-ssltest/test/server/test_sslserver.c
Modified: serf/branches/1.3.x-ssltest/test/server/test_sslserver.c
URL: http://svn.apache.org/viewvc/serf/branches/1.3.x-ssltest/test/server/test_sslserver.c?rev=1875937&r1=1875936&r2=1875937&view=diff
==============================================================================
--- serf/branches/1.3.x-ssltest/test/server/test_sslserver.c (original)
+++ serf/branches/1.3.x-ssltest/test/server/test_sslserver.c Tue Mar 31 14:11:27 2020
@@ -424,6 +424,15 @@ ssl_socket_read(serv_ctx_t *serv_ctx, ch
*len = 0;
return APR_EAGAIN;
case SSL_ERROR_SSL:
+#ifdef SSL_R_UNEXPECTED_EOF_WHILE_READING
+ /* OpenSSL 1.1.1e+ returns an error on EOF now. */
+ if (ERR_GET_REASON(ERR_peek_error()) ==
+ SSL_R_UNEXPECTED_EOF_WHILE_READING) {
+ *len = 0;
+ return APR_EOF;
+ }
+ /* Fallthrough */
+#endif
default:
*len = 0;
serf__log(TEST_VERBOSE, __FILE__,