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 18c2e69050e3d8dd22ccc10b61da3496cbe69a15..ef5192849bb6eaf32672521e6dbadc7bb5aff072 100644 (file)
--- 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;