Commit f1bb0147 authored by Geoff Simmons's avatar Geoff Simmons

Add the backref() function.

There's still a bit of code repetition to be factored out.
parent 4b9b68b0
Pipeline #244 skipped
......@@ -39,6 +39,7 @@ CONTENTS
* regex(STRING, BOOL, BOOL, ENUM {ANYCRLF,UNICODE}, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, STRING, BOOL, INT, BOOL, BOOL, BOOL, BOOL, ENUM {CR,LF,CRLF,ANYCRLF,ANY}, BOOL, BOOL, BOOL, BOOL, BOOL, INT, BOOL, BOOL, BOOL, BOOL)
* BOOL match(PRIV_CALL, PRIV_TASK, STRING, STRING, BOOL, BOOL, ENUM {ANYCRLF,UNICODE}, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, BOOL, STRING, BOOL, INT, BOOL, BOOL, BOOL, BOOL, ENUM {CR,LF,CRLF,ANYCRLF,ANY}, BOOL, BOOL, BOOL, BOOL, BOOL, INT, BOOL, BOOL, BOOL, BOOL, INT, INT, INT, BOOL, BOOL, BOOL, BOOL, BOOL, ENUM {HARD,SOFT}, INT)
* STRING backref(PRIV_TASK, INT, STRING)
* BOOL config_bool(ENUM {JIT,STACKRECURSE,UNICODE})
* STRING config_str(ENUM {BSR,JITTARGET,NEWLINE,UNICODE_VERSION,VERSION})
* INT config_int(ENUM {LINKSIZE,MATCHLIMIT,PARENSLIMIT,RECURSIONLIMIT})
......@@ -91,6 +92,15 @@ match
BOOL match(PRIV_CALL, PRIV_TASK, STRING pattern, STRING subject, BOOL allow_empty_class=0, BOOL anchored=0, ENUM {ANYCRLF,UNICODE} bsr=0, BOOL alt_bsux=0, BOOL alt_circumflex=0, BOOL alt_verbnames=0, BOOL caseless=0, BOOL dollar_endonly=0, BOOL dotall=0, BOOL dupnames=0, BOOL extended=0, BOOL firstline=0, STRING locale=0, BOOL match_unset_backref=0, INT max_pattern_len=0, BOOL multiline=0, BOOL never_backslash_c=0, BOOL never_ucp=0, BOOL never_utf=0, ENUM {CR,LF,CRLF,ANYCRLF,ANY} newline=0, BOOL no_auto_capture=0, BOOL no_auto_possess=0, BOOL no_dotstar_anchor=0, BOOL no_start_optimize=0, BOOL no_utf_check=0, INT parens_nest_limit=0, BOOL ucp=0, BOOL ungreedy=0, BOOL use_offset_limit=0, BOOL utf=0, INT len=0, INT match_limit=0, INT offset_limit=0, BOOL notbol=0, BOOL noteol=0, BOOL notempty=0, BOOL notempty_atstart=0, BOOL no_jit=0, ENUM {HARD,SOFT} partial=0, INT recursion_limit=0)
.. _func_backref:
backref
-------
::
STRING backref(PRIV_TASK, INT ref, STRING fallback="**BACKREF FUNCTION FAILED**")
.. _func_config_bool:
config_bool
......
......@@ -17,6 +17,7 @@ varnish v1 -vcl {
}
sub vcl_synth {
# .backref() method
# Tests task scopes for two different objects
if (barbaz.match("barbaz") && bazplus.match("bazquux")) {
set resp.http.bar0 = barbaz.backref(0, "error0");
......@@ -39,6 +40,34 @@ varnish v1 -vcl {
else {
set resp.status = 999;
}
# backref() function
if (pcre2.match("(bar)(baz)", "barbaz")) {
set resp.http.bar0-f = pcre2.backref(0, "error0");
set resp.http.bar1-f = pcre2.backref(1, "error1");
set resp.http.bar2-f = pcre2.backref(2, "error2");
}
else {
set resp.status = 999;
}
if (pcre2.match("(baz)(.+)", "bazquux")) {
set resp.http.baz0-f = pcre2.backref(0, "error0");
set resp.http.baz1-f = pcre2.backref(1, "error1");
set resp.http.baz2-f = pcre2.backref(2, "error2");
}
else {
set resp.status = 999;
}
if (pcre2.match("(.)(.)(.)(.)", "barf")) {
set resp.http.frap-f
= "_" + pcre2.backref(0, "error0") + "_"
+ pcre2.backref(4, "error4")
+ pcre2.backref(3, "error3")
+ pcre2.backref(2, "error2") + "p_";
}
else {
set resp.status = 999;
}
}
} -start
......@@ -53,6 +82,13 @@ client c1 -repeat 2 {
expect resp.http.baz1 == "baz"
expect resp.http.baz2 == "quux"
expect resp.http.frap == "_barf_frap_"
expect resp.http.bar0-f == "barbaz"
expect resp.http.bar1-f == "bar"
expect resp.http.bar2-f == "baz"
expect resp.http.baz0-f == "bazquux"
expect resp.http.baz1-f == "baz"
expect resp.http.baz2-f == "quux"
expect resp.http.frap-f == "_barf_frap_"
} -run
# backref failure
......@@ -170,3 +206,106 @@ logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
expect * = VCL_Error "^vmod pcre2 error: in foo.backref..: unknown substring$"
expect * = End
} -run
# The same tests with the backref function.
varnish v1 -vcl {
import pcre2 from "${vmod_topbuild}/src/.libs/libvmod_pcre2.so";
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
return(synth(200));
}
sub vcl_synth {
set resp.http.nomatch = pcre2.backref(0);
if (pcre2.match("(bar)(baz)", "barbaz")) {
set resp.http.bar0 = pcre2.backref(0, "error0");
set resp.http.bar3 = pcre2.backref(3, "error3");
set resp.http.bar-1 = pcre2.backref(-1, "error-1");
set resp.http.barinf
= pcre2.backref(4294967296, "errorinf");
set resp.http.fallback
= pcre2.backref(0, req.http.undef);
}
set resp.http.frob1 = pcre2.match("(frob)(nitz)", "barbaz");
set resp.http.frob1-0 = pcre2.backref(0, "error0");
set resp.http.frob1-1 = pcre2.backref(1, "error1");
set resp.http.frob1-2 = pcre2.backref(2, "error2");
set resp.http.frob-yes
= pcre2.match("(frob)(nitz)", "frobnitz");
set resp.http.frob-no = pcre2.match("(frob)(nitz)", "barbaz");
set resp.http.frob2-0 = pcre2.backref(0, "error0");
set resp.http.frob2-1 = pcre2.backref(1, "error1");
set resp.http.frob2-2 = pcre2.backref(2, "error2");
set resp.http.azbc = pcre2.match("(a|(z))(bc)", "abc");
set resp.http.azbc-0 = pcre2.backref(0, "error0");
set resp.http.azbc-1 = pcre2.backref(1, "error1");
set resp.http.azbc-2 = pcre2.backref(2, "error2");
set resp.http.azbc-3 = pcre2.backref(3, "error3");
set resp.http.foo
= pcre2.match("(f)(o)(o)", "foo", no_auto_capture=true);
set resp.http.foo-0 = pcre2.backref(0, "error0");
set resp.http.foo-1 = pcre2.backref(1, "error1");
set resp.http.foo-2 = pcre2.backref(2, "error2");
set resp.http.foo-3 = pcre2.backref(3, "error3");
}
}
logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
expect 0 * Begin req
expect * = VCL_Error "^vmod pcre2 error: pcre2.backref.. called without prior match$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: unknown substring$"
expect * = VCL_Error "^vmod pcre2 error: ref .-1. out of range in pcre2.backref.. .must be >= 0 and <= 4294967295.$"
expect * = VCL_Error "^vmod pcre2 error: ref .4294967296. out of range in pcre2.backref.. .must be >= 0 and <= 4294967295.$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: fallback is undefined$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: no match$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: no match$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: no match$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: no match$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: no match$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: no match$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: requested value is not set$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: unknown substring$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: unknown substring$"
expect * = VCL_Error "^vmod pcre2 error: in pcre2.backref..: unknown substring$"
expect * = End
} -start
client c1 -repeat 2 {
txreq
rxresp
expect resp.status == "200"
expect resp.http.nomatch == "**BACKREF FUNCTION FAILED**"
expect resp.http.bar0 == "barbaz"
expect resp.http.bar3 == "error3"
expect resp.http.barinf == "errorinf"
expect resp.http.fallback == "**BACKREF FUNCTION FAILED**"
expect resp.http.frob1 == "false"
expect resp.http.frob1-0 == "error0"
expect resp.http.frob1-1 == "error1"
expect resp.http.frob1-2 == "error2"
expect resp.http.frob-yes == "true"
expect resp.http.frob-no == "false"
expect resp.http.frob2-0 == "error0"
expect resp.http.frob2-1 == "error1"
expect resp.http.frob2-2 == "error2"
expect resp.http.azbc == "true"
expect resp.http.azbc-0 == "abc"
expect resp.http.azbc-1 == "a"
expect resp.http.azbc-2 == "error2"
expect resp.http.azbc-3 == "bc"
expect resp.http.foo == "true"
expect resp.http.foo-0 == "foo"
expect resp.http.foo-1 == "error1"
expect resp.http.foo-2 == "error2"
expect resp.http.foo-3 == "error3"
} -run
logexpect l1 -wait
......@@ -4,8 +4,10 @@ varnishtest "large number of backrefs"
# from pcre2 testinput2
# Start with increased thread stack size, due to deep recursion.
varnish v1 -arg "-p thread_pool_stack=384k" -vcl {
# Start with increased thread stack size, due to deep recursion,
# and increased workspace due to the load created by the backrefs.
varnish v1 -arg "-p thread_pool_stack=384k" -arg "-p workspace_client=128k" \
-vcl {
import pcre2 from "${vmod_topbuild}/src/.libs/libvmod_pcre2.so";
backend b { .host = "${bad_ip}"; }
......@@ -293,6 +295,283 @@ varnish v1 -arg "-p thread_pool_stack=384k" -vcl {
+ r.backref(269)
+ r.backref(270)
+ r.backref(271);
# Again with the match() and backref() functions.
set resp.http.m-f = pcre2.match(
{"(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\d+(?:\s|$))(\w+)\s+(\270)"},
{"1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 ABC ABC"});
set resp.http.b0-f = pcre2.backref(0);
set resp.http.b-f = pcre2.backref(1)
+ pcre2.backref(2)
+ pcre2.backref(3)
+ pcre2.backref(4)
+ pcre2.backref(5)
+ pcre2.backref(6)
+ pcre2.backref(7)
+ pcre2.backref(8)
+ pcre2.backref(9)
+ pcre2.backref(10)
+ pcre2.backref(11)
+ pcre2.backref(12)
+ pcre2.backref(13)
+ pcre2.backref(14)
+ pcre2.backref(15)
+ pcre2.backref(16)
+ pcre2.backref(17)
+ pcre2.backref(18)
+ pcre2.backref(19)
+ pcre2.backref(20)
+ pcre2.backref(21)
+ pcre2.backref(22)
+ pcre2.backref(23)
+ pcre2.backref(24)
+ pcre2.backref(25)
+ pcre2.backref(26)
+ pcre2.backref(27)
+ pcre2.backref(28)
+ pcre2.backref(29)
+ pcre2.backref(30)
+ pcre2.backref(31)
+ pcre2.backref(32)
+ pcre2.backref(33)
+ pcre2.backref(34)
+ pcre2.backref(35)
+ pcre2.backref(36)
+ pcre2.backref(37)
+ pcre2.backref(38)
+ pcre2.backref(39)
+ pcre2.backref(40)
+ pcre2.backref(41)
+ pcre2.backref(42)
+ pcre2.backref(43)
+ pcre2.backref(44)
+ pcre2.backref(45)
+ pcre2.backref(46)
+ pcre2.backref(47)
+ pcre2.backref(48)
+ pcre2.backref(49)
+ pcre2.backref(50)
+ pcre2.backref(51)
+ pcre2.backref(52)
+ pcre2.backref(53)
+ pcre2.backref(54)
+ pcre2.backref(55)
+ pcre2.backref(56)
+ pcre2.backref(57)
+ pcre2.backref(58)
+ pcre2.backref(59)
+ pcre2.backref(60)
+ pcre2.backref(61)
+ pcre2.backref(62)
+ pcre2.backref(63)
+ pcre2.backref(64)
+ pcre2.backref(65)
+ pcre2.backref(66)
+ pcre2.backref(67)
+ pcre2.backref(68)
+ pcre2.backref(69)
+ pcre2.backref(70)
+ pcre2.backref(71)
+ pcre2.backref(72)
+ pcre2.backref(73)
+ pcre2.backref(74)
+ pcre2.backref(75)
+ pcre2.backref(76)
+ pcre2.backref(77)
+ pcre2.backref(78)
+ pcre2.backref(79)
+ pcre2.backref(80)
+ pcre2.backref(81)
+ pcre2.backref(82)
+ pcre2.backref(83)
+ pcre2.backref(84)
+ pcre2.backref(85)
+ pcre2.backref(86)
+ pcre2.backref(87)
+ pcre2.backref(88)
+ pcre2.backref(89)
+ pcre2.backref(90)
+ pcre2.backref(91)
+ pcre2.backref(92)
+ pcre2.backref(93)
+ pcre2.backref(94)
+ pcre2.backref(95)
+ pcre2.backref(96)
+ pcre2.backref(97)
+ pcre2.backref(98)
+ pcre2.backref(99)
+ pcre2.backref(100)
+ pcre2.backref(101)
+ pcre2.backref(102)
+ pcre2.backref(103)
+ pcre2.backref(104)
+ pcre2.backref(105)
+ pcre2.backref(106)
+ pcre2.backref(107)
+ pcre2.backref(108)
+ pcre2.backref(109)
+ pcre2.backref(110)
+ pcre2.backref(111)
+ pcre2.backref(112)
+ pcre2.backref(113)
+ pcre2.backref(114)
+ pcre2.backref(115)
+ pcre2.backref(116)
+ pcre2.backref(117)
+ pcre2.backref(118)
+ pcre2.backref(119)
+ pcre2.backref(120)
+ pcre2.backref(121)
+ pcre2.backref(122)
+ pcre2.backref(123)
+ pcre2.backref(124)
+ pcre2.backref(125)
+ pcre2.backref(126)
+ pcre2.backref(127)
+ pcre2.backref(128)
+ pcre2.backref(129)
+ pcre2.backref(130)
+ pcre2.backref(131)
+ pcre2.backref(132)
+ pcre2.backref(133)
+ pcre2.backref(134)
+ pcre2.backref(135)
+ pcre2.backref(136)
+ pcre2.backref(137)
+ pcre2.backref(138)
+ pcre2.backref(139)
+ pcre2.backref(140)
+ pcre2.backref(141)
+ pcre2.backref(142)
+ pcre2.backref(143)
+ pcre2.backref(144)
+ pcre2.backref(145)
+ pcre2.backref(146)
+ pcre2.backref(147)
+ pcre2.backref(148)
+ pcre2.backref(149)
+ pcre2.backref(150)
+ pcre2.backref(151)
+ pcre2.backref(152)
+ pcre2.backref(153)
+ pcre2.backref(154)
+ pcre2.backref(155)
+ pcre2.backref(156)
+ pcre2.backref(157)
+ pcre2.backref(158)
+ pcre2.backref(159)
+ pcre2.backref(160)
+ pcre2.backref(161)
+ pcre2.backref(162)
+ pcre2.backref(163)
+ pcre2.backref(164)
+ pcre2.backref(165)
+ pcre2.backref(166)
+ pcre2.backref(167)
+ pcre2.backref(168)
+ pcre2.backref(169)
+ pcre2.backref(170)
+ pcre2.backref(171)
+ pcre2.backref(172)
+ pcre2.backref(173)
+ pcre2.backref(174)
+ pcre2.backref(175)
+ pcre2.backref(176)
+ pcre2.backref(177)
+ pcre2.backref(178)
+ pcre2.backref(179)
+ pcre2.backref(180)
+ pcre2.backref(181)
+ pcre2.backref(182)
+ pcre2.backref(183)
+ pcre2.backref(184)
+ pcre2.backref(185)
+ pcre2.backref(186)
+ pcre2.backref(187)
+ pcre2.backref(188)
+ pcre2.backref(189)
+ pcre2.backref(190)
+ pcre2.backref(191)
+ pcre2.backref(192)
+ pcre2.backref(193)
+ pcre2.backref(194)
+ pcre2.backref(195)
+ pcre2.backref(196)
+ pcre2.backref(197)
+ pcre2.backref(198)
+ pcre2.backref(199)
+ pcre2.backref(200)
+ pcre2.backref(201)
+ pcre2.backref(202)
+ pcre2.backref(203)
+ pcre2.backref(204)
+ pcre2.backref(205)
+ pcre2.backref(206)
+ pcre2.backref(207)
+ pcre2.backref(208)
+ pcre2.backref(209)
+ pcre2.backref(210)
+ pcre2.backref(211)
+ pcre2.backref(212)
+ pcre2.backref(213)
+ pcre2.backref(214)
+ pcre2.backref(215)
+ pcre2.backref(216)
+ pcre2.backref(217)
+ pcre2.backref(218)
+ pcre2.backref(219)
+ pcre2.backref(220)
+ pcre2.backref(221)
+ pcre2.backref(222)
+ pcre2.backref(223)
+ pcre2.backref(224)
+ pcre2.backref(225)
+ pcre2.backref(226)
+ pcre2.backref(227)
+ pcre2.backref(228)
+ pcre2.backref(229)
+ pcre2.backref(230)
+ pcre2.backref(231)
+ pcre2.backref(232)
+ pcre2.backref(233)
+ pcre2.backref(234)
+ pcre2.backref(235)
+ pcre2.backref(236)
+ pcre2.backref(237)
+ pcre2.backref(238)
+ pcre2.backref(239)
+ pcre2.backref(240)
+ pcre2.backref(241)
+ pcre2.backref(242)
+ pcre2.backref(243)
+ pcre2.backref(244)
+ pcre2.backref(245)
+ pcre2.backref(246)
+ pcre2.backref(247)
+ pcre2.backref(248)
+ pcre2.backref(249)
+ pcre2.backref(250)
+ pcre2.backref(251)
+ pcre2.backref(252)
+ pcre2.backref(253)
+ pcre2.backref(254)
+ pcre2.backref(255)
+ pcre2.backref(256)
+ pcre2.backref(257)
+ pcre2.backref(258)
+ pcre2.backref(259)
+ pcre2.backref(260)
+ pcre2.backref(261)
+ pcre2.backref(262)
+ pcre2.backref(263)
+ pcre2.backref(264)
+ pcre2.backref(265)
+ pcre2.backref(266)
+ pcre2.backref(267)
+ pcre2.backref(268)
+ pcre2.backref(269)
+ pcre2.backref(270)
+ pcre2.backref(271);
}
} -start
......@@ -300,6 +579,10 @@ client c1 -repeat 2 {
txreq
rxresp
expect resp.status == "200"
expect resp.http.m == "true"
expect resp.http.b0 == "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 ABC ABC"
expect resp.http.b == "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 ABCABC"
expect resp.http.m-f == "true"
expect resp.http.b0-f == "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 ABC ABC"
expect resp.http.b-f == "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 ABCABC"
} -run
......@@ -1446,24 +1446,24 @@ varnish v1 -vcl {
set resp.http.r7b = r7.backref(0);
set resp.http.f1m = pcre2.match("<.*>", "abc<def>ghi<klm>nop");
# set resp.http.f1b = pcre2.backref(0);
set resp.http.f1b = pcre2.backref(0);
set resp.http.f2m = pcre2.match("<.*?>", "abc<def>ghi<klm>nop");
# set resp.http.f2b = pcre2.backref(0);
set resp.http.f2b = pcre2.backref(0);
set resp.http.f3m
= pcre2.match("<.*>", "abc<def>ghi<klm>nop", ungreedy=true);
# set resp.http.f3b = pcre2.backref(0);
set resp.http.f3b = pcre2.backref(0);
set resp.http.f4m
= pcre2.match("(?U)<.*>", "abc<def>ghi<klm>nop");
# set resp.http.f4b = pcre2.backref(0);
set resp.http.f4b = pcre2.backref(0);
set resp.http.f5m
= pcre2.match("<.*?>", "abc<def>ghi<klm>nop",
ungreedy=true);
# set resp.http.f5b = pcre2.backref(0);
set resp.http.f5b = pcre2.backref(0);
set resp.http.f6m
= pcre2.match("={3,}", "abc========def", ungreedy=true);
# set resp.http.f6b = pcre2.backref(0);
set resp.http.f6b = pcre2.backref(0);
set resp.http.f7m = pcre2.match("(?U)={3,}?", "abc========def");
# set resp.http.f7b = pcre2.backref(0);
set resp.http.f7b = pcre2.backref(0);
}
}
......@@ -1486,19 +1486,19 @@ client c1 {
expect resp.http.r7m == "true"
expect resp.http.r7b == "========"
expect resp.http.f1m == "true"
expect resp.http.f1b == "<def>ghi<klm>"
expect resp.http.f2m == "true"
expect resp.http.f2b == "<def>"
expect resp.http.f3m == "true"
expect resp.http.f3b == "<def>"
expect resp.http.f4m == "true"
expect resp.http.f4b == "<def>"
expect resp.http.f5m == "true"
expect resp.http.f5b == "<def>ghi<klm>"
expect resp.http.f6m == "true"
expect resp.http.f6b == "==="
expect resp.http.f7m == "true"
expect resp.http.f7b == "========"
} -run
# use_offset_limit
......
......@@ -865,6 +865,29 @@ vmod_match(VRT_CTX, struct vmod_priv *call, struct vmod_priv *task,
return ret;
}
VCL_STRING
vmod_backref(VRT_CTX, struct vmod_priv *task, VCL_INT ref, VCL_STRING fallback)
{
struct task *match_task;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
AN(task);
if (fallback == NULL) {
ERR(ctx, "in pcre2.backref(): fallback is undefined");
return "**BACKREF FUNCTION FAILED**";
}
if (task->priv == NULL) {
ERR(ctx, "pcre2.backref() called without prior match");
return fallback;
}
WS_Assert_Allocated(ctx->ws, task->priv, sizeof(*match_task));
CAST_OBJ(match_task, task->priv, VMOD_PCRE2_TASK_MAGIC);
return refer(ctx, ref, NULL, fallback, NUMBERED, match_task->mdata,
"pcre2", "backref", "**BACKREF FUNCTION FAILED**");
}
/* Functions */
VCL_BOOL
......
......@@ -64,6 +64,9 @@ $Function BOOL match(PRIV_CALL, PRIV_TASK, STRING pattern, STRING subject,
BOOL notempty_atstart=0, BOOL no_jit=0,
ENUM {HARD, SOFT} partial=0, INT recursion_limit=0)
$Function STRING backref(PRIV_TASK, INT ref,
STRING fallback = "**BACKREF FUNCTION FAILED**")
$Function BOOL config_bool(ENUM {JIT, STACKRECURSE, UNICODE})
$Function STRING config_str(ENUM {BSR, JITTARGET, NEWLINE, UNICODE_VERSION,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment