Fix build errors after trunk merge

diff --git a/src/client_side.cc b/src/client_side.cc
index 4e20a9eda71e698995ecb6c550743f5f0db67b0a..3945381553acb259b0088143d3461dc8e5edbe38 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2991,7 +2991,7 @@ ConnStateData::parseProxy1p0()
 
         // skip TCP/IP version number
         static const CharacterSet tcpVersions("TCP-version","46");
-        if(!tok.skip(tcpVersions))
+        if(!tok.skipOne(tcpVersions))
             return proxyProtocolError(tok.atEnd() ? "PROXY/1.0 error: missing TCP version" : NULL);
 
         // skip SP after protocol version
@@ -3534,9 +3534,6 @@ ConnStateData::start()
     BodyProducer::start();
     HttpControlMsgSink::start();
 
-    // ensure a buffer is present for this connection
-    in.maybeMakeSpaceAvailable();
-
     if (port->disable_pmtu_discovery != DISABLE_PMTU_OFF &&
             (transparent() || port->disable_pmtu_discovery == DISABLE_PMTU_ALWAYS)) {
 #if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)
@@ -3552,11 +3549,7 @@ ConnStateData::start()
         }
 #endif
     }
-}
 
-void
-ConnStateData::start()
-{
     // ensure a buffer is present for this connection
     in.maybeMakeSpaceAvailable();