Hello community,
here is the log from the commit of package squid for openSUSE:Factory
checked in at Tue Aug 11 17:31:42 CEST 2009.
--------
--- squid/squid.changes 2008-10-27 18:04:46.000000000 +0100
+++ squid/squid.changes 2009-08-11 15:17:30.000000000 +0200
@@ -1,0 +2,15 @@
+Tue Aug 11 12:18:57 UTC 2009 - chris@computersalat.de
+
+- update to 2.7.STABLE6
+ * Bug #2494: Fix tproxy url in configure
+ * Correct latency measurements
+ * Correct upgrade_http0.9 example
+ * Correct parsing of invalid http version numbers
+ * Crossreference authenticate_ip_shortcircuit_access and
+ * authenticate_ip_shortcircuit_ttl
+ * Add in some better documentation for override-expire.
+- added upstream patches
+ o 12466, 12480-12495, 12497
+ o disabled 12488.patch (can not patch not existing file)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
squid-2.7.STABLE5-RELEASENOTES.html
squid-2.7.STABLE5.tar.bz2
New:
----
12466.patch
12480.patch
12481.patch
12482.patch
12483.patch
12484.patch
12485.patch
12486.patch
12487.patch
12488.patch
12489.patch
12490.patch
12491.patch
12492.patch
12493.patch
12494.patch
12495.patch
12497.patch
squid-2.7.STABLE6-RELEASENOTES.html
squid-2.7.STABLE6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ squid.spec ++++++
--- /var/tmp/diff_new_pack.6eN0gU/_old 2009-08-11 17:28:39.000000000 +0200
+++ /var/tmp/diff_new_pack.6eN0gU/_new 2009-08-11 17:28:39.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package squid (Version 2.7.STABLE5)
+# spec file for package squid (Version 2.7.STABLE6)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
BuildRequires: valgrind valgrind-devel
%endif
Summary: Squid WWW proxy server
-Version: 2.7.STABLE5
+Version: 2.7.STABLE6
Release: 1
License: GPL v2 or later
Url: http://www.squid-cache.org
@@ -53,24 +53,25 @@
Source12: http://www.squid-cache.org/WCCP-support/Linux/ip_wccp.c
Source13: squid.sysconfig
Patch0: squid-2.7.STABLE3-config.patch
-# Patch1: http://www.squid-cache.org/Versions/v2/2.7/changesets/12374.patch
-# Patch2: http://www.squid-cache.org/Versions/v2/2.7/changesets/12375.patch
-# Patch3: http://www.squid-cache.org/Versions/v2/2.7/changesets/12376.patch
-# Patch4: http://www.squid-cache.org/Versions/v2/2.7/changesets/12377.patch
-# Patch5: http://www.squid-cache.org/Versions/v2/2.7/changesets/12378.patch
-# Patch6: http://www.squid-cache.org/Versions/v2/2.7/changesets/12380.patch
-# Patch7: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch8: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch9: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch10: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch11: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch12: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch13: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch14: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch15: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch16: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch17: http://www.squid-cache.org/Versions/v2/2.7/changesets/
-# Patch18: http://www.squid-cache.org/Versions/v2/2.7/changesets/
+Patch1: http://www.squid-cache.org/Versions/v2/2.7/changesets/12466.patch
+Patch2: http://www.squid-cache.org/Versions/v2/2.7/changesets/12480.patch
+Patch3: http://www.squid-cache.org/Versions/v2/2.7/changesets/12481.patch
+Patch4: http://www.squid-cache.org/Versions/v2/2.7/changesets/12482.patch
+Patch5: http://www.squid-cache.org/Versions/v2/2.7/changesets/12483.patch
+Patch6: http://www.squid-cache.org/Versions/v2/2.7/changesets/12484.patch
+Patch7: http://www.squid-cache.org/Versions/v2/2.7/changesets/12485.patch
+Patch8: http://www.squid-cache.org/Versions/v2/2.7/changesets/12486.patch
+Patch9: http://www.squid-cache.org/Versions/v2/2.7/changesets/12487.patch
+# how to patch unexisting file ?
+#Patch10: http://www.squid-cache.org/Versions/v2/2.7/changesets/12488.patch
+Patch11: http://www.squid-cache.org/Versions/v2/2.7/changesets/12489.patch
+Patch12: http://www.squid-cache.org/Versions/v2/2.7/changesets/12490.patch
+Patch13: http://www.squid-cache.org/Versions/v2/2.7/changesets/12491.patch
+Patch14: http://www.squid-cache.org/Versions/v2/2.7/changesets/12492.patch
+Patch15: http://www.squid-cache.org/Versions/v2/2.7/changesets/12493.patch
+Patch16: http://www.squid-cache.org/Versions/v2/2.7/changesets/12494.patch
+Patch17: http://www.squid-cache.org/Versions/v2/2.7/changesets/12495.patch
+Patch18: http://www.squid-cache.org/Versions/v2/2.7/changesets/12497.patch
# Patch19: http://www.squid-cache.org/Versions/v2/2.7/changesets/
# Patch20: http://www.squid-cache.org/Versions/v2/2.7/changesets/
# Patch21: http://www.squid-cache.org/Versions/v2/2.7/changesets/
@@ -138,24 +139,25 @@
#mv msntauth-v2.0.3-squid.1 MSNT
#)
%patch0 -p1
-# %patch1 -p1
-# %patch2 -p1
-# %patch3 -p1
-# %patch4 -p1
-# %patch5 -p1
-# %patch6 -p1
-# %patch7 -p1
-# %patch8 -p1
-# %patch9 -p1
-# %patch10 -p1
-# %patch11 -p1
-# %patch12 -p1
-# %patch13 -p1
-# %patch14 -p1
-# %patch15 -p1
-# %patch16 -p1
-# %patch17 -p1
-# %patch18 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+# how to patch unexisting file ?
+#%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
# %patch19 -p1
# %patch20 -p1
# %patch21 -p1
++++++ 12466.patch ++++++
---------------------
PatchSet 12466
Date: 2009/05/04 05:19:56
Author: adrian
Branch: SQUID_2_7
Tag: (none)
Log:
Merge revision 1.4 from Squid-2.HEAD - Fix Bug #2661.
Members:
src/comm_devpoll.c:1.3.6.1->1.3.6.2
Index: squid/src/comm_devpoll.c
===================================================================
RCS file: /cvsroot/squid/squid/src/comm_devpoll.c,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -u -r1.3.6.1 -r1.3.6.2
--- squid/src/comm_devpoll.c 2 Feb 2009 11:10:53 -0000 1.3.6.1
+++ squid/src/comm_devpoll.c 4 May 2009 05:19:56 -0000 1.3.6.2
@@ -1,6 +1,6 @@
/*
- * $Id: comm_devpoll.c,v 1.3.6.1 2009/02/02 11:10:53 hno Exp $
+ * $Id: comm_devpoll.c,v 1.3.6.2 2009/05/04 05:19:56 adrian Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -37,8 +37,8 @@
#include
-#define DEVPOLL_UPDATESIZE 1024
-#define DEVPOLL_QUERYSIZE 1024
+#define DEVPOLL_UPDATESIZE OPEN_MAX
+#define DEVPOLL_QUERYSIZE OPEN_MAX
static int devpoll_fd;
static struct timespec zero_timespec;
++++++ 12480.patch ++++++
---------------------
PatchSet 12480
Date: 2009/06/25 22:43:36
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
MFC: Clarify external_acl_type %{Header} sightly
Members:
src/cf.data.pre:1.450.2.31->1.450.2.32
Index: squid/src/cf.data.pre
===================================================================
RCS file: /cvsroot/squid/squid/src/cf.data.pre,v
retrieving revision 1.450.2.31
retrieving revision 1.450.2.32
diff -u -r1.450.2.31 -r1.450.2.32
--- squid/src/cf.data.pre 2 Feb 2009 11:28:55 -0000 1.450.2.31
+++ squid/src/cf.data.pre 25 Jun 2009 22:43:36 -0000 1.450.2.32
@@ -1,6 +1,6 @@
#
-# $Id: cf.data.pre,v 1.450.2.31 2009/02/02 11:28:55 hno Exp $
+# $Id: cf.data.pre,v 1.450.2.32 2009/06/25 22:43:36 hno Exp $
#
# SQUID Web Proxy Cache http://www.squid-cache.org/
# ----------------------------------------------------------
@@ -428,8 +428,8 @@
%USER_CERTCHAIN SSL User certificate chain in PEM format
%USER_CERT_xx SSL User certificate subject attribute xx
%USER_CA_xx SSL User certificate issuer attribute xx
- %{Header} HTTP request header
- %{Hdr:member} HTTP request header list member
+ %{Header} HTTP request header "Header"
+ %{Hdr:member} HTTP request header "Hdr" list member "member"
%{Hdr:;member}
HTTP request header list member using ; as
list separator. ; can be any non-alphanumeric
++++++ 12481.patch ++++++
---------------------
PatchSet 12481
Date: 2009/06/25 22:45:10
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: Mark Nottingham
MFC: Bug #2482: Remove mem_obj->old_entry in async code to avoid deep ctx errors
Remove async->entry->mem_obj->old_entry because it is (apparently) unused, and causing deep ctx errors. Tested for some time now.
Members:
src/client_side.c:1.754.2.24->1.754.2.25
Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.754.2.24
retrieving revision 1.754.2.25
diff -u -r1.754.2.24 -r1.754.2.25
--- squid/src/client_side.c 6 Oct 2008 21:27:44 -0000 1.754.2.24
+++ squid/src/client_side.c 25 Jun 2009 22:45:10 -0000 1.754.2.25
@@ -1,6 +1,6 @@
/*
- * $Id: client_side.c,v 1.754.2.24 2008/10/06 21:27:44 hno Exp $
+ * $Id: client_side.c,v 1.754.2.25 2009/06/25 22:45:10 hno Exp $
*
* DEBUG: section 33 Client-side Routines
* AUTHOR: Duane Wessels
@@ -2169,8 +2169,6 @@
async->entry = storeCreateEntry(url,
request->flags,
request->method);
- async->entry->mem_obj->old_entry = async->old_entry;
- storeLockObject(async->entry->mem_obj->old_entry);
async->sc = storeClientRegister(async->entry, async);
request->etags = NULL; /* Should always be null as this was a cache hit, but just in case.. */
httpHeaderDelById(&request->header, HDR_RANGE);
++++++ 12482.patch ++++++
---------------------
PatchSet 12482
Date: 2009/06/25 22:45:47
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
MFC: Cosmetic change to make GCC happy
Members:
helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c:1.3.4.2->1.3.4.3
Index: squid/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
===================================================================
RCS file: /cvsroot/squid/squid/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- squid/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c 28 Sep 2008 22:44:36 -0000 1.3.4.2
+++ squid/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c 25 Jun 2009 22:45:47 -0000 1.3.4.3
@@ -269,7 +269,7 @@
}
if (debug)
- fprintf(stderr, "%s| %s: Got '%s' from squid (length: %d).\n", LogTime(), PROGRAM, buf?buf:"NULL",length);
+ fprintf(stderr, "%s| %s: Got '%s' from squid (length: %d).\n", LogTime(), PROGRAM, buf ,length);
if (buf[0] == '\0') {
if (debug)
++++++ 12483.patch ++++++
---------------------
PatchSet 12483
Date: 2009/06/25 22:47:17
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
MFC: Bug #2605: Don't call setsid() on helper childs when running in daemon mode
Members:
src/ipc.c:1.39->1.39.6.1
Index: squid/src/ipc.c
===================================================================
RCS file: /cvsroot/squid/squid/src/ipc.c,v
retrieving revision 1.39
retrieving revision 1.39.6.1
diff -u -r1.39 -r1.39.6.1
--- squid/src/ipc.c 8 Sep 2006 19:41:24 -0000 1.39
+++ squid/src/ipc.c 25 Jun 2009 22:47:17 -0000 1.39.6.1
@@ -1,6 +1,6 @@
/*
- * $Id: ipc.c,v 1.39 2006/09/08 19:41:24 serassio Exp $
+ * $Id: ipc.c,v 1.39.6.1 2009/06/25 22:47:17 hno Exp $
*
* DEBUG: section 54 Interprocess Communication
* AUTHOR: Duane Wessels
@@ -307,7 +307,8 @@
close(x);
#endif
#if HAVE_SETSID
- setsid();
+ if (opt_no_daemon)
+ setsid();
#endif
execvp(prog, (char *const *) args);
debug_log = fdopen(2, "a+");
++++++ 12484.patch ++++++
---------------------
PatchSet 12484
Date: 2009/06/25 22:47:57
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: serassio
MFC: Windows port: Fix PSAPI.DLL usage, is always available on Windows NT and later
Members:
src/win32.c:1.18.2.5->1.18.2.6
Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid/squid/src/win32.c,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -u -r1.18.2.5 -r1.18.2.6
--- squid/src/win32.c 30 Jun 2008 16:20:06 -0000 1.18.2.5
+++ squid/src/win32.c 25 Jun 2009 22:47:57 -0000 1.18.2.6
@@ -1,6 +1,6 @@
/*
- * $Id: win32.c,v 1.18.2.5 2008/06/30 16:20:06 serassio Exp $
+ * $Id: win32.c,v 1.18.2.6 2009/06/25 22:47:57 hno Exp $
*
* Windows support
* AUTHOR: Guido Serassio
@@ -894,9 +894,8 @@
WIN32_getrusage(int who, struct rusage *usage)
{
#if HAVE_WIN32_PSAPI
- if ((WIN32_OS_version == _WIN_OS_WINNT) || (WIN32_OS_version == _WIN_OS_WIN2K)
- || (WIN32_OS_version == _WIN_OS_WINXP) || (WIN32_OS_version == _WIN_OS_WINNET)) {
- /* On Windows NT/2000 call PSAPI.DLL for process Memory */
+ if (WIN32_OS_version >= _WIN_OS_WINNT) {
+ /* On Windows NT and later call PSAPI.DLL for process Memory */
/* informations -- Guido Serassio */
HANDLE hProcess;
PROCESS_MEMORY_COUNTERS pmc;
++++++ 12485.patch ++++++
---------------------
PatchSet 12485
Date: 2009/06/25 22:48:37
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: serassio
MFC: Windows port: Added support for Windows 7, Windows Server 2008 R2 and later
Members:
src/dns_internal.c:1.63.2.7->1.63.2.8
src/enums.h:1.245.2.3->1.245.2.4
src/win32.c:1.18.2.6->1.18.2.7
Index: squid/src/dns_internal.c
===================================================================
RCS file: /cvsroot/squid/squid/src/dns_internal.c,v
retrieving revision 1.63.2.7
retrieving revision 1.63.2.8
diff -u -r1.63.2.7 -r1.63.2.8
--- squid/src/dns_internal.c 27 Jun 2008 20:56:26 -0000 1.63.2.7
+++ squid/src/dns_internal.c 25 Jun 2009 22:48:37 -0000 1.63.2.8
@@ -1,6 +1,6 @@
/*
- * $Id: dns_internal.c,v 1.63.2.7 2008/06/27 20:56:26 hno Exp $
+ * $Id: dns_internal.c,v 1.63.2.8 2009/06/25 22:48:37 hno Exp $
*
* DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c
* AUTHOR: Duane Wessels
@@ -417,6 +417,7 @@
case _WIN_OS_WINXP:
case _WIN_OS_WINNET:
case _WIN_OS_WINLON:
+ case _WIN_OS_WIN7:
/* get nameservers from the Windows 2000 registry */
/* search all interfaces for DNS server addresses */
if (RegOpenKey(HKEY_LOCAL_MACHINE,
Index: squid/src/enums.h
===================================================================
RCS file: /cvsroot/squid/squid/src/enums.h,v
retrieving revision 1.245.2.3
retrieving revision 1.245.2.4
diff -u -r1.245.2.3 -r1.245.2.4
--- squid/src/enums.h 25 Sep 2008 02:33:37 -0000 1.245.2.3
+++ squid/src/enums.h 25 Jun 2009 22:48:37 -0000 1.245.2.4
@@ -1,6 +1,6 @@
/*
- * $Id: enums.h,v 1.245.2.3 2008/09/25 02:33:37 hno Exp $
+ * $Id: enums.h,v 1.245.2.4 2009/06/25 22:48:37 hno Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
@@ -773,7 +773,8 @@
_WIN_OS_WIN2K,
_WIN_OS_WINXP,
_WIN_OS_WINNET,
- _WIN_OS_WINLON
+ _WIN_OS_WINLON,
+ _WIN_OS_WIN7
};
#endif
Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid/squid/src/win32.c,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.7
diff -u -r1.18.2.6 -r1.18.2.7
--- squid/src/win32.c 25 Jun 2009 22:47:57 -0000 1.18.2.6
+++ squid/src/win32.c 25 Jun 2009 22:48:37 -0000 1.18.2.7
@@ -1,6 +1,6 @@
/*
- * $Id: win32.c,v 1.18.2.6 2009/06/25 22:47:57 hno Exp $
+ * $Id: win32.c,v 1.18.2.7 2009/06/25 22:48:37 hno Exp $
*
* Windows support
* AUTHOR: Guido Serassio
@@ -280,6 +280,20 @@
WIN32_OS_string = xstrdup("Windows Server 2008");
return _WIN_OS_WINLON;
}
+ if ((osvi.dwMajorVersion == 6) && (osvi.dwMinorVersion == 1)) {
+ if (osvi.wProductType == VER_NT_WORKSTATION)
+ WIN32_OS_string = xstrdup("Windows 7");
+ else
+ WIN32_OS_string = xstrdup("Windows Server 2008 R2");
+ return _WIN_OS_WIN7;
+ }
+ if (((osvi.dwMajorVersion > 6)) || ((osvi.dwMajorVersion == 6) && (osvi.dwMinorVersion > 1))) {
+ if (osvi.wProductType == VER_NT_WORKSTATION)
+ WIN32_OS_string = xstrdup("Unknown Windows version, assuming Windows 7 capabilities");
+ else
+ WIN32_OS_string = xstrdup("Unknown Windows version, assuming Windows Server 2008 R2 capabilities");
+ return _WIN_OS_WIN7;
+ }
break;
case VER_PLATFORM_WIN32_WINDOWS:
if ((osvi.dwMajorVersion == 4) && (osvi.dwMinorVersion == 0)) {
++++++ 12486.patch ++++++
---------------------
PatchSet 12486
Date: 2009/06/25 22:49:28
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: Mark Nottingham
MFC: Bug #2602: increase MAX_URL
Squid's MAX_URL has been raised to 8192 in 3.x, but not 2.7. For consistency
and to conform to what's likely to be HTTPbis' recommendation, it should be
raised as well.
Members:
src/defines.h:1.126->1.126.2.1
Index: squid/src/defines.h
===================================================================
RCS file: /cvsroot/squid/squid/src/defines.h,v
retrieving revision 1.126
retrieving revision 1.126.2.1
diff -u -r1.126 -r1.126.2.1
--- squid/src/defines.h 24 Sep 2007 13:31:19 -0000 1.126
+++ squid/src/defines.h 25 Jun 2009 22:49:28 -0000 1.126.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: defines.h,v 1.126 2007/09/24 13:31:19 hno Exp $
+ * $Id: defines.h,v 1.126.2.1 2009/06/25 22:49:28 hno Exp $
*
*
* SQUID Web Proxy Cache http://www.squid-cache.org/
@@ -181,7 +181,7 @@
#define MAX_FILES_PER_DIR (1<<20)
-#define MAX_URL 4096
+#define MAX_URL 8192
#define MAX_LOGIN_SZ 128
#define PEER_MAX_ADDRESSES 10
++++++ 12487.patch ++++++
---------------------
PatchSet 12487
Date: 2009/06/25 22:50:22
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: serassio
MFC: The debug mode option '-d' was not documented in LDAP helpers usage message
Members:
helpers/basic_auth/LDAP/squid_ldap_auth.c:1.35->1.35.2.1
helpers/external_acl/ldap_group/squid_ldap_group.c:1.14.6.3->1.14.6.4
Index: squid/helpers/basic_auth/LDAP/squid_ldap_auth.c
===================================================================
RCS file: /cvsroot/squid/squid/helpers/basic_auth/LDAP/squid_ldap_auth.c,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -r1.35 -r1.35.2.1
--- squid/helpers/basic_auth/LDAP/squid_ldap_auth.c 27 Aug 2007 14:52:51 -0000 1.35
+++ squid/helpers/basic_auth/LDAP/squid_ldap_auth.c 25 Jun 2009 22:50:22 -0000 1.35.2.1
@@ -544,6 +544,7 @@
fprintf(stderr, "\t-v 2|3\t\t\tLDAP version\n");
fprintf(stderr, "\t-Z\t\t\tTLS encrypt the LDAP connection, requires LDAP version 3\n");
#endif
+ fprintf(stderr, "\t-d\t\t\tenable debug mode\n");
fprintf(stderr, "\n");
fprintf(stderr, "\tIf no search filter is specified, then the dn <userattr>=user,basedn\n\twill be used (same as specifying a search filter of '<userattr>=',\n\tbut quicker as as there is no need to search for the user DN)\n\n");
fprintf(stderr, "\tIf you need to bind as a user to perform searches then use the\n\t-D binddn -w bindpasswd or -D binddn -W secretfile options\n\n");
Index: squid/helpers/external_acl/ldap_group/squid_ldap_group.c
===================================================================
RCS file: /cvsroot/squid/squid/helpers/external_acl/ldap_group/squid_ldap_group.c,v
retrieving revision 1.14.6.3
retrieving revision 1.14.6.4
diff -u -r1.14.6.3 -r1.14.6.4
--- squid/helpers/external_acl/ldap_group/squid_ldap_group.c 3 Aug 2008 22:11:37 -0000 1.14.6.3
+++ squid/helpers/external_acl/ldap_group/squid_ldap_group.c 25 Jun 2009 22:50:23 -0000 1.14.6.4
@@ -431,6 +431,7 @@
fprintf(stderr, "\t-g\t\t\tfirst query parameter is base DN extension\n\t\t\t\tfor this query\n");
fprintf(stderr, "\t-S\t\t\tStrip NT domain from usernames\n");
fprintf(stderr, "\t-K\t\t\tStrip Kerberos realm from usernames\n");
+ fprintf(stderr, "\t-d\t\t\tenable debug mode\n");
fprintf(stderr, "\n");
fprintf(stderr, "\tIf you need to bind as a user to perform searches then use the\n\t-D binddn -w bindpasswd or -D binddn -W secretfile options\n\n");
exit(1);
++++++ 12488.patch ++++++
---------------------
PatchSet 12488
Date: 2009/06/25 22:51:35
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: serassio
MFC: Windows port: Added a note about installation on Windows Vista and later
Members:
doc/release-notes/release.sgml:1.1.2.16->1.1.2.17
Index: squid/doc/release-notes/release.sgml
===================================================================
RCS file: /cvsroot/squid/squid/doc/release-notes/release.sgml,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- squid/doc/release-notes/release.sgml 2 Feb 2009 12:02:34 -0000 1.1.2.16
+++ squid/doc/release-notes/release.sgml 25 Jun 2009 22:51:35 -0000 1.1.2.17
@@ -2,7 +2,7 @@
<article>
<title>Squid 2.7.STABLE6 release notes</title>
<author>Squid Developers</author>
-<date>$Id: release.sgml,v 1.1.2.16 2009/02/02 12:02:34 hno Exp $
+<date>$Id: release.sgml,v 1.1.2.17 2009/06/25 22:51:35 hno Exp $
<abstract>
This document contains the release notes for version 2.7 of Squid.
@@ -360,6 +360,7 @@
<item>When Squid runs in command line mode, the launching user account must have administrative privilege on the system
<item>"Start parameters" in the Windows 2000/XP/2003 Service applet cannot be used
<item>Building with MinGW, when the configure option --enable-truncate is used, Squid cannot run on Windows NT, only Windows 2000 and later are supported
+<item>On Windows Vista and later, User Account Control (UAC) must be disabled before running service installation
</itemize>
<sect1>Known Limitations
++++++ 12489.patch ++++++
---------------------
PatchSet 12489
Date: 2009/06/25 22:53:15
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: Mark Nottingham
MFC: Bug #2642: Remove duplicate peerMonitorInit() on reconfigure
mainReconfigure() calls serverConnectionsOpen, which calls peerMonitorInit(),
and then calls peerMonitorInit() directly.
This has the effect of spawning a duplicate monitoring event for each peer
every time Squid is reconfigured.
Members:
src/main.c:1.403.2.3->1.403.2.4
Index: squid/src/main.c
===================================================================
RCS file: /cvsroot/squid/squid/src/main.c,v
retrieving revision 1.403.2.3
retrieving revision 1.403.2.4
diff -u -r1.403.2.3 -r1.403.2.4
--- squid/src/main.c 25 Sep 2008 02:21:52 -0000 1.403.2.3
+++ squid/src/main.c 25 Jun 2009 22:53:15 -0000 1.403.2.4
@@ -1,6 +1,6 @@
/*
- * $Id: main.c,v 1.403.2.3 2008/09/25 02:21:52 hno Exp $
+ * $Id: main.c,v 1.403.2.4 2009/06/25 22:53:15 hno Exp $
*
* DEBUG: section 1 Startup and Main Loop
* AUTHOR: Harvest Derived
@@ -456,7 +456,6 @@
writePidFile(); /* write PID file */
debug(1, 1) ("Ready to serve requests.\n");
reconfiguring = 0;
- peerMonitorInit();
}
static void
++++++ 12490.patch ++++++
---------------------
PatchSet 12490
Date: 2009/06/25 22:54:13
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: Mark Nottingham
MFC: Bug #2515: Final chunk parsing errors on FreeBSD6+
Because strtoll has different behaviour (actually, POSIX-compliant, AFAICT, but whatever)
on FreeBSD6+, it's not possible to count on strtoll not setting errno to EINVALID when parsing
"/r/n".
This patch checks to see if it's an empty line before checking errno, avoiding this problem.
Members:
src/http.c:1.439.2.7->1.439.2.8
Index: squid/src/http.c
===================================================================
RCS file: /cvsroot/squid/squid/src/http.c,v
retrieving revision 1.439.2.7
retrieving revision 1.439.2.8
diff -u -r1.439.2.7 -r1.439.2.8
--- squid/src/http.c 25 Sep 2008 02:33:37 -0000 1.439.2.7
+++ squid/src/http.c 25 Jun 2009 22:54:13 -0000 1.439.2.8
@@ -1,6 +1,6 @@
/*
- * $Id: http.c,v 1.439.2.7 2008/09/25 02:33:37 hno Exp $
+ * $Id: http.c,v 1.439.2.8 2009/06/25 22:54:13 hno Exp $
*
* DEBUG: section 11 Hypertext Transfer Protocol (HTTP)
* AUTHOR: Harvest Derived
@@ -699,10 +699,10 @@
debug(11, 3) ("Chunk header '%s'\n", strBuf(httpState->chunkhdr));
errno = 0;
httpState->chunk_size = strto_off_t(strBuf(httpState->chunkhdr), &end, 16);
- if (errno)
- badchunk = 1;
- else if (end == strBuf(httpState->chunkhdr))
+ if (end == strBuf(httpState->chunkhdr))
emptychunk = 1;
+ else if (errno)
+ badchunk = 1;
while (end && (*end == '\r' || *end == ' ' || *end == '\t'))
end++;
if (httpState->chunk_size < 0 || badchunk || !end || (*end != '\n' && *end != ';')) {
++++++ 12491.patch ++++++
---------------------
PatchSet 12491
Date: 2009/06/25 22:55:50
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: Mark Nottingham
MFC: Bug #2647: Reprioritise override-* and stale-while-revalidate
In the "At this point the response is stale" section of refreshCheck(), Squid
does the stale-while-revalidate and stale-if-error checks before the checks for
override-expire and override-lastmod.
In some circumstances, this can cause undesireable side effects. For example, a
response with an invalid Expires header, an Expires header in the past, or
Cache-Control: max-age=0, in combination with
refresh_pattern . 1 100% 1 override-expire stale-while-revalidate=15
will, once the one minute window passes, go into a state where requests are
always served as TCP_STALE_HIT (with a corresponding TCP_ASYNC_MISS), as long
as a request comes in the 15 second stale-while-revalidate window and at least
once every 15 seconds thereafter.
The fix is to place the override-* checks before the stale-while-revalidate
logic, so that an already-stale response has the overridden freshness applied
before the stale checks happen.
Members:
src/refresh.c:1.67->1.67.2.1
Index: squid/src/refresh.c
===================================================================
RCS file: /cvsroot/squid/squid/src/refresh.c,v
retrieving revision 1.67
retrieving revision 1.67.2.1
diff -u -r1.67 -r1.67.2.1
--- squid/src/refresh.c 13 Dec 2007 01:25:34 -0000 1.67
+++ squid/src/refresh.c 25 Jun 2009 22:55:50 -0000 1.67.2.1
@@ -1,6 +1,6 @@
/*
- * $Id: refresh.c,v 1.67 2007/12/13 01:25:34 hno Exp $
+ * $Id: refresh.c,v 1.67.2.1 2009/06/25 22:55:50 hno Exp $
*
* DEBUG: section 22 Refresh Calculation
* AUTHOR: Harvest Derived
@@ -334,6 +334,16 @@
* At this point the response is stale, unless one of
* the override options kicks in.
*/
+#if HTTP_VIOLATIONS
+ if (sf.expires && R->flags.override_expire && age < R->min) {
+ debug(22, 3) ("refreshCheck: NO: age < min && override-expire\n");
+ return FRESH_OVERRIDE_EXPIRES;
+ }
+ if (sf.lmfactor && R->flags.override_lastmod && age < R->min) {
+ debug(22, 3) ("refreshCheck: NO: age < min && override-lastmod\n");
+ return FRESH_OVERRIDE_LASTMOD;
+ }
+#endif
if (entry->mem_obj) {
int stale_while_revalidate = -1;
if (entry->mem_obj->reply && entry->mem_obj->reply->cache_control && EBIT_TEST(entry->mem_obj->reply->cache_control->mask, CC_STALE_WHILE_REVALIDATE))
@@ -357,26 +367,12 @@
if (delta < 0 && staleness + delta < 0) {
return STALE_WITHIN_DELTA;
}
- if (sf.expires) {
-#if HTTP_VIOLATIONS
- if (R->flags.override_expire && age < R->min) {
- debug(22, 3) ("refreshCheck: NO: age < min && override-expire\n");
- return FRESH_OVERRIDE_EXPIRES;
- }
-#endif
+ if (sf.expires)
return STALE_EXPIRES;
- }
if (sf.max)
return STALE_MAX_RULE;
- if (sf.lmfactor) {
-#if HTTP_VIOLATIONS
- if (R->flags.override_lastmod && age < R->min) {
- debug(22, 3) ("refreshCheck: NO: age < min && override-lastmod\n");
- return FRESH_OVERRIDE_LASTMOD;
- }
-#endif
+ if (sf.lmfactor)
return STALE_LMFACTOR_RULE;
- }
return STALE_DEFAULT;
}
++++++ 12492.patch ++++++
---------------------
PatchSet 12492
Date: 2009/06/25 22:56:47
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: serassio
MFC: Windows port: Fix improper access permissions to registry and DNS parsing from registry
- RegOpenKey() always try to open registry keys in full control mode, even if not needed.
This could make Squid to fail when running as a non privileged user. RegOpenKeyEx() allow to
specify only the needed priviledge and now is used instead.
- When parsing DNS setting into registry, a fixed size loop was used. Now the loop count is
dynamic.
- Also ran indent.
Members:
src/dns_internal.c:1.63.2.8->1.63.2.9
src/win32.c:1.18.2.7->1.18.2.8
Index: squid/src/dns_internal.c
===================================================================
RCS file: /cvsroot/squid/squid/src/dns_internal.c,v
retrieving revision 1.63.2.8
retrieving revision 1.63.2.9
diff -u -r1.63.2.8 -r1.63.2.9
--- squid/src/dns_internal.c 25 Jun 2009 22:48:37 -0000 1.63.2.8
+++ squid/src/dns_internal.c 25 Jun 2009 22:56:47 -0000 1.63.2.9
@@ -1,6 +1,6 @@
/*
- * $Id: dns_internal.c,v 1.63.2.8 2009/06/25 22:48:37 hno Exp $
+ * $Id: dns_internal.c,v 1.63.2.9 2009/06/25 22:56:47 hno Exp $
*
* DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c
* AUTHOR: Duane Wessels
@@ -50,6 +50,9 @@
#ifdef _SQUID_WIN32_
#include
+#define REG_TCPIP_PARA_INTERFACES "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces"
+#define REG_TCPIP_PARA "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"
+#define REG_VXD_MSTCP "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP"
#endif
#ifndef _PATH_RESCONF
#define _PATH_RESCONF "/etc/resolv.conf"
@@ -318,32 +321,24 @@
char *token;
HKEY hndKey;
- if (RegOpenKey(HKEY_LOCAL_MACHINE,
- "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",
- &hndKey) == ERROR_SUCCESS) {
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_TCPIP_PARA, 0, KEY_QUERY_VALUE, &hndKey) == ERROR_SUCCESS) {
DWORD Type = 0;
DWORD Size = 0;
LONG Result;
- Result =
- RegQueryValueEx(hndKey, "Domain", NULL, &Type, NULL,
- &Size);
+ Result = RegQueryValueEx(hndKey, "Domain", NULL, &Type, NULL, &Size);
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey, "Domain", NULL, &Type, (LPBYTE) t,
- &Size);
+ RegQueryValueEx(hndKey, "Domain", NULL, &Type, (LPBYTE) t, &Size);
debug(78, 1) ("Adding domain %s from Registry\n", t);
idnsAddPathComponent(t);
xfree(t);
}
- Result =
- RegQueryValueEx(hndKey, "SearchList", NULL, &Type, NULL,
- &Size);
+ Result = RegQueryValueEx(hndKey, "SearchList", NULL, &Type, NULL, &Size);
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey, "SearchList", NULL, &Type, (LPBYTE) t,
- &Size);
+ RegQueryValueEx(hndKey, "SearchList", NULL, &Type, (LPBYTE) t, &Size);
token = strtok(t, Separator);
idnsFreeSearchpath();
@@ -373,24 +368,18 @@
switch (WIN32_OS_version) {
case _WIN_OS_WINNT:
/* get nameservers from the Windows NT registry */
- if (RegOpenKey(HKEY_LOCAL_MACHINE,
- "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters",
- &hndKey) == ERROR_SUCCESS) {
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_TCPIP_PARA, 0, KEY_QUERY_VALUE, &hndKey) == ERROR_SUCCESS) {
DWORD Type = 0;
DWORD Size = 0;
LONG Result;
- Result =
- RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, NULL,
- &Size);
+ Result = RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, NULL, &Size);
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, t,
- &Size);
+ RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, t, &Size);
token = strtok(t, ", ");
while (token) {
idnsAddNameserver(token);
- debug(78, 1) ("Adding DHCP nameserver %s from Registry\n",
- token);
+ debug(78, 1) ("Adding DHCP nameserver %s from Registry\n", token);
token = strtok(NULL, ", ");
}
xfree(t);
@@ -402,8 +391,7 @@
RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
token = strtok(t, ", ");
while (token) {
- debug(78, 1) ("Adding nameserver %s from Registry\n",
- token);
+ debug(78, 1) ("Adding nameserver %s from Registry\n", token);
idnsAddNameserver(token);
token = strtok(NULL, ", ");
}
@@ -420,60 +408,58 @@
case _WIN_OS_WIN7:
/* get nameservers from the Windows 2000 registry */
/* search all interfaces for DNS server addresses */
- if (RegOpenKey(HKEY_LOCAL_MACHINE,
- "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces",
- &hndKey) == ERROR_SUCCESS) {
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_TCPIP_PARA_INTERFACES, 0, KEY_READ, &hndKey) == ERROR_SUCCESS) {
int i;
- char keyname[255];
-
- for (i = 0; i < 10; i++) {
- if (RegEnumKey(hndKey, i, (char *) &keyname,
- 255) == ERROR_SUCCESS) {
- char newkeyname[255];
- strcpy(newkeyname,
- "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\");
- strcat(newkeyname, keyname);
- if (RegOpenKey(HKEY_LOCAL_MACHINE, newkeyname,
- &hndKey2) == ERROR_SUCCESS) {
- DWORD Type = 0;
- DWORD Size = 0;
- LONG Result;
- Result =
- RegQueryValueEx(hndKey2, "DhcpNameServer", NULL,
- &Type, NULL, &Size);
- if (Result == ERROR_SUCCESS && Size) {
- t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey2, "DhcpNameServer", NULL,
- &Type, t, &Size);
- token = strtok(t, ", ");
- while (token) {
- debug(78, 1)
- ("Adding DHCP nameserver %s from Registry\n",
- token);
- idnsAddNameserver(token);
- token = strtok(NULL, ", ");
+ int MaxSubkeyLen;
+ DWORD InterfacesCount;
+ char *keyname;
+ FILETIME ftLastWriteTime;
+
+ if (RegQueryInfoKey(hndKey, NULL, NULL, NULL, &InterfacesCount, &MaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
+ keyname = (char *) xmalloc(++MaxSubkeyLen);
+ for (i = 0; i < (int) InterfacesCount; i++) {
+ int j;
+ j = MaxSubkeyLen;
+ if (RegEnumKeyEx(hndKey, i, keyname, &j, NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) {
+ char *newkeyname;
+ newkeyname = (char *) xmalloc(sizeof(REG_TCPIP_PARA_INTERFACES) + j + 2);
+ strcpy(newkeyname, REG_TCPIP_PARA_INTERFACES);
+ strcat(newkeyname, "\\");
+ strcat(newkeyname, keyname);
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, newkeyname, 0, KEY_QUERY_VALUE, &hndKey2) == ERROR_SUCCESS) {
+ DWORD Type = 0;
+ DWORD Size = 0;
+ LONG Result;
+ Result = RegQueryValueEx(hndKey2, "DhcpNameServer", NULL, &Type, NULL, &Size);
+ if (Result == ERROR_SUCCESS && Size) {
+ t = (char *) xmalloc(Size);
+ RegQueryValueEx(hndKey2, "DhcpNameServer", NULL, &Type, t, &Size);
+ token = strtok(t, ", ");
+ while (token) {
+ debug(78, 1) ("Adding DHCP nameserver %s from Registry\n", token);
+ idnsAddNameserver(token);
+ token = strtok(NULL, ", ");
+ }
+ xfree(t);
}
- xfree(t);
- }
- Result =
- RegQueryValueEx(hndKey2, "NameServer", NULL, &Type,
- NULL, &Size);
- if (Result == ERROR_SUCCESS && Size) {
- t = (char *) xmalloc(Size);
- RegQueryValueEx(hndKey2, "NameServer", NULL, &Type,
- t, &Size);
- token = strtok(t, ", ");
- while (token) {
- debug(78, 1) ("Adding nameserver %s from Registry\n",
- token);
- idnsAddNameserver(token);
- token = strtok(NULL, ", ");
+ Result = RegQueryValueEx(hndKey2, "NameServer", NULL, &Type, NULL, &Size);
+ if (Result == ERROR_SUCCESS && Size) {
+ t = (char *) xmalloc(Size);
+ RegQueryValueEx(hndKey2, "NameServer", NULL, &Type, t, &Size);
+ token = strtok(t, ", ");
+ while (token) {
+ debug(78, 1) ("Adding nameserver %s from Registry\n", token);
+ idnsAddNameserver(token);
+ token = strtok(NULL, ", ");
+ }
+ xfree(t);
}
- xfree(t);
+ RegCloseKey(hndKey2);
}
- RegCloseKey(hndKey2);
+ xfree(newkeyname);
}
}
+ xfree(keyname);
}
RegCloseKey(hndKey);
}
@@ -483,21 +469,17 @@
case _WIN_OS_WIN98:
case _WIN_OS_WINME:
/* get nameservers from the Windows 9X registry */
- if (RegOpenKey(HKEY_LOCAL_MACHINE,
- "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP",
- &hndKey) == ERROR_SUCCESS) {
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_VXD_MSTCP, 0, KEY_QUERY_VALUE, &hndKey) == ERROR_SUCCESS) {
DWORD Type = 0;
DWORD Size = 0;
LONG Result;
- Result =
- RegQueryValueEx(hndKey, "NameServer", NULL, &Type, NULL, &Size);
+ Result = RegQueryValueEx(hndKey, "NameServer", NULL, &Type, NULL, &Size);
if (Result == ERROR_SUCCESS && Size) {
t = (char *) xmalloc(Size);
RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
token = strtok(t, ", ");
while (token) {
- debug(78, 1) ("Adding nameserver %s from Registry\n",
- token);
+ debug(78, 1) ("Adding nameserver %s from Registry\n", token);
idnsAddNameserver(token);
token = strtok(NULL, ", ");
}
Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid/squid/src/win32.c,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -u -r1.18.2.7 -r1.18.2.8
--- squid/src/win32.c 25 Jun 2009 22:48:37 -0000 1.18.2.7
+++ squid/src/win32.c 25 Jun 2009 22:56:47 -0000 1.18.2.8
@@ -1,6 +1,6 @@
/*
- * $Id: win32.c,v 1.18.2.7 2009/06/25 22:48:37 hno Exp $
+ * $Id: win32.c,v 1.18.2.8 2009/06/25 22:56:47 hno Exp $
*
* Windows support
* AUTHOR: Guido Serassio
@@ -471,9 +471,7 @@
if (signal(SIGABRT, WIN32_Abort) == SIG_ERR)
return 1;
/* Register the service Handler function */
- svcHandle =
- RegisterServiceCtrlHandler(WIN32_Service_name,
- WIN32_svcHandler);
+ svcHandle = RegisterServiceCtrlHandler(WIN32_Service_name, WIN32_svcHandler);
if (svcHandle == 0)
return 1;
/* Set Process work dir to directory cointaining squid.exe */
@@ -484,26 +482,22 @@
return 1;
safe_free(ConfigFile);
/* get config file from Windows Registry */
- if (RegOpenKey(HKEY_LOCAL_MACHINE, REGKEY, &hndKey) == ERROR_SUCCESS) {
+ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REGKEY, 0, KEY_QUERY_VALUE, &hndKey) == ERROR_SUCCESS) {
DWORD Type = 0;
DWORD Size = 0;
LONG Result;
- Result =
- RegQueryValueEx(hndKey, CONFIGFILE, NULL, &Type, NULL, &Size);
+ Result = RegQueryValueEx(hndKey, CONFIGFILE, NULL, &Type, NULL, &Size);
if (Result == ERROR_SUCCESS && Size) {
ConfigFile = xmalloc(Size);
- RegQueryValueEx(hndKey, CONFIGFILE, NULL, &Type, ConfigFile,
- &Size);
+ RegQueryValueEx(hndKey, CONFIGFILE, NULL, &Type, ConfigFile, &Size);
} else
ConfigFile = xstrdup(DefaultConfigFile);
Size = 0;
Type = 0;
- Result =
- RegQueryValueEx(hndKey, COMMANDLINE, NULL, &Type, NULL, &Size);
+ Result = RegQueryValueEx(hndKey, COMMANDLINE, NULL, &Type, NULL, &Size);
if (Result == ERROR_SUCCESS && Size) {
WIN32_Service_Command_Line = xmalloc(Size);
- RegQueryValueEx(hndKey, COMMANDLINE, NULL, &Type, WIN32_Service_Command_Line,
- &Size);
+ RegQueryValueEx(hndKey, COMMANDLINE, NULL, &Type, WIN32_Service_Command_Line, &Size);
} else
WIN32_Service_Command_Line = xstrdup("");
RegCloseKey(hndKey);
@@ -517,8 +511,7 @@
/* Set Service Status to SERVICE_START_PENDING */
svcStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
svcStatus.dwCurrentState = SERVICE_START_PENDING;
- svcStatus.dwControlsAccepted =
- SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+ svcStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
svcStatus.dwWin32ExitCode = 0;
svcStatus.dwServiceSpecificExitCode = 0;
svcStatus.dwCheckPoint = 0;
++++++ 12493.patch ++++++
---------------------
PatchSet 12493
Date: 2009/06/25 22:57:34
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: serassio
MFC: Windows port: Fix getservbyname() usage abuse.
On Windows, when calling getservbyname() with a numeric value,
sometimes the result is unexpected.
This patch add a check for numeric values before calling it.
Members:
src/cache_cf.c:1.480.2.12->1.480.2.13
Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid/squid/src/cache_cf.c,v
retrieving revision 1.480.2.12
retrieving revision 1.480.2.13
diff -u -r1.480.2.12 -r1.480.2.13
--- squid/src/cache_cf.c 27 Jun 2008 21:52:56 -0000 1.480.2.12
+++ squid/src/cache_cf.c 25 Jun 2009 22:57:34 -0000 1.480.2.13
@@ -1,6 +1,6 @@
/*
- * $Id: cache_cf.c,v 1.480.2.12 2008/06/27 21:52:56 hno Exp $
+ * $Id: cache_cf.c,v 1.480.2.13 2009/06/25 22:57:34 hno Exp $
*
* DEBUG: section 3 Configuration File Parsing
* AUTHOR: Harvest Derived
@@ -1684,6 +1684,23 @@
}
}
+/*
+ * utility function to prevent getservbyname() being called with a numeric value
+ * on Windows at least it returns garage results.
+ */
+static int
+isUnsignedNumeric(const char *str, size_t len)
+{
+ if (len < 1)
+ return 0;
+
+ for (; len > 0 && *str; str++, len--) {
+ if (!isdigit(*str))
+ return 0;
+ }
+ return 1;
+}
+
static u_short
GetService(const char *proto)
{
@@ -1693,7 +1710,8 @@
self_destruct();
return -1; /* NEVER REACHED */
}
- port = getservbyname(token, proto);
+ if (!isUnsignedNumeric(token, strlen(token)))
+ port = getservbyname(token, proto);
if (port != NULL) {
return ntohs((u_short) port->s_port);
}
++++++ 12494.patch ++++++
---------------------
PatchSet 12494
Date: 2009/06/25 22:58:10
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: fancyrabbit
MFC: Bug 2672: cacheMemMaxSize 32-bit overflow during snmpwalk
snint is 32-bits. Unwrapped the code casts int64 to int32 before
reducing the base unit size to MB.
Members:
src/snmp_agent.c:1.89->1.89.6.1
Index: squid/src/snmp_agent.c
===================================================================
RCS file: /cvsroot/squid/squid/src/snmp_agent.c,v
retrieving revision 1.89
retrieving revision 1.89.6.1
diff -u -r1.89 -r1.89.6.1
--- squid/src/snmp_agent.c 9 Nov 2006 16:35:07 -0000 1.89
+++ squid/src/snmp_agent.c 25 Jun 2009 22:58:10 -0000 1.89.6.1
@@ -1,6 +1,6 @@
/*
- * $Id: snmp_agent.c,v 1.89 2006/11/09 16:35:07 hno Exp $
+ * $Id: snmp_agent.c,v 1.89.6.1 2009/06/25 22:58:10 hno Exp $
*
* DEBUG: section 49 SNMP Interface
* AUTHOR: Kostas Anagnostakis
@@ -103,7 +103,7 @@
switch (Var->name[LEN_SQ_CONF + 1]) {
case CONF_ST_MMAXSZ:
Answer = snmp_var_new_integer(Var->name, Var->name_length,
- (snint) Config.memMaxSize >> 20,
+ (snint) (Config.memMaxSize >> 20),
ASN_INTEGER);
break;
case CONF_ST_SWMAXSZ:
++++++ 12495.patch ++++++
---------------------
PatchSet 12495
Date: 2009/06/25 22:58:37
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
MFC: Bug #2691: store_url memory leak
Members:
src/store.c:1.584.2.7->1.584.2.8
Index: squid/src/store.c
===================================================================
RCS file: /cvsroot/squid/squid/src/store.c,v
retrieving revision 1.584.2.7
retrieving revision 1.584.2.8
diff -u -r1.584.2.7 -r1.584.2.8
--- squid/src/store.c 6 Oct 2008 21:26:42 -0000 1.584.2.7
+++ squid/src/store.c 25 Jun 2009 22:58:37 -0000 1.584.2.8
@@ -1,6 +1,6 @@
/*
- * $Id: store.c,v 1.584.2.7 2008/10/06 21:26:42 hno Exp $
+ * $Id: store.c,v 1.584.2.8 2009/06/25 22:58:37 hno Exp $
*
* DEBUG: section 20 Storage Manager
* AUTHOR: Harvest Derived
@@ -196,6 +196,7 @@
mem->request = NULL;
ctx_exit(ctx); /* must exit before we free mem->url */
safe_free(mem->url);
+ safe_free(mem->store_url);
safe_free(mem->vary_headers);
safe_free(mem->vary_encoding);
memFree(mem, MEM_MEMOBJECT);
++++++ 12497.patch ++++++
---------------------
PatchSet 12497
Date: 2009/06/29 07:24:08
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
MFC: Accept PUT/POST requests without an entity-body
Techniclly PUT/POST requests withtout an entity-body is allowed by HTTP,
so there is no reason for us to complain aout them even if it doesn't make
much sense in terms of the intended meaning of PUT/POST.
Patch tracking note: In 2.HEAD this change is contained withn the unknown
request methods patch.
Members:
src/client_side.c:1.754.2.25->1.754.2.26
Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.754.2.25
retrieving revision 1.754.2.26
diff -u -r1.754.2.25 -r1.754.2.26
--- squid/src/client_side.c 25 Jun 2009 22:45:10 -0000 1.754.2.25
+++ squid/src/client_side.c 29 Jun 2009 07:24:08 -0000 1.754.2.26
@@ -1,6 +1,6 @@
/*
- * $Id: client_side.c,v 1.754.2.25 2009/06/25 22:45:10 hno Exp $
+ * $Id: client_side.c,v 1.754.2.26 2009/06/29 07:24:08 hno Exp $
*
* DEBUG: section 33 Client-side Routines
* AUTHOR: Duane Wessels
@@ -1522,10 +1522,6 @@
clientCheckContentLength(request_t * r)
{
switch (r->method) {
- case METHOD_PUT:
- case METHOD_POST:
- /* PUT/POST requires a request entity */
- return (r->content_length >= 0);
case METHOD_GET:
case METHOD_HEAD:
/* We do not want to see a request entity on GET/HEAD requests */
++++++ squid-2.7.STABLE5-RELEASENOTES.html -> squid-2.7.STABLE6-RELEASENOTES.html ++++++
--- squid/squid-2.7.STABLE5-RELEASENOTES.html 2008-10-17 18:56:00.000000000 +0200
+++ squid/squid-2.7.STABLE6-RELEASENOTES.html 2009-04-03 15:36:02.000000000 +0200
@@ -2,12 +2,12 @@
<HTML>
<HEAD>
<META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
- <TITLE>Squid 2.7.STABLE5 release notes</TITLE>
+ <TITLE>Squid 2.7.STABLE6 release notes</TITLE>
</HEAD>
<BODY>
-<H1>Squid 2.7.STABLE5 release notes</H1>
+<H1>Squid 2.7.STABLE6 release notes</H1>
-<H2>Squid Developers</H2>$Id: release.html,v 1.1.2.10 2008/10/17 18:56:26 hno Exp $
+<H2>Squid Developers</H2>$Id: release.html,v 1.1.2.11 2009/02/02 12:02:34 hno Exp $
<HR>
<EM>This document contains the release notes for version 2.7 of Squid.
Squid is a WWW Cache application developed by the Web Caching community.</EM>
@@ -53,6 +53,9 @@
<P>
<H2><A NAME="toc8">8.</A> <A HREF="#s8">Key changes in squid-2.7.STABLE5</A></H2>
+<P>
+<H2><A NAME="toc9">9.</A> <A HREF="#s9">Key changes in squid-2.7.STABLE6</A></H2>
+
<HR>
<H2><A NAME="s1">1.</A> <A HREF="#toc1">Key changes from squid 2.6</A></H2>
@@ -474,5 +477,19 @@
</UL>
</P>
+<H2><A NAME="s9">9.</A> <A HREF="#toc9">Key changes in squid-2.7.STABLE6</A></H2>
+
+<P>
+<UL>
+<LI>Crash on certain invalid HTTP messages</LI>
+<LI>Correct latency measurements</LI>
+<LI>Various documentation fixes</LI>
+<LI>See also the list of
+<A HREF="http://www.squid-cache.org/Versions/v2/2.7/changesets/SQUID_2_7_STABLE6.html">squid-2.7.STABLE6 changes</A> and the
+<A HREF="ChangeLog.txt">ChangeLog</A> file for details.</LI>
+</UL>
+</P>
+
+
</BODY>
</HTML>
++++++ squid-2.7.STABLE5.tar.bz2 -> squid-2.7.STABLE6.tar.bz2 ++++++
++++ 24290 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/ChangeLog new/squid-2.7.STABLE6/ChangeLog
--- old/squid-2.7.STABLE5/ChangeLog 2008-10-17 20:55:54.000000000 +0200
+++ new/squid-2.7.STABLE6/ChangeLog 2009-02-04 01:42:42.000000000 +0100
@@ -1,3 +1,26 @@
+Changes to squid-2.7.STABLE6 (4 February 2009)
+ - Bug #2494: Fix tproxy url in configure
+ - Correct latency measurements
+ - Correct upgrade_http0.9 example
+ - Correct parsing of invalid http version numbers
+ - Crossreference authenticate_ip_shortcircuit_access and
+ authenticate_ip_shortcircuit_ttl
+ - Add in some better documentation for override-expire.
+
+Changes to squid-2.6.STABLE22 (19 October 2008)
+ - Bug #2396: Correct the opening of the PF device file.
+ - Make --with-large-files and --with-build-envirnment=default play
+ nice together
+ - Workaround for Linux-2.6.24 & 2.6.25 netfiler_ipv4.h include header
+ __u32 problem
+ - Make dns_nameserver work when using --disable-internal-dns on glibc
+ based systems
+ - Bug #2426: Increase negotiate auth token buffer size
+ - Bug #2427: squid_ldap_group -h reports the old % codes for -f
+ - Bug #2477: swap.state permission issues if crashing during "squid -k
+ reconfigure"
+ - Windows port: Fix build error using latest MinGW runtime.
+
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/RELEASENOTES.html new/squid-2.7.STABLE6/RELEASENOTES.html
--- old/squid-2.7.STABLE5/RELEASENOTES.html 2008-10-17 21:01:40.000000000 +0200
+++ new/squid-2.7.STABLE6/RELEASENOTES.html 2009-02-04 01:44:37.000000000 +0100
@@ -2,12 +2,12 @@
<HTML>
<HEAD>
<META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.21">
- <TITLE>Squid 2.7.STABLE5 release notes</TITLE>
+ <TITLE>Squid 2.7.STABLE6 release notes</TITLE>
</HEAD>
<BODY>
-<H1>Squid 2.7.STABLE5 release notes</H1>
+<H1>Squid 2.7.STABLE6 release notes</H1>
-<H2>Squid Developers</H2>$Id: release.html,v 1.1.2.10 2008/10/17 18:56:26 hno Exp $
+<H2>Squid Developers</H2>$Id: release.html,v 1.1.2.11 2009/02/02 12:02:34 hno Exp $
<HR>
<EM>This document contains the release notes for version 2.7 of Squid.
Squid is a WWW Cache application developed by the Web Caching community.</EM>
@@ -53,6 +53,9 @@
<P>
<H2><A NAME="toc8">8.</A> <A HREF="#s8">Key changes in squid-2.7.STABLE5</A></H2>
+<P>
+<H2><A NAME="toc9">9.</A> <A HREF="#s9">Key changes in squid-2.7.STABLE6</A></H2>
+
<HR>
<H2><A NAME="s1">1.</A> <A HREF="#toc1">Key changes from squid 2.6</A></H2>
@@ -474,5 +477,19 @@
</UL>
</P>
+<H2><A NAME="s9">9.</A> <A HREF="#toc9">Key changes in squid-2.7.STABLE6</A></H2>
+
+<P>
+<UL>
+<LI>Crash on certain invalid HTTP messages</LI>
+<LI>Correct latency measurements</LI>
+<LI>Various documentation fixes</LI>
+<LI>See also the list of
+<A HREF="http://www.squid-cache.org/Versions/v2/2.7/changesets/SQUID_2_7_STABLE6.html">squid-2.7.STABLE6 changes</A> and the
+<A HREF="ChangeLog">ChangeLog</A> file for details.</LI>
+</UL>
+</P>
+
+
</BODY>
</HTML>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/configure.in new/squid-2.7.STABLE6/configure.in
--- old/squid-2.7.STABLE5/configure.in 2008-10-17 21:01:04.000000000 +0200
+++ new/squid-2.7.STABLE6/configure.in 2009-02-04 01:44:06.000000000 +0100
@@ -1,16 +1,16 @@
dnl
dnl Configuration input file for Squid
dnl
-dnl $Id: configure.in,v 1.430.2.15 2008/10/17 18:55:54 hno Exp $
+dnl $Id: configure.in,v 1.430.2.17 2009/02/02 12:02:34 hno Exp $
dnl
dnl
dnl
-AC_INIT(Squid Web Proxy, 2.7.STABLE5, http://www.squid-cache.org/bugs/, squid)
+AC_INIT(Squid Web Proxy, 2.7.STABLE6, 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.15 $)dnl
+AC_REVISION($Revision: 1.430.2.17 $)dnl
AC_PREFIX_DEFAULT(/usr/local/squid)
AM_MAINTAINER_MODE
@@ -2749,9 +2749,9 @@
AC_MSG_RESULT($LINUX_TPROXY)
fi
if test "$LINUX_TPROXY" = "no" && test "$LINUX_NETFILTER" = "yes"; then
- echo "WARNING: Cannot find TPROXY headers, you need to install the"
+ echo "WARNING: Cannot find TPROXY headers, you need to patch your kernel with the"
echo "tproxy package from:"
- echo " - lynx http://www.balabit.com/downloads/tproxy/"
+ echo " - lynx http://www.balabit.com/downloads/files/tproxy/"
sleep 10
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/include/autoconf.h.in new/squid-2.7.STABLE6/include/autoconf.h.in
--- old/squid-2.7.STABLE5/include/autoconf.h.in 2008-07-19 02:18:58.000000000 +0200
+++ new/squid-2.7.STABLE6/include/autoconf.h.in 2008-11-20 02:55:42.000000000 +0100
@@ -872,9 +872,13 @@
/* Valgrind memory debugger support */
#undef WITH_VALGRIND
-/* Define to 1 if your processor stores words with the most significant byte
- first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
+#if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+#elif ! defined __LITTLE_ENDIAN__
+# undef WORDS_BIGENDIAN
+#endif
/* Define to have malloc statistics */
#undef XMALLOC_STATISTICS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/include/version.h new/squid-2.7.STABLE6/include/version.h
--- old/squid-2.7.STABLE5/include/version.h 2008-10-17 21:01:04.000000000 +0200
+++ new/squid-2.7.STABLE6/include/version.h 2009-02-04 01:44:06.000000000 +0100
@@ -9,5 +9,5 @@
*/
#ifndef SQUID_RELEASE_TIME
-#define SQUID_RELEASE_TIME 1224270059
+#define SQUID_RELEASE_TIME 1233708238
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/HttpMsg.c new/squid-2.7.STABLE6/src/HttpMsg.c
--- old/squid-2.7.STABLE5/src/HttpMsg.c 2007-12-13 02:20:48.000000000 +0100
+++ new/squid-2.7.STABLE6/src/HttpMsg.c 2009-02-02 13:41:32.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: HttpMsg.c,v 1.17 2007/12/13 01:20:48 hno Exp $
+ * $Id: HttpMsg.c,v 1.17.2.2 2009/02/02 12:41:32 hno Exp $
*
* DEBUG: section 74 HTTP Message
* AUTHOR: Alex Rousskov
@@ -256,11 +256,11 @@
/* next should be 1 or more digits */
maj = 0;
- for (; i < hmsg->req_end && (xisdigit(hmsg->buf[i])); i++) {
+ for (; i < hmsg->req_end && (xisdigit(hmsg->buf[i])) && maj < 65536; i++) {
maj = maj * 10;
maj = maj + (hmsg->buf[i]) - '0';
}
- if (i >= hmsg->req_end) {
+ if (i >= hmsg->req_end || maj >= 65536) {
retcode = -1;
goto finish;
}
@@ -276,11 +276,14 @@
/* next should be one or more digits */
i++;
min = 0;
- for (; i < hmsg->req_end && (xisdigit(hmsg->buf[i])); i++) {
+ for (; i < hmsg->req_end && (xisdigit(hmsg->buf[i])) && min < 65536; i++) {
min = min * 10;
min = min + (hmsg->buf[i]) - '0';
}
-
+ if (min >= 65536) {
+ retcode = -1;
+ goto finish;
+ }
/* Find whitespace, end of version */
hmsg->v_end = i;
hmsg->v_len = hmsg->v_end - hmsg->v_start + 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/HttpStatusLine.c new/squid-2.7.STABLE6/src/HttpStatusLine.c
--- old/squid-2.7.STABLE5/src/HttpStatusLine.c 2007-12-13 02:20:48.000000000 +0100
+++ new/squid-2.7.STABLE6/src/HttpStatusLine.c 2009-02-02 12:13:24.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: HttpStatusLine.c,v 1.31 2007/12/13 01:20:48 hno Exp $
+ * $Id: HttpStatusLine.c,v 1.31.2.1 2009/02/02 11:13:24 hno Exp $
*
* DEBUG: section 57 HTTP Status-line
* AUTHOR: Alex Rousskov
@@ -97,11 +97,11 @@
/* Format: HTTP/x.x <space> <status code> <space> <reason-phrase> CRLF */
s = start;
maj = 0;
- for (s = start; s < end && xisdigit(*s); s++) {
+ for (s = start; s < end && xisdigit(*s) && maj < 65536; s++) {
maj = maj * 10;
maj = maj + *s - '0';
}
- if (s >= end) {
+ if (s >= end || maj >= 65536) {
debug(57, 7) ("httpStatusLineParse: Invalid HTTP reply status major.\n");
return 0;
}
@@ -113,11 +113,11 @@
s++;
/* next should be minor number */
min = 0;
- for (; s < end && xisdigit(*s); s++) {
+ for (; s < end && xisdigit(*s) && min < 65536; s++) {
min = min * 10;
min = min + *s - '0';
}
- if (s >= end) {
+ if (s >= end || min >= 65536) {
debug(57, 7) ("httpStatusLineParse: Invalid HTTP reply status version minor.\n");
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/cf.data.pre new/squid-2.7.STABLE6/src/cf.data.pre
--- old/squid-2.7.STABLE5/src/cf.data.pre 2008-09-25 04:33:37.000000000 +0200
+++ new/squid-2.7.STABLE6/src/cf.data.pre 2009-02-02 12:28:55.000000000 +0100
@@ -1,6 +1,6 @@
#
-# $Id: cf.data.pre,v 1.450.2.28 2008/09/25 02:33:37 hno Exp $
+# $Id: cf.data.pre,v 1.450.2.31 2009/02/02 11:28:55 hno Exp $
#
# SQUID Web Proxy Cache http://www.squid-cache.org/
# ----------------------------------------------------------
@@ -372,6 +372,8 @@
DOC_START
Cache authentication credentials per client IP address for this
long. Default is 0 seconds (disabled).
+
+ See also authenticate_ip_shortcircuit_access directive.
DOC_END
COMMENT_START
@@ -912,6 +914,8 @@
based on source IP cached credentials is acceptable. Use this to deny
using the ip auth cache on requests from child proxies or other source
ip's having multiple users.
+
+ See also authenticate_ip_shortcircuit_ttl directive
DOC_END
COMMENT_START
@@ -2962,6 +2966,11 @@
VIOLATES the HTTP standard. Enabling this feature
could make you liable for problems which it causes.
+ Note: this does not enforce staleness - it only extends
+ freshness / min. If the server returns a Expires time which
+ is longer than your max time, Squid will still consider
+ the object fresh for that period of time.
+
override-lastmod enforces min age even on objects
that were modified recently.
@@ -3271,7 +3280,7 @@
NOCOMMENT_START
# Don't upgrade ShoutCast responses to HTTP
-acl shoutcast rep_header X-HTTP09-First-Line ^ICY\s[0-9]
+acl shoutcast rep_header X-HTTP09-First-Line ^ICY.[0-9]
upgrade_http0.9 deny shoutcast
NOCOMMENT_END
DOC_END
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/comm_devpoll.c new/squid-2.7.STABLE6/src/comm_devpoll.c
--- old/squid-2.7.STABLE5/src/comm_devpoll.c 2007-05-27 16:17:50.000000000 +0200
+++ new/squid-2.7.STABLE6/src/comm_devpoll.c 2009-02-02 12:10:53.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: comm_devpoll.c,v 1.3 2007/05/27 14:17:50 adrian Exp $
+ * $Id: comm_devpoll.c,v 1.3.6.1 2009/02/02 11:10:53 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -190,7 +190,7 @@
do_comm_select(int msec)
{
int i;
- int num;
+ int num, saved_errno;
statCounter.syscalls.polls++;
@@ -202,11 +202,11 @@
comm_flush_updates();
num = ioctl(devpoll_fd, DP_POLL, &do_poll);
- debug(5, 5) ("do_comm_select: ioctl() returned %d fds\n", num);
-
+ saved_errno = errno;
+ getCurrentTime();
+ debug(5, 5) ("do_comm_select: %d fds ready\n", num);
if (num < 0) {
- getCurrentTime();
- if (ignoreErrno(errno))
+ if (ignoreErrno(saved_errno))
return COMM_OK;
debug(5, 1) ("comm_select: devpoll ioctl(DP_POLL) failure: %s\n", xstrerror());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/comm_epoll.c new/squid-2.7.STABLE6/src/comm_epoll.c
--- old/squid-2.7.STABLE5/src/comm_epoll.c 2007-05-20 15:45:10.000000000 +0200
+++ new/squid-2.7.STABLE6/src/comm_epoll.c 2009-02-02 12:10:53.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: comm_epoll.c,v 1.29 2007/05/20 13:45:10 adrian Exp $
+ * $Id: comm_epoll.c,v 1.29.2.1 2009/02/02 11:10:53 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -168,7 +168,7 @@
do_comm_select(int msec)
{
int i;
- int num;
+ int num, saved_errno;
if (epoll_fds == 0) {
assert(shutting_down);
@@ -176,9 +176,11 @@
}
statCounter.syscalls.polls++;
num = epoll_wait(kdpfd, events, MAX_EVENTS, msec);
+ saved_errno = errno;
+ getCurrentTime();
+ debug(5, 5) ("do_comm_select: %d fds ready\n", num);
if (num < 0) {
- getCurrentTime();
- if (ignoreErrno(errno))
+ if (ignoreErrno(saved_errno))
return COMM_OK;
debug(5, 1) ("comm_select: epoll failure: %s\n", xstrerror());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/comm_kqueue.c new/squid-2.7.STABLE6/src/comm_kqueue.c
--- old/squid-2.7.STABLE5/src/comm_kqueue.c 2008-05-05 01:23:13.000000000 +0200
+++ new/squid-2.7.STABLE6/src/comm_kqueue.c 2009-02-02 12:11:48.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: comm_kqueue.c,v 1.12.2.1 2008/05/04 23:23:13 hno Exp $
+ * $Id: comm_kqueue.c,v 1.12.2.3 2009/02/02 11:11:48 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -141,7 +141,7 @@
do_comm_select(int msec)
{
int i;
- int num;
+ int num, saved_errno;
struct timespec timeout;
timeout.tv_sec = msec / 1000;
@@ -149,10 +149,12 @@
statCounter.syscalls.polls++;
num = kevent(kq, kqlst, kqoff, ke, kqmax, &timeout);
+ saved_errno = errno;
+ getCurrentTime();
+ debug(5, 5) ("do_comm_select: %d fds ready\n", num);
kqoff = 0;
if (num < 0) {
- getCurrentTime();
- if (ignoreErrno(errno))
+ if (ignoreErrno(saved_errno))
return COMM_OK;
debug(5, 1) ("comm_select: kevent failure: %s\n", xstrerror());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/comm_poll.c new/squid-2.7.STABLE6/src/comm_poll.c
--- old/squid-2.7.STABLE5/src/comm_poll.c 2007-05-20 15:45:10.000000000 +0200
+++ new/squid-2.7.STABLE6/src/comm_poll.c 2009-02-02 12:10:53.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: comm_poll.c,v 1.24 2007/05/20 13:45:10 adrian Exp $
+ * $Id: comm_poll.c,v 1.24.2.1 2009/02/02 11:10:53 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -119,7 +119,7 @@
static int
do_comm_select(int msec)
{
- int num;
+ int num, saved_errno;
int i;
if (nfds == 0) {
@@ -128,9 +128,11 @@
}
statCounter.syscalls.selects++;
num = poll(pfds, nfds, msec);
+ saved_errno = errno;
+ getCurrentTime();
+ debug(5, 5) ("do_comm_select: %d fds ready\n", num);
if (num < 0) {
- getCurrentTime();
- if (ignoreErrno(errno))
+ if (ignoreErrno(saved_errno))
return COMM_OK;
debug(5, 1) ("comm_select: poll failure: %s\n", xstrerror());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/comm_select.c new/squid-2.7.STABLE6/src/comm_select.c
--- old/squid-2.7.STABLE5/src/comm_select.c 2007-07-17 22:34:28.000000000 +0200
+++ new/squid-2.7.STABLE6/src/comm_select.c 2009-02-02 12:10:53.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: comm_select.c,v 1.82 2007/07/17 20:34:28 hno Exp $
+ * $Id: comm_select.c,v 1.82.2.1 2009/02/02 11:10:53 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -126,7 +126,7 @@
static int
do_comm_select(int msec)
{
- int num;
+ int num, saved_errno;
struct timeval tv;
fd_mask *rfdsp = (fd_mask *) current_readfds;
fd_mask *wfdsp = (fd_mask *) current_writefds;
@@ -146,10 +146,11 @@
tv.tv_usec = (msec % 1000) * 1000;
statCounter.syscalls.selects++;
num = select(Biggest_FD + 1, current_readfds, current_writefds, current_errfds, &tv);
-
+ saved_errno = errno;
+ getCurrentTime();
+ debug(5, 5) ("do_comm_select: %d fds ready\n", num);
if (num < 0) {
- getCurrentTime();
- if (ignoreErrno(errno))
+ if (ignoreErrno(saved_errno))
return COMM_OK;
debug(5, 1) ("comm_select: select failure: %s\n", xstrerror());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/comm_select_simple.c new/squid-2.7.STABLE6/src/comm_select_simple.c
--- old/squid-2.7.STABLE5/src/comm_select_simple.c 2007-05-20 15:45:11.000000000 +0200
+++ new/squid-2.7.STABLE6/src/comm_select_simple.c 2009-02-02 12:10:53.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: comm_select_simple.c,v 1.4 2007/05/20 13:45:11 adrian Exp $
+ * $Id: comm_select_simple.c,v 1.4.2.1 2009/02/02 11:10:53 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -106,7 +106,7 @@
static int
do_comm_select(int msec)
{
- int num;
+ int num, saved_errno;
struct timeval tv;
fd_set readfds;
fd_set writefds;
@@ -124,10 +124,11 @@
tv.tv_usec = (msec % 1000) * 1000;
statCounter.syscalls.selects++;
num = select(Biggest_FD + 1, &readfds, &writefds, &errfds, &tv);
-
+ saved_errno = errno;
+ getCurrentTime();
+ debug(5, 5) ("do_comm_select: %d fds ready\n", num);
if (num < 0) {
- getCurrentTime();
- if (ignoreErrno(errno))
+ if (ignoreErrno(saved_errno))
return COMM_OK;
debug(5, 1) ("comm_select: select failure: %s\n", xstrerror());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/squid-2.7.STABLE5/src/comm_select_win32.c new/squid-2.7.STABLE6/src/comm_select_win32.c
--- old/squid-2.7.STABLE5/src/comm_select_win32.c 2007-05-20 15:45:11.000000000 +0200
+++ new/squid-2.7.STABLE6/src/comm_select_win32.c 2009-02-02 12:10:53.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: comm_select_win32.c,v 1.8 2007/05/20 13:45:11 adrian Exp $
+ * $Id: comm_select_win32.c,v 1.8.2.1 2009/02/02 11:10:53 hno Exp $
*
* DEBUG: section 5 Socket Functions
*
@@ -103,7 +103,7 @@
static int
do_comm_select(int msec)
{
- int num;
+ int num, saved_errno;
struct timeval tv;
fd_set readfds;
fd_set writefds;
@@ -121,10 +121,11 @@
tv.tv_usec = (msec % 1000) * 1000;
statCounter.syscalls.selects++;
num = select(Biggest_FD + 1, &readfds, &writefds, &errfds, &tv);
-
+ saved_errno = errno;
+ getCurrentTime();
+ debug(5, 5) ("do_comm_select: %d fds ready\n", num);
if (num < 0) {
- getCurrentTime();
- if (ignoreErrno(errno))
+ if (ignoreErrno(saved_errno))
return COMM_OK;
debug(5, 1) ("comm_select: select failure: %s\n", xstrerror());
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org