serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1709673 - /serf/trunk/outgoing.c
Date Tue, 20 Oct 2015 20:06:46 GMT
Author: rhuijben
Date: Tue Oct 20 20:06:46 2015
New Revision: 1709673

URL: http://svn.apache.org/viewvc?rev=1709673&view=rev
Log:
Following up on r1708898, make sure no http/1.1 data is written directly
after switching the protocol.

* serf-dev/dev/outgoing.c
  (read_from_connection): Properly reset write_now and don't handle http11
    reading when using any different protocol.

Modified:
    serf/trunk/outgoing.c

Modified: serf/trunk/outgoing.c
URL: http://svn.apache.org/viewvc/serf/trunk/outgoing.c?rev=1709673&r1=1709672&r2=1709673&view=diff
==============================================================================
--- serf/trunk/outgoing.c (original)
+++ serf/trunk/outgoing.c Tue Oct 20 20:06:46 2015
@@ -1024,14 +1024,15 @@ static apr_status_t read_from_connection
 
             /* Unexpected response from the server */
             if (conn->write_now) {
-                status = write_to_connection(conn);
+                conn->write_now = 0;
+                status = conn->perform_write(conn);
 
                 if (!SERF_BUCKET_READ_ERROR(status))
                     status = APR_SUCCESS;
             }
         }
 
-        if (conn->framing_type == SERF_CONNECTION_FRAMING_TYPE_NONE)
+        if (conn->framing_type != SERF_CONNECTION_FRAMING_TYPE_HTTP1)
             break;
 
         /* If the request doesn't have a response bucket, then call the



Mime
View raw message