new way to trick sws to return special data on CONNECT

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 0d8fae966f1418ac98537b82107579613dd79616..6b48382c053e542ae0a754278d3e357c6bfb3150 100644 (file)
--- a/tests/FILEFORMAT
+++ b/tests/FILEFORMAT
@@ -102,6 +102,10 @@ that is returned. The last slash in the URL must be followed by a number. That
 number (N) will be used by the test-server to load test case N and return the
 data that is defined within the <reply><data></data></reply> section.
 
+If a CONNECT is used to the server (to emulate HTTPS etc over proxy), the port
+number given in the CONNECT request will be used to identify which test that
+is being run, if the proxy host name is said to start with 'test'.
+
 Set 'option=no-output' to prevent the test script to slap on the --output
 argument that directs the output to a file. The --output is also not added if
 the client/stdout section is used.

diff --git a/tests/server/sws.c b/tests/server/sws.c
index b006c2b57a419278a7bd1e9b1f8b2ccd6cb79b4e..36975bef5ca39affd6fe29d4cfe30a8ccc150067 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -350,6 +350,13 @@ static int get_request(int sock, int *part, int *open)
         if(!strncmp(doc, "bad", 3))
           /* if the host name starts with bad, we fake an error here */
           test_no = DOCNUMBER_BADCONNECT;
+        else if(!strncmp(doc, "test", 4)) {
+          char *ptr = strchr(doc, ':');
+          if(ptr)
+            test_no = atoi(ptr+1);
+          else
+            test_no = DOCNUMBER_CONNECT;
+        }
         else
           test_no = DOCNUMBER_CONNECT;
       }