added match_dyn()

src/tests/b01.vtc

@@ -13,6 +13,10 @@ varnish v1 -vcl+backend {
                         return(pass);
                 } else if (re.match(req.url, "snafu")) {
                         return(pipe);
+                } else if ((re.match_dyn(req.url, "foobar"))) {
+                        return(pass);
+                } else if (re.match_dyn(req.url, "snafu")) {
+                        return(pipe);
                 } else {
                         return(pass);
                 }
@@ -24,11 +28,24 @@ varnish v1 -vcl+backend {
 		} else {
 			error 999;
 		}
+
 		if (!re.match(beresp.http.bar, "bar")) {
 			set beresp.http.bar1 = "2";
 		} else {
 			error 999;
 		}
+
+		if (re.match_dyn(beresp.http.foo, "bar")) {
+			set beresp.http.foo1d = "1";
+		} else {
+			error 999;
+		}
+
+		if (!re.match_dyn(beresp.http.bar, "bar")) {
+			set beresp.http.bar1d = "2";
+		} else {
+			error 999;
+		}
 	}
 
 } -start
@@ -38,4 +55,6 @@ client c1 {
 	rxresp
 	expect resp.http.foo1 == "1"
 	expect resp.http.bar1 == "2"
+	expect resp.http.foo1d == "1"
+	expect resp.http.bar1d == "2"
 } -run

src/tests/b02.vtc

@@ -3,9 +3,9 @@ varnishtest "cached compiled regexen"
 # run two clients, to test caching of compiled regexen
 server s1 {
 	rxreq
-	txresp -hdr "Foo: barbaz" -hdr "Bar: bazquux" -body "1111\n"
+	txresp -hdr "Foo: barbaz" -body "1111\n"
 	rxreq
-	txresp -hdr "Foo: barbaz" -hdr "Bar: bazquux" -body "1111\n"
+	txresp -hdr "Foo: barbaz" -body "1111\n"
 } -start
 
 varnish v1 -vcl+backend {
@@ -18,6 +18,13 @@ varnish v1 -vcl+backend {
 		} else {
 			error 999;
 		}
+
+		if (re.match_dyn(beresp.http.foo, "(bar)(baz)")) {
+			set beresp.http.foo1d = re.backref(1, "error1");
+			set beresp.http.foo2d = re.backref(2, "error2");
+		} else {
+			error 999;
+		}
 	}
 
 } -start
@@ -27,6 +34,8 @@ client c1 {
 	rxresp
 	expect resp.http.foo1 == "bar"
 	expect resp.http.foo2 == "baz"
+	expect resp.http.foo1d == "bar"
+	expect resp.http.foo2d == "baz"
 } -run
 
 client c2 {
@@ -34,4 +43,6 @@ client c2 {
 	rxresp
 	expect resp.http.foo1 == "bar"
 	expect resp.http.foo2 == "baz"
+	expect resp.http.foo1d == "bar"
+	expect resp.http.foo2d == "baz"
 } -run

src/tests/b03.vtc

@@ -12,6 +12,10 @@ varnish v1 -vcl+backend {
 	    if (re.match(req.http.host, "^(abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij)")) {
 		error 500 "not ok";
             }
+
+	    if (re.match_dyn(req.http.host, "^(abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij|abcdefghij)")) {
+		error 500 "not ok";
+            }
 	}
 } -start 
 

src/tests/b04.vtc

@@ -2,7 +2,6 @@ varnishtest "test null match (varnish r00913.vtc)"
 
 server s1 {
 	rxreq
-	expect req.url == "/bar"
 	txresp -body "foobar"
 } -start
 
@@ -16,13 +15,21 @@ varnish v1 -vcl+backend {
 		if (re.match(beresp.http.foo, "")) {
 			set beresp.http.bar = "YYY";
 		}
+		if (re.match_dyn(beresp.http.bar, "$")) {
+			set beresp.http.food = "XXX";
+		}
+		if (re.match_dyn(beresp.http.foo, "")) {
+			set beresp.http.bard = "YYY";
+		}
 	}
 } -start
 
 client c1 {
-	txreq  -url /bar -hdr "Foo: bar"
+	txreq
 	rxresp 
 	expect resp.http.content-length == 6
 	expect resp.http.foo == "XXX"
 	expect resp.http.bar == "YYY"
+	expect resp.http.food == "XXX"
+	expect resp.http.bard == "YYY"
 } -run

src/tests/b05.vtc

-varnishtest "regex compilation failre"
+varnishtest "regex compilation failure"
 
 server s1 {
 	rxreq
-	txresp -hdr "Foo: bar" -body "foobar"
+	txresp -hdr "Foo: bar" -hdr "Baz: quux" -body "foobar"
 } -start
 
 varnish v1 -vcl+backend {
@@ -12,6 +12,9 @@ varnish v1 -vcl+backend {
 		if (re.match(beresp.http.foo, "(")) {
 			set beresp.http.foo = "baz";
 		}
+		if (re.match_dyn(beresp.http.baz, "(")) {
+			set beresp.http.baz = "waldo";
+		}
 	}
 } -start
 
@@ -20,4 +23,5 @@ client c1 {
 	rxresp 
 	expect resp.http.content-length == 6
 	expect resp.http.foo == "bar"
+	expect resp.http.baz == "quux"
 } -run

src/tests/b06.vtc

+varnishtest "dynamic matches"
+
+server s1 {
+	rxreq
+	txresp -hdr "Foo: baz" -hdr "Bar: baz" -body "foobar"
+	rxreq
+	expect req.url == "/foo"
+	txresp -hdr "Foo: baz" -hdr "Bar: quux" -body "foobar"
+} -start
+
+varnish v1 -vcl+backend {
+	import re from "${vmod_topbuild}/src/.libs/libvmod_re.so";
+
+	sub vcl_fetch {
+		if (re.match(beresp.http.foo, beresp.http.bar)) {
+			set beresp.http.static = "match";
+		}
+		else {
+			set beresp.http.static = "nomatch";
+		}
+
+		if (re.match_dyn(beresp.http.foo, beresp.http.bar)) {
+			set beresp.http.dynamic = "match";
+		}
+		else {
+			set beresp.http.dynamic = "nomatch";
+		}
+	}
+} -start
+
+client c1 {
+	txreq
+	rxresp
+	expect resp.http.foo == "baz"
+	expect resp.http.bar == "baz"
+	expect resp.http.static  == "match"
+	expect resp.http.dynamic == "match"
+
+	txreq -url "/foo"
+	rxresp 
+	expect resp.http.foo == "baz"
+	expect resp.http.bar == "quux"
+	expect resp.http.static  == "match"
+	expect resp.http.dynamic == "nomatch"
+} -run

src/vmod_re.c

@@ -46,6 +46,7 @@
 struct sess_ov {
 	unsigned	magic;
 #define SESS_OV_MAGIC 0x844bfa39
+	const char	*pattern;
 	char		*subject;
 	int		ovector[MAX_OV];
 	int		count;
@@ -110,44 +111,49 @@ re_init(struct vmod_priv *priv,
 	return (0);
 }
 
-unsigned __match_proto__()
-vmod_match(struct sess *sp, struct vmod_priv *priv_vcl,
-           struct vmod_priv *priv_call, const char *str, const char *pattern)
+static unsigned
+match(struct sess *sp, struct vmod_priv *priv_vcl, struct vmod_priv *priv_call,
+      const char *str, const char *pattern, int dynamic)
 {
 	vre_t *re;
 	struct sess_tbl *tbl;
 	int s;
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	AN(pattern);
 	CAST_OBJ_NOTNULL(tbl, priv_vcl->priv, SESS_TBL_MAGIC);
 	assert(sp->id < tbl->nsess);
 	CHECK_OBJ_NOTNULL(&tbl->sess[sp->id], SESS_OV_MAGIC);
-	if (str == NULL)
-		str = "";
+	AN(pattern);
 	
-	if (priv_call->priv == NULL) {
+	if (priv_call->priv == NULL
+	    || (dynamic && pattern != tbl->sess[sp->id].pattern)) {
 		int erroffset = 0;
 		const char *error = NULL;
 		
 		AZ(pthread_mutex_lock(&re_mutex));
-		if (priv_call->priv == NULL) {
+		if (priv_call->priv == NULL
+		    || (dynamic && strcmp(pattern,tbl->sess[sp->id].pattern))) {
 			priv_call->priv = VRE_compile(pattern, 0, &error,
 						      &erroffset);
 			if (priv_call->priv == NULL)
 				WSP(sp, SLT_VCL_error,
-				    "vmod re: error compiling regex [%s]: "
-				    "%s at position %d", pattern, error,
+				    "vmod re: error compiling regex \"%s\": "
+				    "%s (position %d)", pattern, error,
 				    erroffset);
 			else
 				priv_call->free = VRT_re_fini;
 		}
+		if (dynamic)
+			tbl->sess[sp->id].pattern
+				= WS_Dup(sp->wrk->ws, pattern);
 		AZ(pthread_mutex_unlock(&re_mutex));
 	}
 	re = (vre_t *) priv_call->priv;
 	if (re == NULL)
 		return 0;
 
+	if (str == NULL)
+		str = "";
 	s = VRE_exec(re, str, strlen(str), 0, 0, &tbl->sess[sp->id].ovector[0],
 	             MAX_OV, &params->vre_limits);
 	tbl->sess[sp->id].count = s;
@@ -162,6 +168,20 @@ vmod_match(struct sess *sp, struct vmod_priv *priv_vcl,
 	return 1;
 }
 
+unsigned __match_proto__()
+vmod_match(struct sess *sp, struct vmod_priv *priv_vcl,
+           struct vmod_priv *priv_call, const char *str, const char *pattern)
+{
+	return(match(sp, priv_vcl, priv_call, str, pattern, 0));
+}
+
+unsigned __match_proto__()
+vmod_match_dyn(struct sess *sp, struct vmod_priv *priv_vcl,
+           struct vmod_priv *priv_call, const char *str, const char *pattern)
+{
+	return(match(sp, priv_vcl, priv_call, str, pattern, 1));
+}
+
 const char * __match_proto__()
 vmod_backref(struct sess *sp, struct vmod_priv *priv_vcl, int refnum,
              const char *fallback)

src/vmod_re.vcc

 Module re
 Init re_init
 Function BOOL match(PRIV_VCL, PRIV_CALL, STRING, STRING)
+Function BOOL match_dyn(PRIV_VCL, PRIV_CALL, STRING, STRING)
 Function STRING backref(PRIV_VCL, INT, STRING)
 Function STRING version()