From: Source Maintenance Date: Fri, 16 Jun 2017 18:12:15 +0000 (+0000) Subject: SourceFormat Enforcement X-Git-Tag: M-staged-PR71~114 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b63076718e9d25df545d53dafde720f704c6cad6;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index d08ad3e037..6daf43885e 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -694,7 +694,6 @@ UpdateRequestNotes(ConnStateData *csd, HttpRequest &request, NotePairs const &he request.notes()->replaceOrAdd(&helperNotes); } - void HttpRequest::manager(const CbcPointer &aMgr, const AccessLogEntryPointer &al) { @@ -717,7 +716,7 @@ HttpRequest::manager(const CbcPointer &aMgr, const AccessLogEntry indirect_client_addr = clientConnection->remote; #endif /* FOLLOW_X_FORWARDED_FOR */ my_addr = clientConnection->local; - + flags.intercepted = ((clientConnection->flags & COMM_INTERCEPTION) != 0); flags.interceptTproxy = ((clientConnection->flags & COMM_TRANSPARENT) != 0 ) ; const bool proxyProtocolPort = port ? port->flags.proxySurrogate : false; @@ -733,3 +732,4 @@ HttpRequest::manager(const CbcPointer &aMgr, const AccessLogEntry flags.spoofClientIp = false; } } + diff --git a/src/client_side.cc b/src/client_side.cc index d1bc0919bf..2ec8da96ae 100644 --- a/src/client_side.cc +++ b/src/client_side.cc @@ -1634,7 +1634,6 @@ clientProcessRequest(ConnStateData *conn, const Http1::RequestParserPointer &hp, // this entire function to remove them from the FTP code path. Connection // setup and body_pipe preparation blobs are needed for FTP. - request->manager(conn, http->al); request->flags.accelerated = http->flags.accel;