Rewrite for new proposed VRB_Iterate() API

configure.ac

@@ -28,24 +28,20 @@ AC_ARG_WITH([rst2man],
 
 m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.md]))
 
-VARNISH_PREREQ([4.1], [5.0.0])
+VARNISH_PREREQ([4.1], [trunk])
 VARNISH_VMODS([soap])
 
 AC_SUBST([VARNISHSRC])
 AC_ARG_VAR([VARNISHSRC], [path to Varnish source tree])
 AS_IF([test "x${VARNISHSRC}" = "x" ], AC_MSG_FAILURE([\$VARNISHSRC is not set]), AC_MSG_RESULT([yes]))
 AC_CHECK_FILE([$VARNISHSRC/include/vrt.h],
-        [],
-        [AC_MSG_FAILURE([\$VARNISHSRC "$VARNISHSRC" is not a Varnish source directory])]
+	[],
+	[AC_MSG_FAILURE([\$VARNISHSRC "$VARNISHSRC" is not a Varnish source directory])]
 )
 
 VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
 AC_SUBST(VMOD_TESTS)
 
-PKG_CHECK_VAR([LIBVARNISHAPI_LIBDIR], [varnishapi], [libdir])
-AC_SUBST([VARNISH_LIBRARY_PATH],
-	[$LIBVARNISHAPI_LIBDIR:$LIBVARNISHAPI_LIBDIR/varnish])
-
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile

src/Makefile.am

@@ -6,18 +6,15 @@ AM_CFLAGS = $(VARNISHAPI_CFLAGS) -Wall -Werror \
 	-I/usr/include/apr-1.0 \
 	-I$(VARNISHSRC)
 
-AM_LDFLAGS = $(VARNISHAPI_LIBS) $(VMOD_LDFLAGS) \
+AM_LDFLAGS = $(VMOD_LDFLAGS) \
 	-lxml2 \
 	-lapr-1
 
 vmod_LTLIBRARIES = libvmod_soap.la
 
 libvmod_soap_la_SOURCES = \
 	vmod_soap.c \
-	vmod_soap_http.c \
-	vmod_soap_gzip.c \
-	vmod_soap_xml.c \
-	vmod_soap_request.c
+	vmod_soap_xml.c
 
 nodist_libvmod_soap_la_SOURCES = \
 	vcc_soap_if.c \

src/tests/a00000.vtc

@@ -9,9 +9,16 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            if (req.http.Content-Encoding &&
+                req.http.Content-Encoding != "gzip") {
+                    return (synth(400, "Content-Encoding not supported"));
+            }
+            std.cache_req_body(1M);
+
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
             }

src/tests/a00001.vtc

@@ -1,6 +1,11 @@
 varnishtest "No Content-Length (or zero/negative) / Transfer-Encoding: chunked"
 
 server s1 {
+        rxreq
+        expect req.http.soap-ws-ns == "http://schemas.reuters.com/mytest"
+        expect req.http.content-length == 215
+        txresp -status 200
+
         rxreq
         expect req.http.soap-ws-ns == "http://schemas.reuters.com/mytest"
         expect req.http.content-length == 181
@@ -9,9 +14,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
             }
@@ -31,7 +38,7 @@ client c1 {
 </Body></Envelope>}
         chunkedlen 0
         rxresp
-        expect resp.status == 400
+        expect resp.status == 200
 } -run
 
 client c1 {

src/tests/a00002.vtc

@@ -9,9 +9,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
             }

src/tests/a00003.vtc

@@ -9,9 +9,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
             }

src/tests/a00004.vtc

@@ -9,9 +9,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
             }

src/tests/a00005.vtc

@@ -9,9 +9,12 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
+
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
             }

src/tests/a00006.vtc

@@ -1,25 +1,23 @@
 varnishtest "SOAP: req body is not in XML format."
 
-server s1 {
-        rxreq
-        expect req.http.soap-ws-ns == "http://schemas.reuters.com/mytest"
-        expect req.http.content-length == 198
-        txresp -status 200
-} -start
-
-varnish v1 -vcl+backend {
+varnish v1 -vcl {
     import ${vmod_soap};
+    import std;
+
+    backend foo none;
 
     sub vcl_recv
     {
+            # cache just enough to determine if xml
+            std.cache_req_body(10B, partial=true);
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
+                    return (synth(200));
             }
             else {
                     return (synth(400, "Wrong SOAP message"));
             }
     }
-
 } -start
 
 client c1 {

src/tests/a00007.vtc

@@ -9,9 +9,12 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
+
             if(soap.is_valid()) {
                     set req.http.soap-ws-ns = soap.action_namespace();
             }

src/tests/b00000.vtc

@@ -9,12 +9,14 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            # 196b: just enough to read the namespace
+            std.cache_req_body(196b, partial=true);
             set req.http.soap-ws-ns = soap.action_namespace();
     }
-
 } -start
 
 client c1 {

src/tests/b00001.vtc

@@ -9,9 +9,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1M, partial=true);
             set req.http.soap-ws-ns = soap.action();
     }
 } -start

src/tests/b00002.vtc

@@ -16,9 +16,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             set req.http.soap-action = soap.action();
             set req.http.soap-action-ns = soap.action_namespace();
     }

src/tests/b00003.vtc

@@ -9,9 +9,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1M, partial=true);
             set req.http.soap-action = soap.action();
             set req.http.soap-action-ns = soap.action_namespace();
     }

src/tests/b00004.vtc

@@ -12,6 +12,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_init
     {
@@ -21,6 +22,7 @@ varnish v1 -vcl+backend {
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             if(req.url == "/header") {
                     set req.http.soap-uuid = soap.xpath_header("ui:userIdentity/uuid:UUID");
             }

src/tests/b00005.vtc

@@ -12,9 +12,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1M);
             set req.http.soap-ws-ns = soap.action_namespace();
             if(!req.http.soap-ws-ns) {
                     return (synth(400, "SOAP Action URI is mandatory"));

src/tests/b00006.vtc

@@ -8,6 +8,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_init
     {
@@ -17,6 +18,7 @@ varnish v1 -vcl+backend {
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             set req.http.soap-uuid = soap.xpath_header("ui:userIdentity/uuid:UUID");
             if(!req.http.soap-uuid || req.http.soap-uuid == "") {
                     return (synth(400, "SOAP UUID is mandatory"));

src/tests/b00007.vtc

@@ -8,6 +8,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_init
     {
@@ -17,6 +18,7 @@ varnish v1 -vcl+backend {
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             set req.http.soap-uuid = soap.xpath_body("ui:userIdentity/uuid:UUID");
             if(!req.http.soap-uuid || req.http.soap-uuid == "") {
                     return (synth(400, "SOAP UUID is mandatory"));

src/tests/b00008.vtc

@@ -8,9 +8,11 @@ server s1 {
 
 varnish v1 -vcl+backend {
     import ${vmod_soap};
+    import std;
 
     sub vcl_recv
     {
+            std.cache_req_body(1K);
             if(soap.is_valid()) {
                     return (synth(800, "SOAP is devil"));
             }