Sophie

Sophie

distrib > Mandriva > 2007.1 > x86_64 > by-pkgid > e23b4d7d6d7751848cd9d0cfbf09a931 > files > 1

squid-2.6.STABLE7-2.2mdv2007.1.src.rpm

---------------------
PatchSet 11349 
Date: 2007/03/20 21:26:34
Author: hno
Branch: SQUID_2_6
Tag: (none) 
Log:
MFC: Fix assertion error on TRACE

error introduced in 2.6.PRE2 when changing the semantics of httpReplySwapOut

Merged changes:
2007/03/20 21:25:11	hno	+1 -2	 	Fix assertion error on TRACE

Members: 
	src/client_side.c:1.693.2.11->1.693.2.12 

Index: squid/src/client_side.c
===================================================================
RCS file: /cvsroot/squid/squid/src/client_side.c,v
retrieving revision 1.693.2.11
retrieving revision 1.693.2.12
diff -u -r1.693.2.11 -r1.693.2.12
--- squid/src/client_side.c	14 Mar 2007 14:11:26 -0000	1.693.2.11
+++ squid/src/client_side.c	20 Mar 2007 21:26:34 -0000	1.693.2.12
@@ -3339,7 +3339,6 @@
 	    httpReplySetHeaders(rep, version, HTTP_OK, NULL, "text/plain",
 		httpRequestPrefixLen(r), 0, squid_curtime);
 	    httpReplySwapOut(rep, http->entry);
-	    httpReplyDestroy(rep);
 	    httpRequestSwapOut(r, http->entry);
 	    storeComplete(http->entry);
 	    return;