From 58934a46bc0a60a848d2304edf6e42c41f4f12f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 26 Oct 2003 13:45:08 +0000 Subject: [PATCH] - new/updated Changed files: squid-2.5.STABLE4-digest_auth_pwchange.patch -> 1.1 squid-2.5.STABLE4-fqdnnegcache.patch -> 1.1 squid-2.5.STABLE4-reconfigure_message.patch -> 1.1 squid-2.5.STABLE4-redirect_login_space.patch -> 1.1 squid-location.patch -> 1.3 --- squid-2.5.STABLE4-digest_auth_pwchange.patch | 75 ++++++++++++++++++++ squid-2.5.STABLE4-fqdnnegcache.patch | 21 ++++++ squid-2.5.STABLE4-reconfigure_message.patch | 21 ++++++ squid-2.5.STABLE4-redirect_login_space.patch | 21 ++++++ squid-location.patch | 18 ++--- 5 files changed, 147 insertions(+), 9 deletions(-) create mode 100644 squid-2.5.STABLE4-digest_auth_pwchange.patch create mode 100644 squid-2.5.STABLE4-fqdnnegcache.patch create mode 100644 squid-2.5.STABLE4-reconfigure_message.patch create mode 100644 squid-2.5.STABLE4-redirect_login_space.patch diff --git a/squid-2.5.STABLE4-digest_auth_pwchange.patch b/squid-2.5.STABLE4-digest_auth_pwchange.patch new file mode 100644 index 0000000..73febf3 --- /dev/null +++ b/squid-2.5.STABLE4-digest_auth_pwchange.patch @@ -0,0 +1,75 @@ +Index: squid/lib/rfc2617.c +diff -c squid/lib/rfc2617.c:1.5 squid/lib/rfc2617.c:1.5.2.1 +*** squid/lib/rfc2617.c:1.5 Wed Oct 17 07:30:50 2001 +--- squid/lib/rfc2617.c Tue Sep 23 10:05:41 2003 +*************** +*** 79,89 **** + unsigned char j; + + for (i = 0; i < HASHHEXLEN; i++) { + j = Hex[i]; + if (('0' <= j) && (j <= '9')) +! Bin[i / 2] |= ((j - '0') << ((i % 2 == 0) ? 4 : 0)); + else +! Bin[i / 2] |= ((j - 'a' + 10) << ((i % 2 == 0) ? 4 : 0)); + } + Bin[HASHLEN] = '\0'; + } +--- 79,94 ---- + unsigned char j; + + for (i = 0; i < HASHHEXLEN; i++) { ++ unsigned char n; + j = Hex[i]; + if (('0' <= j) && (j <= '9')) +! n = j - '0'; + else +! n = j - 'a' + 10; +! if (i % 2 == 0) +! Bin[i / 2] = n << 4; +! else +! Bin[i / 2] |= n; + } + Bin[HASHLEN] = '\0'; + } +Index: squid/src/auth/digest/auth_digest.c +diff -c squid/src/auth/digest/auth_digest.c:1.10.2.7 squid/src/auth/digest/auth_digest.c:1.10.2.8 +*** squid/src/auth/digest/auth_digest.c:1.10.2.7 Sun Aug 10 01:31:33 2003 +--- squid/src/auth/digest/auth_digest.c Tue Sep 23 10:05:41 2003 +*************** +*** 695,701 **** + debug(29, 9) ("\nResponse = '%s'\n" + "squid is = '%s'\n", digest_request->response, Response); + +! if (strcasecmp(digest_request->response, Response)) { + if (digestConfig->PostWorkaround && request->method != METHOD_GET) { + /* Ugly workaround for certain very broken browsers using the + * wrong method to calculate the request-digest on POST request. +--- 695,707 ---- + debug(29, 9) ("\nResponse = '%s'\n" + "squid is = '%s'\n", digest_request->response, Response); + +! if (strcasecmp(digest_request->response, Response) != 0) { +! if (!digest_request->flags.helper_queried) { +! /* Query the helper in case the password has changed */ +! digest_request->flags.helper_queried = 1; +! digest_request->flags.credentials_ok = 2; +! return; +! } + if (digestConfig->PostWorkaround && request->method != METHOD_GET) { + /* Ugly workaround for certain very broken browsers using the + * wrong method to calculate the request-digest on POST request. +Index: squid/src/auth/digest/auth_digest.h +diff -c squid/src/auth/digest/auth_digest.h:1.5.2.3 squid/src/auth/digest/auth_digest.h:1.5.2.4 +*** squid/src/auth/digest/auth_digest.h:1.5.2.3 Sun May 18 15:49:20 2003 +--- squid/src/auth/digest/auth_digest.h Tue Sep 23 10:05:42 2003 +*************** +*** 44,49 **** +--- 44,50 ---- + unsigned int authinfo_sent:1; + unsigned int credentials_ok:2; /*0=unchecked,1=ok,2=helper,3=failed */ + unsigned int nonce_stale:1; ++ unsigned int helper_queried:1; + } flags; + digest_nonce_h *nonce; + }; diff --git a/squid-2.5.STABLE4-fqdnnegcache.patch b/squid-2.5.STABLE4-fqdnnegcache.patch new file mode 100644 index 0000000..93a9df0 --- /dev/null +++ b/squid-2.5.STABLE4-fqdnnegcache.patch @@ -0,0 +1,21 @@ +Index: squid/src/fqdncache.c +diff -c squid/src/fqdncache.c:1.149 squid/src/fqdncache.c:1.149.2.1 +*** squid/src/fqdncache.c:1.149 Wed Oct 24 00:16:16 2001 +--- squid/src/fqdncache.c Sat Oct 11 16:32:31 2003 +*************** +*** 278,284 **** + int k; + int na = 0; + memset(&f, '\0', sizeof(f)); +! f.expires = squid_curtime; + f.flags.negcached = 1; + if (nr < 0) { + debug(35, 3) ("fqdncacheParse: Lookup failed (error %d)\n", +--- 278,284 ---- + int k; + int na = 0; + memset(&f, '\0', sizeof(f)); +! f.expires = squid_curtime + Config.negativeDnsTtl; + f.flags.negcached = 1; + if (nr < 0) { + debug(35, 3) ("fqdncacheParse: Lookup failed (error %d)\n", diff --git a/squid-2.5.STABLE4-reconfigure_message.patch b/squid-2.5.STABLE4-reconfigure_message.patch new file mode 100644 index 0000000..f68e7ad --- /dev/null +++ b/squid-2.5.STABLE4-reconfigure_message.patch @@ -0,0 +1,21 @@ +Index: squid/src/main.c +diff -c squid/src/main.c:1.345.2.11 squid/src/main.c:1.345.2.12 +*** squid/src/main.c:1.345.2.11 Sun Jun 8 17:28:46 2003 +--- squid/src/main.c Fri Sep 19 00:36:59 2003 +*************** +*** 329,335 **** + static void + mainReconfigure(void) + { +! debug(1, 1) ("Restarting Squid Cache (version %s)...\n", version_string); + reconfiguring = 1; + /* Already called serverConnectionsClose and ipcacheShutdownServers() */ + serverConnectionsClose(); +--- 329,335 ---- + static void + mainReconfigure(void) + { +! debug(1, 1) ("Reconfiguring Squid Cache (version %s)...\n", version_string); + reconfiguring = 1; + /* Already called serverConnectionsClose and ipcacheShutdownServers() */ + serverConnectionsClose(); diff --git a/squid-2.5.STABLE4-redirect_login_space.patch b/squid-2.5.STABLE4-redirect_login_space.patch new file mode 100644 index 0000000..eb3f726 --- /dev/null +++ b/squid-2.5.STABLE4-redirect_login_space.patch @@ -0,0 +1,21 @@ +Index: squid/src/redirect.c +diff -c squid/src/redirect.c:1.88.2.1 squid/src/redirect.c:1.88.2.2 +*** squid/src/redirect.c:1.88.2.1 Sat Jul 20 18:30:02 2002 +--- squid/src/redirect.c Tue Sep 23 19:03:36 2003 +*************** +*** 143,149 **** + r->orig_url, + inet_ntoa(r->client_addr), + fqdn, +! r->client_ident, + r->method_s); + helperSubmit(redirectors, buf, redirectHandleReply, r); + } +--- 143,149 ---- + r->orig_url, + inet_ntoa(r->client_addr), + fqdn, +! r->client_ident[0] ? rfc1738_escape(r->client_ident) : dash_str, + r->method_s); + helperSubmit(redirectors, buf, redirectHandleReply, r); + } diff --git a/squid-location.patch b/squid-location.patch index 38f9bee..1075bc0 100644 --- a/squid-location.patch +++ b/squid-location.patch @@ -1,6 +1,6 @@ -diff -urN squid-2.5.STABLE2.org/QUICKSTART squid-2.5.STABLE2/QUICKSTART ---- squid-2.5.STABLE2.org/QUICKSTART Sat Apr 12 12:06:45 2003 -+++ squid-2.5.STABLE2/QUICKSTART Sat Apr 12 12:18:58 2003 +diff -urN squid-2.5.STABLE4.org/QUICKSTART squid-2.5.STABLE4/QUICKSTART +--- squid-2.5.STABLE4.org/QUICKSTART 2003-10-26 14:34:44.000000000 +0100 ++++ squid-2.5.STABLE4/QUICKSTART 2003-10-26 14:35:42.000000000 +0100 @@ -12,10 +12,9 @@ INSTALL in the same directory), you have to configure the squid.conf file. This is the list of the values you *need* to change, because no @@ -14,16 +14,16 @@ diff -urN squid-2.5.STABLE2.org/QUICKSTART squid-2.5.STABLE2/QUICKSTART ============================================================================== -@@ -31,7 +30,7 @@ - Warning: Squid uses much more than this value. Rule of thumb: if - you have N megabytes free for Squid, put N/3 here. +@@ -26,7 +25,7 @@ + always ask permission before adding a parent cache. See also the + never_direct/always_direct directives. -cache_dir /usr/local/squid/var/cache 100 16 256 +cache_dir /var/cache/squid 100 16 256 Add here (first number, here 100) the amount of hard disk space (in megabytes) to devote to caching. -@@ -77,10 +76,10 @@ +@@ -69,10 +68,10 @@ After editing squid.conf to your liking, run Squid from the command line TWICE: @@ -34,6 +34,6 @@ diff -urN squid-2.5.STABLE2.org/QUICKSTART squid-2.5.STABLE2/QUICKSTART -Check in the cache.log (/usr/local/squid/var/logs/cache.log) that +Check in the cache.log (/var/log/squid/cache.log) that - everything is all right. Note that "WARNING: Cannot write to swap - directory" is normal the first time you run Squid. + everything is all right. + Once Squid created all its files (it can take several minutes on some -- 2.44.0