From: Christos Tsantilas Date: Sun, 9 Nov 2014 12:45:46 +0000 (+0200) Subject: Parser-NG: fixes to allow ecap and ssl subsystems build X-Git-Tag: merge-candidate-3-v1~503 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f42a67c56f8b16ce1b09df6caef1543d30ebc1c7;p=thirdparty%2Fsquid.git Parser-NG: fixes to allow ecap and ssl subsystems build --- diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc index 4002856b04..8bbfeb1ae9 100644 --- a/src/adaptation/ecap/MessageRep.cc +++ b/src/adaptation/ecap/MessageRep.cc @@ -235,8 +235,7 @@ Adaptation::Ecap::RequestLineRep::method(const Name &aMethod) theMessage.method = HttpRequestMethod(static_cast(id)); } else { const std::string &image = aMethod.image(); - theMessage.method = HttpRequestMethod(image.data(), - image.data() + image.size()); + theMessage.method.HttpRequestMethodXXX(image.c_str()); } } diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc index b798d4b276..43fc4b0052 100644 --- a/src/ssl/ErrorDetailManager.cc +++ b/src/ssl/ErrorDetailManager.cc @@ -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;