]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Parser-NG: fixes to allow ecap and ssl subsystems build
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Sun, 9 Nov 2014 12:45:46 +0000 (14:45 +0200)
committerChristos Tsantilas <chtsanti@users.sourceforge.net>
Sun, 9 Nov 2014 12:45:46 +0000 (14:45 +0200)
src/adaptation/ecap/MessageRep.cc
src/ssl/ErrorDetailManager.cc

index 4002856b042e8b2fbdea68f838cc41c40c7d0642..8bbfeb1ae9393cc93baa06ddf6b0729dc4695b88 100644 (file)
@@ -235,8 +235,7 @@ Adaptation::Ecap::RequestLineRep::method(const Name &aMethod)
         theMessage.method = HttpRequestMethod(static_cast<Http::MethodType>(id));
     } else {
         const std::string &image = aMethod.image();
-        theMessage.method = HttpRequestMethod(image.data(),
-                                              image.data() + image.size());
+        theMessage.method.HttpRequestMethodXXX(image.c_str());
     }
 }
 
index b798d4b27627825f1f3cca373fb68215e7570be2..43fc4b00529801355650495cea11eaafed40553a 100644 (file)
@@ -212,7 +212,7 @@ Ssl::ErrorDetailFile::parse(const char *buffer, int len, bool eof)
 
         if ( s != e) {
             DetailEntryParser parser;
-            if (!parser.parse(s, e)) {
+            if (!parser.parse(s, e - s)) {
                 debugs(83, DBG_IMPORTANT, HERE <<
                        "WARNING! parse error on:" << s);
                 return false;