diff -ruN squid-2.7.STABLE4/ChangeLog squid-2.7.STABLE5/ChangeLog --- squid-2.7.STABLE4/ChangeLog 2008-08-08 21:17:40.000000000 +0200 +++ squid-2.7.STABLE5/ChangeLog 2008-10-17 20:55:54.000000000 +0200 @@ -1,5 +1,24 @@ -Changes to squid-2.7.SATBLE4 (8 August 2008) +Changes to squid-2.7.STABLE5 (17 October 2008) + - Bug #2439: configuration file contains non-ASCII characters + - Bug #2441: Shut down store url rewrite helpers on squid -k + reconfigure + - foreground rebuild should do all of the rebuilding before Squid + accepts requests. + - Bug #2464: assertion failed: sc->new_callback == NULL at + store_client.c:190 + - Bug #2394: add upgrade_http0.9 option making it possible to disable + upgrade of HTTP/0.9 responses + - Bug #2426: Increase negotiate auth token buffer size + - Bug #2468: Limit stale-if-error to 500-504 responses + - Bug #2477: swap.state permission issues if crashing during "squid -k + reconfigure" + - Bug #2430: Old headers still returned after a cache validation if + the request triggering the cache validation was itself a + If-Modified-Since request. + - Bug #2481: Don't set expires: now in generated error responses + - Windows port: Fix build error using latest MinGW runtime. +Changes to squid-2.7.STABLE4 (8 August 2008) - Bug #2387: The calculation of the number of hash buckets need to account for the memory size, not only disk size - Bug #2393: DNS requests retried indefinitely at full speed on failed @@ -27,6 +46,7 @@ - Bug #2406: access.log logs rewritten URL and strip_query_terms ineffective - More changes to deal properly with aborted requests + - Bug #2427: squid_ldap_group -h reports the old % codes for -f Changes to squid-2.6.STABLE21 (27 June 2008) diff -ruN squid-2.7.STABLE4/configure squid-2.7.STABLE5/configure --- squid-2.7.STABLE4/configure 2008-08-08 21:21:03.000000000 +0200 +++ squid-2.7.STABLE5/configure 2008-10-17 21:01:04.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.430.2.14 . +# From configure.in Revision: 1.430.2.15 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Squid Web Proxy 2.7.STABLE4. +# Generated by GNU Autoconf 2.61 for Squid Web Proxy 2.7.STABLE5. # # Report bugs to . # @@ -575,8 +575,8 @@ # Identity of this package. PACKAGE_NAME='Squid Web Proxy' PACKAGE_TARNAME='squid' -PACKAGE_VERSION='2.7.STABLE4' -PACKAGE_STRING='Squid Web Proxy 2.7.STABLE4' +PACKAGE_VERSION='2.7.STABLE5' +PACKAGE_STRING='Squid Web Proxy 2.7.STABLE5' PACKAGE_BUGREPORT='http://www.squid-cache.org/bugs/' ac_default_prefix=/usr/local/squid @@ -1312,7 +1312,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Squid Web Proxy 2.7.STABLE4 to adapt to many kinds of systems. +\`configure' configures Squid Web Proxy 2.7.STABLE5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1382,7 +1382,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Squid Web Proxy 2.7.STABLE4:";; + short | recursive ) echo "Configuration of Squid Web Proxy 2.7.STABLE5:";; esac cat <<\_ACEOF @@ -1663,7 +1663,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Squid Web Proxy configure 2.7.STABLE4 +Squid Web Proxy configure 2.7.STABLE5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1677,7 +1677,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Squid Web Proxy $as_me 2.7.STABLE4, which was +It was created by Squid Web Proxy $as_me 2.7.STABLE5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2350,7 +2350,7 @@ # Define the identity of the package. PACKAGE='squid' - VERSION='2.7.STABLE4' + VERSION='2.7.STABLE5' cat >>confdefs.h <<_ACEOF @@ -27798,7 +27798,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Squid Web Proxy $as_me 2.7.STABLE4, which was +This file was extended by Squid Web Proxy $as_me 2.7.STABLE5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27851,7 +27851,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Squid Web Proxy config.status 2.7.STABLE4 +Squid Web Proxy config.status 2.7.STABLE5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -ruN squid-2.7.STABLE4/configure.in squid-2.7.STABLE5/configure.in --- squid-2.7.STABLE4/configure.in 2008-08-08 21:21:03.000000000 +0200 +++ squid-2.7.STABLE5/configure.in 2008-10-17 21:01:04.000000000 +0200 @@ -1,16 +1,16 @@ dnl dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.430.2.14 2008/08/03 22:27:01 hno Exp $ +dnl $Id: configure.in,v 1.430.2.15 2008/10/17 18:55:54 hno Exp $ dnl dnl dnl -AC_INIT(Squid Web Proxy, 2.7.STABLE4, http://www.squid-cache.org/bugs/, squid) +AC_INIT(Squid Web Proxy, 2.7.STABLE5, http://www.squid-cache.org/bugs/, squid) AC_PREREQ(2.52) AM_CONFIG_HEADER(include/autoconf.h) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE -AC_REVISION($Revision: 1.430.2.14 $)dnl +AC_REVISION($Revision: 1.430.2.15 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE diff -ruN squid-2.7.STABLE4/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c squid-2.7.STABLE5/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c --- squid-2.7.STABLE4/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c 2008-02-24 20:18:53.000000000 +0100 +++ squid-2.7.STABLE5/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c 2008-09-29 00:44:36.000000000 +0200 @@ -43,6 +43,9 @@ #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN HOST_NAME_MAX #endif +#ifndef MAX_AUTHTOKEN_LEN +#define MAX_AUTHTOKEN_LEN 65535 +#endif #define PROGRAM "squid_kerb_auth" @@ -173,10 +176,9 @@ } - int main(int argc, char * const argv[]) { - char buf[6400]; + char buf[MAX_AUTHTOKEN_LEN]; char *c; int length=0; static int err=0; diff -ruN squid-2.7.STABLE4/include/sspwin32.h squid-2.7.STABLE5/include/sspwin32.h --- squid-2.7.STABLE4/include/sspwin32.h 2006-09-09 17:41:45.000000000 +0200 +++ squid-2.7.STABLE5/include/sspwin32.h 2008-10-13 18:33:32.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: sspwin32.h,v 1.2 2006/09/09 15:41:45 serassio Exp $ + * $Id: sspwin32.h,v 1.2.6.1 2008/10/13 16:33:32 hno Exp $ * * AUTHOR: Guido Serassio * Based on previous work of Francesco Chemolli, Robert Collins and Andrew Doran @@ -46,6 +46,7 @@ #include #endif #include +#include #include #include diff -ruN squid-2.7.STABLE4/include/version.h squid-2.7.STABLE5/include/version.h --- squid-2.7.STABLE4/include/version.h 2008-08-08 21:21:03.000000000 +0200 +++ squid-2.7.STABLE5/include/version.h 2008-10-17 21:01:04.000000000 +0200 @@ -9,5 +9,5 @@ */ #ifndef SQUID_RELEASE_TIME -#define SQUID_RELEASE_TIME 1218223259 +#define SQUID_RELEASE_TIME 1224270059 #endif diff -ruN squid-2.7.STABLE4/RELEASENOTES.html squid-2.7.STABLE5/RELEASENOTES.html --- squid-2.7.STABLE4/RELEASENOTES.html 2008-08-08 21:21:35.000000000 +0200 +++ squid-2.7.STABLE5/RELEASENOTES.html 2008-10-17 21:01:40.000000000 +0200 @@ -2,12 +2,12 @@ - Squid 2.7.STABLE4 release notes + Squid 2.7.STABLE5 release notes -

Squid 2.7.STABLE4 release notes

+

Squid 2.7.STABLE5 release notes

-

Squid Developers

$Id: release.html,v 1.1.2.9 2008/08/08 19:19:32 hno Exp $ +

Squid Developers

$Id: release.html,v 1.1.2.10 2008/10/17 18:56:26 hno Exp $
This document contains the release notes for version 2.7 of Squid. Squid is a WWW Cache application developed by the Web Caching community. @@ -50,6 +50,9 @@

7. Key changes in squid-2.7.STABLE4

+

+

8. Key changes in squid-2.7.STABLE5

+

1. Key changes from squid 2.6

@@ -446,6 +449,28 @@
  • Make dns_nameserver work when using --disable-internal-dns on glibc based systems
  • Handle aborted objects properly. The change in 2.7.STABLE3 triggered a number of issues.
  • Bug #2406: access.log logs rewritten URL and strip_query_terms ineffective
    • +
  • See also the list of +squid-2.7.STABLE4 changes and the +ChangeLog file for details.
    • + +

    + +

    8. Key changes in squid-2.7.STABLE5

    + +

    +

      +
    • Bug #2441: Shut down store url rewrite helpers on squid -k reconfigure
      • +
    • Bug #2464: assertion failed: sc->new_callback == NULL at store_client.c:190
      • +
    • Bug #2394: add upgrade_http0.9 option making it possible to disable upgrade of HTTP/0.9 responses
      • +
    • Bug #2426: Increase negotiate auth token buffer size
      • +
    • Bug #2468: Limit stale-if-error to 500-504 responses
      • +
    • Bug #2477: swap.state permission issues if crashing during "squid -k reconfigure"
      • +
    • Bug #2430: Old headers sometimes still returned after a cache validation
      • +
    • Bug #2481: Don't set expires: now in generated error responses
      • +
    • Windows port: Fix build error using latest MinGW runtime.
      • +
    • See also the list of +squid-2.7.STABLE5 changes and the +ChangeLog file for details.

    diff -ruN squid-2.7.STABLE4/src/auth/negotiate/auth_negotiate.c squid-2.7.STABLE5/src/auth/negotiate/auth_negotiate.c --- squid-2.7.STABLE4/src/auth/negotiate/auth_negotiate.c 2007-08-29 00:39:10.000000000 +0200 +++ squid-2.7.STABLE5/src/auth/negotiate/auth_negotiate.c 2008-09-29 00:44:36.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: auth_negotiate.c,v 1.12 2007/08/28 22:39:10 hno Exp $ + * $Id: auth_negotiate.c,v 1.12.2.1 2008/09/28 22:44:36 hno Exp $ * * DEBUG: section 29 Negotiate Authenticator * AUTHOR: Robert Collins @@ -41,6 +41,9 @@ #include "squid.h" #include "auth_negotiate.h" +// Maximum length (buffer size) for token strings. +#define MAX_AUTHTOKEN_LEN 32768 + extern AUTHSSETUP authSchemeSetup_negotiate; static void @@ -573,7 +576,7 @@ authenticateNegotiateStart(auth_user_request_t * auth_user_request, RH * handler, void *data) { authenticateStateData *r = NULL; - char buf[8192]; + char buf[MAX_AUTHTOKEN_LEN]; char *sent_string = NULL; negotiate_user_t *negotiate_user; negotiate_request_t *negotiate_request; @@ -606,9 +609,9 @@ r->auth_user_request = auth_user_request; authenticateAuthUserRequestLock(r->auth_user_request); if (negotiate_request->auth_state == AUTHENTICATE_STATE_INITIAL) { - snprintf(buf, 8192, "YR %s\n", sent_string); + snprintf(buf, MAX_AUTHTOKEN_LEN, "YR %s\n", sent_string); } else { - snprintf(buf, 8192, "KK %s\n", sent_string); + snprintf(buf, MAX_AUTHTOKEN_LEN, "KK %s\n", sent_string); } negotiate_request->waiting = 1; safe_free(negotiate_request->client_blob); diff -ruN squid-2.7.STABLE4/src/cf.data.pre squid-2.7.STABLE5/src/cf.data.pre --- squid-2.7.STABLE4/src/cf.data.pre 2008-07-10 11:47:28.000000000 +0200 +++ squid-2.7.STABLE5/src/cf.data.pre 2008-09-25 04:33:37.000000000 +0200 @@ -1,6 +1,6 @@ # -# $Id: cf.data.pre,v 1.450.2.26 2008/07/10 09:47:28 hno Exp $ +# $Id: cf.data.pre,v 1.450.2.28 2008/09/25 02:33:37 hno Exp $ # # SQUID Web Proxy Cache http://www.squid-cache.org/ # ---------------------------------------------------------- @@ -3253,6 +3253,29 @@ broken_posts allow buggy_server DOC_END +NAME: upgrade_http0.9 +TYPE: acl_access +DEFAULT: none +LOC: Config.accessList.upgrade_http09 +DOC_START + This access list controls when HTTP/0.9 responses is upgraded + to our current HTTP version. The default is to always upgrade. + + Some applications expect to be able to respond with non-HTTP + responses and clients gets confused if the response is upgraded. + For example SHOUTcast servers used for mp3 streaming. + + To enable some flexibility in detection of such applications + the first line of the response is available in the internal header + X-HTTP09-First-Line for use in the rep_header acl. + +NOCOMMENT_START +# Don't upgrade ShoutCast responses to HTTP +acl shoutcast rep_header X-HTTP09-First-Line ^ICY\s[0-9] +upgrade_http0.9 deny shoutcast +NOCOMMENT_END +DOC_END + NAME: via IFDEF: HTTP_VIOLATIONS COMMENT: on|off @@ -3538,7 +3561,7 @@ When using the concurrency option, the protocol is changed by introducing a query channel tag infront of the request/response. The query channel - tag is a number between 0 and concurrency−1. + tag is a number between 0 and concurrency-1. FORMAT specifications: @@ -3570,7 +3593,7 @@ present, the supplied value completely replaces the cached value. - In the event of a helper−related error (e.g., overload), Squid + In the event of a helper-related error (e.g., overload), Squid will always default to STALE. DOC_END diff -ruN squid-2.7.STABLE4/src/client_side.c squid-2.7.STABLE5/src/client_side.c --- squid-2.7.STABLE4/src/client_side.c 2008-07-21 22:43:27.000000000 +0200 +++ squid-2.7.STABLE5/src/client_side.c 2008-10-06 23:27:44.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: client_side.c,v 1.754.2.21 2008/07/21 20:43:27 hno Exp $ + * $Id: client_side.c,v 1.754.2.24 2008/10/06 21:27:44 hno Exp $ * * DEBUG: section 33 Client-side Routines * AUTHOR: Duane Wessels @@ -927,10 +927,11 @@ /* the client can handle this reply, whatever it is */ http->flags.hit = 0; http->log_type = LOG_TCP_REFRESH_MISS; - if (HTTP_NOT_MODIFIED == rep->sline.status) { + if (HTTP_NOT_MODIFIED == rep->sline.status && http->request->flags.cache_validation) { httpReplyUpdateOnNotModified(http->old_entry->mem_obj->reply, rep); storeTimestampsSet(http->old_entry); + storeUpdate(http->old_entry, http->request); if (!EBIT_TEST(http->old_entry->flags, REFRESH_FAILURE)) http->log_type = LOG_TCP_REFRESH_HIT; else @@ -953,6 +954,7 @@ if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) { /* Old object got aborted, not good */ clientProcessMiss(http); + return; } if (recopy) { storeClientCopyHeaders(http->sc, entry, @@ -1941,8 +1943,8 @@ LOCAL_ARRAY(char, bbuf, MAX_URL + 32); String strVia = httpHeaderGetList(hdr, HDR_VIA); snprintf(bbuf, MAX_URL + 32, "%d.%d %s", - http->entry->mem_obj->reply->sline.version.major, - http->entry->mem_obj->reply->sline.version.minor, ThisCache); + rep->sline.version.major, + rep->sline.version.minor, ThisCache); strListAdd(&strVia, bbuf, ','); httpHeaderDelById(hdr, HDR_VIA); httpHeaderPutStr(hdr, HDR_VIA, strBuf(strVia)); @@ -2002,13 +2004,6 @@ /* try to grab the already-parsed header */ rep = httpReplyClone(orig_rep); if (rep->pstate == psParsed) { - if (http->conn->port->http11) { - /* enforce 1.1 reply version */ - httpBuildVersion(&rep->sline.version, 1, 1); - } else { - /* enforce 1.0 reply version */ - httpBuildVersion(&rep->sline.version, 1, 0); - } /* do header conversions */ clientBuildReplyHeader(http, rep); /* if we do ranges, change status to "Partial Content" */ @@ -3017,17 +3012,41 @@ { HttpReply *rep = http->reply; MemBuf mb; + int send_header = 1; /* reset range iterator */ http->range_iter.pos = HttpHdrRangeInitPos; if (http->request->method == METHOD_HEAD) { /* do not forward body for HEAD replies */ http->flags.done_copying = 1; } + if (http->http_ver.major < 1) + send_header = 0; + if (rep->sline.version.major < 1) { + if (send_header && Config.accessList.upgrade_http09) { + aclCheck_t *checklist = clientAclChecklistCreate(Config.accessList.upgrade_http09, http); + checklist->reply = rep; + if (aclCheckFast(Config.accessList.upgrade_http09, checklist) != 1) + send_header = 0; + aclChecklistFree(checklist); + } + httpHeaderDelById(&rep->header, HDR_X_HTTP09_FIRST_LINE); + } /* init mb; put status line and headers */ - if (http->http_ver.major >= 1) + if (send_header) { + if (http->conn->port->http11) { + /* enforce 1.1 reply version */ + httpBuildVersion(&rep->sline.version, 1, 1); + } else { + /* enforce 1.0 reply version */ + httpBuildVersion(&rep->sline.version, 1, 0); + } mb = httpReplyPack(rep); - else + } else { + debug(33, 2) ("HTTP/0.9 response, disable everything\n"); + http->request->flags.chunked_response = 0; + http->request->flags.proxy_keepalive = 0; memBufDefInit(&mb); + } if (Config.onoff.log_mime_hdrs) { http->al.headers.reply = xmalloc(mb.size + 1); xstrncpy(http->al.headers.reply, mb.buf, mb.size); diff -ruN squid-2.7.STABLE4/src/enums.h squid-2.7.STABLE5/src/enums.h --- squid-2.7.STABLE4/src/enums.h 2008-05-27 14:49:39.000000000 +0200 +++ squid-2.7.STABLE5/src/enums.h 2008-09-25 04:33:37.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: enums.h,v 1.245.2.2 2008/05/27 12:49:39 hno Exp $ + * $Id: enums.h,v 1.245.2.3 2008/09/25 02:33:37 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -261,6 +261,7 @@ #endif HDR_X_ERROR_URL, /* errormap, requested URL */ HDR_X_ERROR_STATUS, /* errormap, received HTTP status line */ + HDR_X_HTTP09_FIRST_LINE, /* internal, first line of HTTP/0.9 response */ HDR_FRONT_END_HTTPS, HDR_PROXY_SUPPORT, HDR_KEEP_ALIVE, diff -ruN squid-2.7.STABLE4/src/errorpage.c squid-2.7.STABLE5/src/errorpage.c --- squid-2.7.STABLE4/src/errorpage.c 2007-11-21 16:06:13.000000000 +0100 +++ squid-2.7.STABLE5/src/errorpage.c 2008-10-13 18:32:35.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: errorpage.c,v 1.193 2007/11/21 15:06:13 hno Exp $ + * $Id: errorpage.c,v 1.193.2.1 2008/10/13 16:32:35 hno Exp $ * * DEBUG: section 4 Error Generation * AUTHOR: Duane Wessels @@ -628,7 +628,7 @@ /* no LMT for error pages; error pages expire immediately */ if (strchr(name, ':')) { /* Redirection */ - httpReplySetHeaders(rep, HTTP_MOVED_TEMPORARILY, NULL, "text/html", 0, -1, squid_curtime); + httpReplySetHeaders(rep, HTTP_MOVED_TEMPORARILY, NULL, "text/html", 0, -1, -1); if (err->request) { char *quoted_url = rfc1738_escape_part(urlCanonical(err->request)); httpHeaderPutStrf(&rep->header, HDR_LOCATION, name, quoted_url); @@ -636,7 +636,7 @@ httpHeaderPutStrf(&rep->header, HDR_X_SQUID_ERROR, "%d %s", err->http_status, "Access Denied"); } else { MemBuf content = errorBuildContent(err); - httpReplySetHeaders(rep, err->http_status, NULL, "text/html", content.size, -1, squid_curtime); + httpReplySetHeaders(rep, err->http_status, NULL, "text/html", content.size, -1, -1); /* * include some information for downstream caches. Implicit * replaceable content. This isn't quite sufficient. xerrno is not diff -ruN squid-2.7.STABLE4/src/http.c squid-2.7.STABLE5/src/http.c --- squid-2.7.STABLE4/src/http.c 2008-06-26 00:14:02.000000000 +0200 +++ squid-2.7.STABLE5/src/http.c 2008-09-25 04:33:37.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: http.c,v 1.439.2.6 2008/06/25 22:14:02 hno Exp $ + * $Id: http.c,v 1.439.2.7 2008/09/25 02:33:37 hno Exp $ * * DEBUG: section 11 Hypertext Transfer Protocol (HTTP) * AUTHOR: Harvest Derived @@ -432,6 +432,18 @@ hdr_len = httpState->reply_hdr.size; if (hdr_len > 4 && strncmp(httpState->reply_hdr.buf, "HTTP/", 5)) { debug(11, 3) ("httpProcessReplyHeader: Non-HTTP-compliant header: '%s'\n", httpState->reply_hdr.buf); + { + char *t, *t2; + t = xstrdup(httpState->reply_hdr.buf); + t2 = strchr(t, '\n'); + if (t2) + *t2 = '\0'; + t2 = strchr(t, '\r'); + if (t2) + *t2 = '\0'; + httpHeaderPutStr(&reply->header, HDR_X_HTTP09_FIRST_LINE, t); + safe_free(t); + } httpState->reply_hdr_state += 2; httpState->chunk_size = -1; /* Terminated by EOF */ httpState->reply_hdr.size = old_size; @@ -972,7 +984,6 @@ } else if (s == HTTP_INVALID_HEADER) { MemBuf mb; HttpReply *reply = entry->mem_obj->reply; - httpReplyReset(reply); httpBuildVersion(&reply->sline.version, 0, 9); reply->sline.status = HTTP_OK; httpHeaderPutTime(&reply->header, HDR_DATE, squid_curtime); diff -ruN squid-2.7.STABLE4/src/HttpHeader.c squid-2.7.STABLE5/src/HttpHeader.c --- squid-2.7.STABLE4/src/HttpHeader.c 2007-12-21 10:50:19.000000000 +0100 +++ squid-2.7.STABLE5/src/HttpHeader.c 2008-09-25 04:33:37.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: HttpHeader.c,v 1.99 2007/12/21 09:50:19 adrian Exp $ + * $Id: HttpHeader.c,v 1.99.2.1 2008/09/25 02:33:37 hno Exp $ * * DEBUG: section 55 HTTP Header * AUTHOR: Alex Rousskov @@ -129,6 +129,7 @@ {"X-Forwarded-For", HDR_X_FORWARDED_FOR, ftStr}, {"X-Request-URI", HDR_X_REQUEST_URI, ftStr}, {"X-Squid-Error", HDR_X_SQUID_ERROR, ftStr}, + {"X-HTTP09-First-Line", HDR_X_HTTP09_FIRST_LINE, ftStr}, {"Negotiate", HDR_NEGOTIATE, ftStr}, #if X_ACCELERATOR_VARY {"X-Accelerator-Vary", HDR_X_ACCELERATOR_VARY, ftStr}, diff -ruN squid-2.7.STABLE4/src/main.c squid-2.7.STABLE5/src/main.c --- squid-2.7.STABLE4/src/main.c 2008-05-27 01:14:30.000000000 +0200 +++ squid-2.7.STABLE5/src/main.c 2008-09-25 04:21:52.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: main.c,v 1.403.2.2 2008/05/26 23:14:30 hno Exp $ + * $Id: main.c,v 1.403.2.3 2008/09/25 02:21:52 hno Exp $ * * DEBUG: section 1 Startup and Main Loop * AUTHOR: Harvest Derived @@ -467,6 +467,7 @@ dnsShutdown(); #endif redirectShutdown(); + storeurlShutdown(); locationRewriteShutdown(); authenticateShutdown(); externalAclShutdown(); @@ -1105,6 +1106,7 @@ redirectShutdown(); externalAclShutdown(); refreshCheckShutdown(); + storeurlShutdown(); locationRewriteShutdown(); icpConnectionClose(); #if USE_HTCP diff -ruN squid-2.7.STABLE4/src/store.c squid-2.7.STABLE5/src/store.c --- squid-2.7.STABLE4/src/store.c 2008-07-18 02:44:02.000000000 +0200 +++ squid-2.7.STABLE5/src/store.c 2008-10-06 23:26:42.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: store.c,v 1.584.2.6 2008/07/18 00:44:02 hno Exp $ + * $Id: store.c,v 1.584.2.7 2008/10/06 21:26:42 hno Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -1677,10 +1677,12 @@ { StoreEntry *oe = e->mem_obj->old_entry; time_t expires = e->expires; + http_status status = e->mem_obj->reply->sline.status; refresh_cc cc = refreshCC(e, e->mem_obj->request); if (expires == -1) expires = squid_curtime + cc.negative_ttl; - if (oe && !EBIT_TEST(oe->flags, KEY_PRIVATE) && !EBIT_TEST(oe->flags, ENTRY_REVALIDATE)) { + if (status && oe && !EBIT_TEST(oe->flags, KEY_PRIVATE) && !EBIT_TEST(oe->flags, ENTRY_REVALIDATE) && + 500 <= status && status <= 504) { HttpHdrCc *oldcc = oe->mem_obj->reply->cache_control; if (oldcc && EBIT_TEST(oldcc->mask, CC_STALE_IF_ERROR) && oldcc->stale_if_error >= 0) cc.max_stale = oldcc->stale_if_error; diff -ruN squid-2.7.STABLE4/src/store_rebuild.c squid-2.7.STABLE5/src/store_rebuild.c --- squid-2.7.STABLE4/src/store_rebuild.c 2007-09-02 01:09:32.000000000 +0200 +++ squid-2.7.STABLE5/src/store_rebuild.c 2008-10-06 23:25:45.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: store_rebuild.c,v 1.80 2007/09/01 23:09:32 hno Exp $ + * $Id: store_rebuild.c,v 1.80.2.2 2008/10/06 21:25:45 hno Exp $ * * DEBUG: section 20 Store Rebuild Routines * AUTHOR: Duane Wessels @@ -67,8 +67,10 @@ StoreEntry *e; hash_link *link_ptr = NULL; hash_link *link_next = NULL; + int limit = opt_foreground_rebuild ? 1 << 30 : 500; validnum_start = validnum; - while (validnum - validnum_start < 500) { + + while (validnum - validnum_start < limit) { if (++bucketnum >= store_hash_buckets) { debug(20, 1) (" Completed Validation Procedure\n"); debug(20, 1) (" Validated %d Entries\n", validnum); diff -ruN squid-2.7.STABLE4/src/structs.h squid-2.7.STABLE5/src/structs.h --- squid-2.7.STABLE4/src/structs.h 2008-07-21 22:18:50.000000000 +0200 +++ squid-2.7.STABLE5/src/structs.h 2008-09-25 04:33:37.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: structs.h,v 1.538.2.15 2008/07/21 20:18:50 hno Exp $ + * $Id: structs.h,v 1.538.2.16 2008/09/25 02:33:37 hno Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -737,6 +737,7 @@ #endif acl_access *vary_encoding; acl_access *auth_ip_shortcircuit; + acl_access *upgrade_http09; } accessList; acl_deny_info_list *denyInfoList; struct _authConfig { diff -ruN squid-2.7.STABLE4/src/tools.c squid-2.7.STABLE5/src/tools.c --- squid-2.7.STABLE4/src/tools.c 2008-05-31 22:37:22.000000000 +0200 +++ squid-2.7.STABLE5/src/tools.c 2008-10-06 23:27:17.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: tools.c,v 1.260.2.4 2008/05/31 20:37:22 hno Exp $ + * $Id: tools.c,v 1.260.2.5 2008/10/06 21:27:17 hno Exp $ * * DEBUG: section 21 Misc Functions * AUTHOR: Harvest Derived @@ -396,6 +396,7 @@ void fatal(const char *message) { + leave_suid(); releaseServerSockets(); /* check for store_dirs_rebuilding because fatal() is often * used in early initialization phases, long before we ever @@ -444,6 +445,7 @@ void fatal_dump(const char *message) { + leave_suid(); failure_notify = NULL; releaseServerSockets(); if (message)