rpms/squid/devel squid-2.5.STABLE11-delaypool_3_255.patch, NONE, 1.1 squid.spec, 1.44, 1.45

[fedora-cvs-commits at redhat.com]

Author: stransky

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

Modified Files:
	squid.spec 
Added Files:
	squid-2.5.STABLE11-delaypool_3_255.patch 
Log Message:
fix for delay pool from upstream

squid-2.5.STABLE11-delaypool_3_255.patch:
 delay_pools.c |    3 +!!
 1 files changed, 1 insertion(+), 2 modifications(!)

--- NEW FILE squid-2.5.STABLE11-delaypool_3_255.patch ---
Index: squid/src/delay_pools.c
diff -c squid/src/delay_pools.c:1.19.2.10 squid/src/delay_pools.c:1.19.2.11
*** squid/src/delay_pools.c:1.19.2.10	Tue Sep 27 16:25:30 2005
--- squid/src/delay_pools.c	Thu Oct 20 11:30:31 2005
***************
*** 375,380 ****
--- 375,381 ----
  	    delay_data[pool].class3->network[255] =
  		(int) (((double) Config.Delay.rates[pool]->network.max_bytes *
  		    Config.Delay.initial) / 100);
+ 	    delay_data[pool].class3->individual_map[i][0] = 255;
  	}
      } else {
  	for (i = 0; i < NET_MAP_SZ; i++) {
***************
*** 490,496 ****
       * this loop starts at 0 or 255 and ends at 254 unless terminated earlier
       * by finding the end of the map.  note as above that 255 + 1 = 0.
       */
!     for (i = (class3->network_255_used ? 0 : 255);; ++i) {
  	if (i != 255 && class3->network_map[i] == 255)
  	    return;
  	if (individual_restore_bytes != -incr) {
--- 491,497 ----
       * this loop starts at 0 or 255 and ends at 254 unless terminated earlier
       * by finding the end of the map.  note as above that 255 + 1 = 0.
       */
!     for (i = (class3->network_255_used ? 255 : 0);; ++i) {
  	if (i != 255 && class3->network_map[i] == 255)
  	    return;
  	if (individual_restore_bytes != -incr) {


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- squid.spec	20 Oct 2005 08:29:19 -0000	1.44
+++ squid.spec	24 Oct 2005 13:54:41 -0000	1.45
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE11
-Release: 5
+Release: 6
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -30,6 +30,7 @@
 Patch108: squid-2.5.STABLE11-redirect-CONNECT.patch
 Patch109: squid-2.5.STABLE11-setcookie.patch
 Patch110: squid-2.5.STABLE11-rfc1738_do_escape.patch
+Patch111: squid-2.5.STABLE11-delaypool_3_255.patch
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
@@ -74,6 +75,7 @@
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
+%patch111 -p1
 
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
@@ -330,6 +332,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Mon Oct 24 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-6
+- fix for delay pool from upstream
+
 * Thu Oct 20 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-5
 - fix for #171213 - CVE-2005-3258 Squid crash due to malformed FTP response
 - more fixes from upstream