Author: rhuijben
Date: Mon Nov 16 23:42:03 2015
New Revision: 1714713
URL: http://svn.apache.org/viewvc?rev=1714713&view=rev
Log:
* incoming.c
(read_from_client): If the initial peek fails, properly close the connection.
Modified:
serf/trunk/incoming.c
Modified: serf/trunk/incoming.c
URL:
http://svn.apache.org/viewvc/serf/trunk/incoming.c?rev=1714713&r1=1714712&r2=1714713&view=diff
==============================================================================
--- serf/trunk/incoming.c (original)
+++ serf/trunk/incoming.c Mon Nov 16 23:42:03 2015
@@ -285,12 +285,12 @@ static apr_status_t read_from_client(ser
if (client->proto_peek_bkt)
{
status = perform_peek_protocol(client);
- if (status)
- return status;
/* Did we switch protocol? */
- if (client->perform_read != read_from_client)
+ if (!status && client->perform_read != read_from_client)
return client->perform_read(client);
+
+ /* On error fall through in connection cleanup below while */
}
while (status == APR_SUCCESS) {
