commit 0920512bc18e87a4cef7fee7460f8813a3f69808
author Justin Erenkrantz <jerenkrantz@apache.org> Tue Mar 31 14:11:27 2020 +0000
committer Justin Erenkrantz <jerenkrantz@apache.org> Tue Mar 31 14:11:27 2020 +0000
tree 9c8beb48b092c35e3038994cf3227a7fe3468220
parent 47f84429731b6cc82d1e39cd016fe0ba318ab0f8

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 <jamessan@debian.org>


git-svn-id: https://svn.apache.org/repos/asf/serf/branches/1.3.x-ssltest@1875937 13f79535-47bb-0310-9956-ffa450edef68

test/server/test_sslserver.c

diff --git a/test/server/test_sslserver.c b/test/server/test_sslserver.c
index 6c1a028..8ec643f 100644
--- a/test/server/test_sslserver.c
+++ b/test/server/test_sslserver.c
@@ -424,6 +424,15 @@
                 *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__,