svn commit: r1716050 - /serf/trunk/incoming.c

[rhuijben]

Author: rhuijben
Date: Tue Nov 24 07:49:23 2015
New Revision: 1716050

URL: http://svn.apache.org/viewvc?rev=1716050&view=rev
Log:
* incoming.c
  (read_from_client): Avoid function pointer compare by using a
    different test.

Modified:
    serf/trunk/incoming.c

Modified: serf/trunk/incoming.c
URL: 
http://svn.apache.org/viewvc/serf/trunk/incoming.c?rev=1716050&r1=1716049&r2=1716050&view=diff
==============================================================================
--- serf/trunk/incoming.c (original)
+++ serf/trunk/incoming.c Tue Nov 24 07:49:23 2015
@@ -255,8 +255,12 @@ static apr_status_t read_from_client(ser
         status = perform_peek_protocol(client);
 
         /* Did we switch protocol? */
-        if (!status && client->perform_read != read_from_client)
+        if (!status
+            && client->framing_type != SERF_CONNECTION_FRAMING_TYPE_NONE
+            && client->framing_type != SERF_CONNECTION_FRAMING_TYPE_HTTP1)
+        {
             return client->perform_read(client);
+        }
 
         /* On error fall through in connection cleanup below while */
     }