X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_filter_rewrite.cpp;h=36e1a15f1dfb938e32cc9e3fdaaedd5b420664f4;hb=4a14f732154658bbd097d833089f968d77568ebd;hp=e3802a7531ca597a4054471778271654aac0d033;hpb=8949e75975de65f081f8eb9197e9f5f9ee9dd227;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_rewrite.cpp b/src/test_filter_rewrite.cpp
index e3802a7..36e1a15 100644
--- a/src/test_filter_rewrite.cpp
+++ b/src/test_filter_rewrite.cpp
@@ -69,17 +69,23 @@ BOOST_AUTO_TEST_CASE( test_filter_rewrite_1 )
             "<filter xmlns='http://indexdata.com/metaproxy'\n"
             "        id='rewrite1' type='http_rewrite'>\n"
             " <request>\n"
-            "   <rewrite from='"
+            "   <rule name=\"url\">\n"
+            "     <rewrite from='"
     "(?&lt;proto>https?://)(?&lt;pxhost>[^ /?#]+)/(?&lt;pxpath>[^ /]+)"
     "/(?&lt;host>[^ /]+)(?&lt;path>[^ ]*)'\n"
             "            to='${proto}${host}${path}' />\n"
-            "   <rewrite from='(?:Host: )(.*)'\n"
-            "            to='Host: ${host}' />\n" 
+            "     <rewrite from='(?:Host: )(.*)'\n"
+            "            to='Host: ${host}' />\n"
+            "   </rule>\n"
+            "   <within rule=\"url\"/>\n"
             " </request>\n"
             " <response>\n"
-            "   <rewrite from='"
+            "   <rule name=\"url\">\n"
+            "     <rewrite from='"
     "(?&lt;proto>https?://)(?&lt;host>[^/?# &quot;&apos;>]+)/(?&lt;path>[^  &quot;&apos;>]+)'\n"
             "            to='${proto}${pxhost}/${pxpath}/${host}/${path}' />\n" 
+            "  </rule>\n"
+            "  <within rule=\"url\"/>\n"
             " </response>\n"
             "</filter>\n"
         ;