From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Mon, 10 Jul 2006 21:49:55 +0000 (+0000)
Subject: Fix so that both -I and -X can be specified
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c920512e6b549a1e13f41e06ed11618bc8803158;p=varnish

Fix so that both -I and -X can be specified


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@414 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/lib/libvarnishapi/shmlog.c b/varnish-cache/lib/libvarnishapi/shmlog.c
index 18c2e690..ef519284 100644
--- a/varnish-cache/lib/libvarnishapi/shmlog.c
+++ b/varnish-cache/lib/libvarnishapi/shmlog.c
@@ -163,14 +163,16 @@ VSL_NextLog(struct VSL_data *vd)
 			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;