- outdated

Changed files:
    squid-2.5.STABLE14-hierarchy_tag.patch -> 1.2
    squid-2.5.STABLE14-httpReplyDestroy.patch -> 1.2

diff --git a/squid-2.5.STABLE14-hierarchy_tag.patch b/squid-2.5.STABLE14-hierarchy_tag.patch
deleted file mode 100644 (file)
index 2e4bee3..0000000
--- a/squid-2.5.STABLE14-hierarchy_tag.patch
+++ /dev/null
@@ -1,39 +0,0 @@
----------------------
-PatchSet 10741 
-Date: 2006/06/21 12:25:10
-Author: hno
-Branch: SQUID_2_5
-Tag: (none) 
-Log:
-Bug #1605: Parent not always logged to access.log
-
-The patch for Bug #1504 forgot to account for persistent connections,
-causing NONE/- to be logged in the hierarchy field when using a persistent
-peer connection.
-
-A workaround is to set "serverside_persistent_connections off"
-
-Members: 
-       src/forward.c:1.82.2.17->1.82.2.18 
-
-Index: squid/src/forward.c
-===================================================================
-RCS file: /cvsroot/squid/squid/src/forward.c,v
-retrieving revision 1.82.2.17
-retrieving revision 1.82.2.18
-diff -u -r1.82.2.17 -r1.82.2.18
---- squid/src/forward.c        10 Mar 2006 22:54:38 -0000      1.82.2.17
-+++ squid/src/forward.c        21 Jun 2006 12:25:10 -0000      1.82.2.18
-@@ -380,6 +380,12 @@
-           if (!fs->peer)
-               fwdState->origin_tries++;
-           comm_add_close_handler(fd, fwdServerClosed, fwdState);
-+          if (fs->peer)
-+              hierarchyNote(&fwdState->request->hier, fs->code, fs->peer->host);
-+          else if (Config.onoff.log_ip_on_direct && fs->code == DIRECT)
-+              hierarchyNote(&fwdState->request->hier, fs->code, fd_table[fd].ipaddr);
-+          else
-+              hierarchyNote(&fwdState->request->hier, fs->code, fwdState->request->host);
-           fwdConnectDone(fd, COMM_OK, fwdState);
-           return;
-       } else {

diff --git a/squid-2.5.STABLE14-httpReplyDestroy.patch b/squid-2.5.STABLE14-httpReplyDestroy.patch
deleted file mode 100644 (file)
index 6c29fcc..0000000
--- a/squid-2.5.STABLE14-httpReplyDestroy.patch
+++ /dev/null
@@ -1,41 +0,0 @@
----------------------
-PatchSet 10612 
-Date: 2006/06/02 22:00:34
-Author: hno
-Branch: SQUID_2_5
-Tag: (none) 
-Log:
-Bug #1606: assertion failed: HttpReply.c:105: "rep"
-
-The patch for Bug #1511 "Some 206 responses logged incorrectly" was slightly
-broken and could cause the above assert.
-
-Members: 
-       src/client_side.c:1.561.2.96->1.561.2.97 
-
-Index: squid/src/client_side.c
-===================================================================
-RCS file: /cvsroot/squid/squid/src/client_side.c,v
-retrieving revision 1.561.2.96
-retrieving revision 1.561.2.97
-diff -u -r1.561.2.96 -r1.561.2.97
---- squid/src/client_side.c    10 Mar 2006 22:58:35 -0000      1.561.2.96
-+++ squid/src/client_side.c    2 Jun 2006 22:00:34 -0000       1.561.2.97
-@@ -2031,8 +2031,6 @@
-               http->entry = clientCreateStoreEntry(http, http->request->method,
-                   null_request_flags);
-               errorAppendEntry(http->entry, err);
--              httpReplyDestroy(http->reply);
--              http->reply = NULL;
-               memFree(buf, MEM_CLIENT_SOCK_BUF);
-               return;
-           }
-@@ -2067,8 +2065,6 @@
-                   http->entry = clientCreateStoreEntry(http, http->request->method,
-                       null_request_flags);
-                   errorAppendEntry(http->entry, err);
--                  httpReplyDestroy(http->reply);
--                  http->reply = NULL;
-                   memFree(buf, MEM_CLIENT_SOCK_BUF);
-                   return;
-               }