diff options
Diffstat (limited to 'main/squid/squid-3.2.0.16-loggable-urlgroup.patch')
| -rw-r--r-- | main/squid/squid-3.2.0.16-loggable-urlgroup.patch | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/main/squid/squid-3.2.0.16-loggable-urlgroup.patch b/main/squid/squid-3.2.0.16-loggable-urlgroup.patch deleted file mode 100644 index 41193ba85..000000000 --- a/main/squid/squid-3.2.0.16-loggable-urlgroup.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc -index b464e65..0448078 100644 ---- a/src/HttpRequest.cc -+++ b/src/HttpRequest.cc -@@ -107,6 +107,7 @@ HttpRequest::init() - peer_login = NULL; // not allocated/deallocated by this class - peer_domain = NULL; // not allocated/deallocated by this class - vary_headers = NULL; -+ urlgroup = null_string; - myportname = null_string; - tag = null_string; - #if USE_AUTH -@@ -155,6 +156,7 @@ HttpRequest::clean() - range = NULL; - } - -+ urlgroup.clean(); - myportname.clean(); - - tag.clean(); -@@ -214,6 +216,7 @@ HttpRequest::clone() const - copy->vary_headers = vary_headers ? xstrdup(vary_headers) : NULL; - // XXX: what to do with copy->peer_domain? - -+ copy->urlgroup = urlgroup; - copy->myportname = myportname; - copy->tag = tag; - #if USE_AUTH -diff --git a/src/HttpRequest.h b/src/HttpRequest.h -index dc44fea..989624d 100644 ---- a/src/HttpRequest.h -+++ b/src/HttpRequest.h -@@ -187,6 +187,8 @@ public: - - char *peer_domain; /* Configured peer forceddomain */ - -+ String urlgroup; -+ - String myportname; // Internal tag name= value from port this requests arrived in. - - String tag; /* Internal tag for this request */ -diff --git a/src/client_side_request.cc b/src/client_side_request.cc -index 0c3113b..d1947e9 100644 ---- a/src/client_side_request.cc -+++ b/src/client_side_request.cc -@@ -1180,6 +1180,15 @@ ClientRequestContext::clientRedirectDone(char *result) - redirect_state = REDIRECT_DONE; - - if (result) { -+ if (result[0] == '!') { -+ char *t = strchr(result+1, '!'); -+ if (t != NULL) { -+ old_request->urlgroup.reset(NULL); -+ old_request->urlgroup.append(result + 1, t - result - 1); -+ result = t + 1; -+ } -+ } -+ - http_status status = (http_status) atoi(result); - - if (status == HTTP_MOVED_PERMANENTLY -@@ -1198,7 +1207,7 @@ ClientRequestContext::clientRedirectDone(char *result) - else - debugs(85, DBG_CRITICAL, "ERROR: URL-rewrite produces invalid 303 redirect Location: " << result); - } -- } else if (strcmp(result, http->uri)) { -+ } else if (result[0] != 0 && strcmp(result, http->uri)) { - // XXX: validate the URL properly *without* generating a whole new request object right here. - // XXX: the clone() should be done only AFTER we know the new URL is valid. - HttpRequest *new_request = old_request->clone(); -diff --git a/src/format/ByteCode.h b/src/format/ByteCode.h -index 8e345df..ddb0f8f 100644 ---- a/src/format/ByteCode.h -+++ b/src/format/ByteCode.h -@@ -65,6 +65,7 @@ typedef enum { - /*LFT_REQUEST_QUERY, */ - LFT_REQUEST_VERSION_OLD_2X, - LFT_REQUEST_VERSION, -+ LFT_REQUEST_URLGROUP, - - /* request header details pre-adaptation */ - LFT_REQUEST_HEADER, -diff --git a/src/format/Format.cc b/src/format/Format.cc -index 18348e8..2e65886 100644 ---- a/src/format/Format.cc -+++ b/src/format/Format.cc -@@ -907,6 +907,12 @@ Format::Format::assemble(MemBuf &mb, AccessLogEntry *al, int logSequenceNumber) - out = tmp; - break; - -+ case LFT_REQUEST_URLGROUP: -+ if (al->request) -+ out = al->request->urlgroup.termedBuf(); -+ quote = 1; -+ break; -+ - case LFT_SERVER_REQ_METHOD: - if (al->adapted_request) { - out = al->adapted_request->method.image(); -diff --git a/src/format/Token.cc b/src/format/Token.cc -index 6859e0a..8a8e5e7 100644 ---- a/src/format/Token.cc -+++ b/src/format/Token.cc -@@ -116,6 +116,7 @@ static TokenTableEntry TokenTable2C[] = { - {"rp", LFT_REQUEST_URLPATH_OLD_31}, - /* { "rq", LFT_REQUEST_QUERY }, * / / * the query-string, INCLUDING the leading ? */ - {"rv", LFT_REQUEST_VERSION}, -+ {"rG", LFT_REQUEST_URLGROUP}, - - {"<rm", LFT_SERVER_REQ_METHOD}, - {"<ru", LFT_SERVER_REQ_URI}, |