Author: rhuijben
Date: Tue Oct 13 22:30:11 2015
New Revision: 1708531
URL: http://svn.apache.org/viewvc?rev=1708531&view=rev
Log:
Try to make tests pass on the mac bots by generalizing the mock server
handling of ssl errors..
* test/MockHTTPinC/MockHTTP_server.c
(sslSocketRead): Generalize behavior a bit in an attempt to fix a few tests
on macos that probably also error out from here.
Modified:
serf/trunk/test/MockHTTPinC/MockHTTP_server.c
Modified: serf/trunk/test/MockHTTPinC/MockHTTP_server.c
URL: http://svn.apache.org/viewvc/serf/trunk/test/MockHTTPinC/MockHTTP_server.c?rev=1708531&r1=1708530&r2=1708531&view=diff
==============================================================================
--- serf/trunk/test/MockHTTPinC/MockHTTP_server.c (original)
+++ serf/trunk/test/MockHTTPinC/MockHTTP_server.c Tue Oct 13 22:30:11 2015
@@ -2649,13 +2649,11 @@ sslSocketRead(apr_socket_t *skt, void *b
*len = 0;
return APR_EAGAIN;
case SSL_ERROR_SSL:
- if (ssl_ctx->renegotiate) {
- /* The client kills the connection, so we can expect protocol
+ /* When the client kills the connection, we can expect protocol
errors... Let's just return that we didn't see an error,
but that the connection was closed. */
*len = 0;
return APR_EOF;
- }
default:
*len = 0;
_mhLog(MH_VERBOSE, skt,
|