r414 - trunk/varnish-cache/lib/libvarnishapi

[phk at projects.linpro.no]

Author: phk
Date: 2006-07-10 23:49:55 +0200 (Mon, 10 Jul 2006)
New Revision: 414

Modified:
   trunk/varnish-cache/lib/libvarnishapi/shmlog.c
Log:
Fix so that both -I and -X can be specified


Modified: trunk/varnish-cache/lib/libvarnishapi/shmlog.c
===================================================================
--- trunk/varnish-cache/lib/libvarnishapi/shmlog.c	2006-07-10 20:49:07 UTC (rev 413)
+++ trunk/varnish-cache/lib/libvarnishapi/shmlog.c	2006-07-10 21:49:55 UTC (rev 414)
@@ -163,14 +163,16 @@
 			return (p);
 		if (vd->supr[p[0]]) 
 			continue;
-		rm.rm_so = 0;
-		rm.rm_eo = p[1];
 		if (vd->regincl != NULL) {
+			rm.rm_so = 0;
+			rm.rm_eo = p[1];
 			i = regexec(vd->regincl, p + 4, 1, &rm, REG_STARTEND);
 			if (i == REG_NOMATCH)
 				continue;
 		}
 		if (vd->regexcl != NULL) {
+			rm.rm_so = 0;
+			rm.rm_eo = p[1];
 			i = regexec(vd->regexcl, p + 4, 1, &rm, REG_STARTEND);
 			if (i != REG_NOMATCH)
 				continue;