rpms/squid/FC-6 squid-2.6.STABLE4-aio-done.patch, NONE, 1.1 squid-2.6.STABLE4-reconfigure.patch, NONE, 1.1 squid-2.6.STABLE4-time.patch, NONE, 1.1 squid.spec, 1.74, 1.75

Tue Oct 17 14:57:17 UTC 2006

Author: stransky

Update of /cvs/dist/rpms/squid/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv10001

Modified Files:
	squid.spec 
Added Files:
	squid-2.6.STABLE4-aio-done.patch 
	squid-2.6.STABLE4-reconfigure.patch 
	squid-2.6.STABLE4-time.patch 
Log Message:
three upstream patches

squid-2.6.STABLE4-aio-done.patch:
 async_io.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE squid-2.6.STABLE4-aio-done.patch ---
---------------------
PatchSet 11048 
Date: 2006/10/08 07:43:31
Author: serassio
Branch: HEAD
Tag: (none) 
Log:
aioDone() could be called twice from aufs and from coss (when using AIOPS) during shutdown.

This patch adds a reference counter to AIO support to warrant that aioDone() is really executed
only one time when needed.

Members: 
	src/fs/aufs/async_io.c:1.21->1.22 

Index: squid/src/fs/aufs/async_io.c
===================================================================
RCS file: /cvsroot/squid/squid/src/fs/aufs/async_io.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- squid/src/fs/aufs/async_io.c	9 Sep 2006 16:04:38 -0000	1.21
+++ squid/src/fs/aufs/async_io.c	8 Oct 2006 07:43:31 -0000	1.22
@@ -1,6 +1,6 @@
 
 /*
- * $Id: async_io.c,v 1.21 2006/09/09 16:04:38 serassio Exp $
+ * $Id: async_io.c,v 1.22 2006/10/08 07:43:31 serassio Exp $
  *
  * DEBUG: section 32    Asynchronous Disk I/O
  * AUTHOR: Pete Bentley <pete at demon.net>
@@ -77,12 +77,14 @@
 
 static dlink_list used_list;
 static int initialised = 0;
+static int usage_count = 0;
 static OBJH aioStats;
 static MemPool *squidaio_ctrl_pool;
 
 void
 aioInit(void)
 {
+    usage_count++;
     if (initialised)
 	return;
     squidaio_ctrl_pool = memPoolCreate("aio_ctrl", sizeof(squidaio_ctrl_t));
@@ -94,6 +96,8 @@
 void
 aioDone(void)
 {
+    if (--usage_count > 0)
+	return;
     squidaio_shutdown();
     memPoolDestroy(squidaio_ctrl_pool);
     initialised = 0;

squid-2.6.STABLE4-reconfigure.patch:
 acl.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE squid-2.6.STABLE4-reconfigure.patch ---
---------------------
PatchSet 11054 
Date: 2006/10/16 20:11:41
Author: serassio
Branch: HEAD
Tag: (none) 
Log:
Bug #1800: one bug when let squid reconfigure

Wrong pointer usage in aclDestroyHeader()

Members: 
	src/acl.c:1.315->1.316 

Index: squid/src/acl.c
===================================================================
RCS file: /cvsroot/squid/squid/src/acl.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- squid/src/acl.c	9 Oct 2006 12:44:24 -0000	1.315
+++ squid/src/acl.c	16 Oct 2006 20:11:41 -0000	1.316
@@ -747,7 +747,7 @@
 	acl_hdr_data *q = *acldata;
 	*acldata = q->next;
 	if (q->reglist)
-	    aclDestroyRegexList((*acldata)->reglist);
+	    aclDestroyRegexList(q->reglist);
 	safe_free(q);
     }
 }

squid-2.6.STABLE4-time.patch:
 acl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE squid-2.6.STABLE4-time.patch ---
---------------------
PatchSet 11049 
Date: 2006/10/09 12:44:24
Author: hno
Branch: HEAD
Tag: (none) 
Log:
Bug #1794: Accept 00:00-24:00 as a valid time specification even if redundand and the same as 00:00-23:59

Members: 
	src/acl.c:1.314->1.315 

Index: squid/src/acl.c
===================================================================
RCS file: /cvsroot/squid/squid/src/acl.c,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- squid/src/acl.c	22 Sep 2006 10:44:24 -0000	1.314
+++ squid/src/acl.c	9 Oct 2006 12:44:24 -0000	1.315
@@ -1,6 +1,6 @@
 
 /*
- * $Id: acl.c,v 1.314 2006/09/22 10:44:24 hno Exp $
+ * $Id: acl.c,v 1.315 2006/10/09 12:44:24 hno Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -623,7 +623,7 @@
 	    }
 	} else {
 	    /* assume its time-of-day spec */
-	    if ((sscanf(t, "%d:%d-%d:%d", &h1, &m1, &h2, &m2) < 4) || (!((h1 >= 0 && h1 < 24) && (h2 >= 0 && h2 < 24) && (m1 >= 0 && m1 < 60) && (m2 >= 0 && m2 < 60)))) {
+	    if ((sscanf(t, "%d:%d-%d:%d", &h1, &m1, &h2, &m2) < 4) || (!((h1 >= 0 && h1 < 24) && ((h2 >= 0 && h2 < 24) || (h2 == 24 && m2 == 0)) && (m1 >= 0 && m1 < 60) && (m2 >= 0 && m2 < 60)))) {
 		debug(28, 0) ("aclParseTimeSpec: ERROR: Bad time range '%s'\n", t);
 		self_destruct();
 	    }


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-6/squid.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- squid.spec	2 Oct 2006 10:13:18 -0000	1.74
+++ squid.spec	17 Oct 2006 14:57:15 -0000	1.75
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -28,6 +28,9 @@
 Patch107: squid-2.6.STABLE4-forward.patch
 Patch108: squid-2.6.STABLE4-snmp.patch
 Patch109: squid-2.6.STABLE4-mem-leak-ncsa.patch
+Patch110: squid-2.6.STABLE4-time.patch
+Patch111: squid-2.6.STABLE4-aio-done.patch
+Patch112: squid-2.6.STABLE4-reconfigure.patch
 
 # External patches
 
@@ -73,6 +76,9 @@
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -343,6 +349,12 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 17 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-2
+- upstream fixes:
+  * Accept 00:00-24:00 as a valid time specification (upstream BZ #1794)
+  * aioDone() could be called twice
+  * Squid reconfiguration (upstream BZ #1800)
+
 * Mon Oct 2 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-1
 - new upstream
 - fixes from upstream bugzilla, items #1782,#1780,#1785,#1719,#1784,#1776


