r2792 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Tue Jun 24 20:12:03 CEST 2008


Author: phk
Date: 2008-06-24 20:12:02 +0200 (Tue, 24 Jun 2008)
New Revision: 2792

Modified:
   trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
Log:
Ooops, last commit got one file more than intended.

Here is the fix for the regsub() issue: Don't release negative bytecounts,
we have the special variant WS_ReleaseP() just for jobs like this.



Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2008-06-24 18:09:38 UTC (rev 2791)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2008-06-24 18:12:02 UTC (rev 2792)
@@ -124,7 +124,6 @@
 	if (i == REG_NOMATCH)
 		return(str);
 
-VSL(SLT_Debug, sp->fd, "REGSUB {");
 	u = WS_Reserve(sp->http->ws, 0);
 	res.e = res.b = b0 = sp->http->ws->f;
 	res.e += u;
@@ -164,7 +163,6 @@
 		return (str);
 	} 
 	Tcheck(res);
-	WS_Release(sp->http->ws, b0 - res.b);
-VSL(SLT_Debug, sp->fd, "REGSUB }");
+	WS_ReleaseP(sp->http->ws, res.b);
 	return (b0);
 }




More information about the varnish-commit mailing list