rpms/squid/devel squid-2.5.STABLE14-httpReplyDestroy.patch, NONE, 1.1 squid.spec, 1.63, 1.64

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jun 8 09:22:27 UTC 2006


Author: stransky

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

Modified Files:
	squid.spec 
Added Files:
	squid-2.5.STABLE14-httpReplyDestroy.patch 
Log Message:
upstream fix for  squid BZ#1511 - assertion failed

squid-2.5.STABLE14-httpReplyDestroy.patch:
 client_side.c |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE squid-2.5.STABLE14-httpReplyDestroy.patch ---
---------------------
PatchSet 10612 
Date: 2006/06/02 22:00:34
Author: hno
Branch: SQUID_2_5
Tag: (none) 
Log:
Bug #1606: assertion failed: HttpReply.c:105: "rep"

The patch for Bug #1511 "Some 206 responses logged incorrectly" was slightly
broken and could cause the above assert.

Members: 
	src/client_side.c:1.561.2.96->1.561.2.97 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.561.2.96
retrieving revision 1.561.2.97
diff -u -r1.561.2.96 -r1.561.2.97
--- squid/src/client_side.c	10 Mar 2006 22:58:35 -0000	1.561.2.96
+++ squid/src/client_side.c	2 Jun 2006 22:00:34 -0000	1.561.2.97
@@ -2031,8 +2031,6 @@
 		http->entry = clientCreateStoreEntry(http, http->request->method,
 		    null_request_flags);
 		errorAppendEntry(http->entry, err);
-		httpReplyDestroy(http->reply);
-		http->reply = NULL;
 		memFree(buf, MEM_CLIENT_SOCK_BUF);
 		return;
 	    }
@@ -2067,8 +2065,6 @@
 		    http->entry = clientCreateStoreEntry(http, http->request->method,
 			null_request_flags);
 		    errorAppendEntry(http->entry, err);
-		    httpReplyDestroy(http->reply);
-		    http->reply = NULL;
 		    memFree(buf, MEM_CLIENT_SOCK_BUF);
 		    return;
 		}


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- squid.spec	29 May 2006 23:19:24 -0000	1.63
+++ squid.spec	8 Jun 2006 09:22:25 -0000	1.64
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE14
-Release: 1
+Release: 2
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -19,6 +19,7 @@
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
+Patch100: squid-2.5.STABLE14-httpReplyDestroy.patch
 
 # External patches
 Patch150: squid-2.5.STABLE12-follow-xff.patch
@@ -58,6 +59,8 @@
 %prep
 %setup -q
 
+%patch100 -p1 -b .rpl
+
 %patch150 -p1 -b .follow-xff
 
 %patch201 -p1 -b .config
@@ -327,6 +330,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Tue Jun 8 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-2
+- fix for squid BZ#1511 - assertion failed: HttpReply.c:105: "rep"
+
 * Tue May 30 2006 Martin Stransky <stransky at redhat.com> - 7:2.5.STABLE14-1
 - update to new upstream
 




More information about the fedora-cvs-commits mailing list