From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 13 Aug 2014 10:01:59 +0000 (-0700)
Subject: Fix build errors after trunk merge
X-Git-Tag: SQUID_3_5_0_1~75^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9a39a77c6d0320cef3da36b6bf0a02a1b406b2d;p=thirdparty%2Fsquid.git

Fix build errors after trunk merge
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 4e20a9eda7..3945381553 100644
--- 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();