Dmitry Kurochkin fixed test case 530 (pipelining)

diff --git a/tests/data/test530 b/tests/data/test530
index 98064a3aaa218e164d825f2c7bca02d91fa70471..40ac42fc6e33a17b9950a9b6a0e67af296494b33 100644 (file)
--- a/tests/data/test530
+++ b/tests/data/test530
@@ -7,19 +7,21 @@ Pipelining
 </info>
 # Server-side
 <reply>
-<servercmd>
-pipe: 1
-pipe: 3
-</servercmd>
-<data>
+<data1>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
 Content-Length: 47
 
 file contents should appear once for each file
+</data1>
+<data2>
 HTTP/1.1 200 OK
+</data2>
+<data3>
 Date: Thu, 09 Nov 2010 14:49:00 GMT
+</data3>
+<data4>
 Server: test-server/fake
 Content-Length: 47
 
@@ -36,7 +38,7 @@ Server: test-server/fake
 Content-Length: 47
 
 file contents should appear once for each file
-</data>
+</data4>
 </reply>
 
 # Client-side
@@ -58,19 +60,19 @@ http://%HOSTIP:%HTTPPORT/path/530
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/530 HTTP/1.1\r
+GET /path/5300001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/530 HTTP/1.1\r
+GET /path/5300002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/530 HTTP/1.1\r
+GET /path/5300003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r
-GET /path/530 HTTP/1.1\r
+GET /path/5300004 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Accept: */*\r
 \r

diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c
index e339ab2cf72bb5598a3c36a11460e39fcf4c1171..5d4a9b3ef6d349fc74fc29d197201aac5a66b4e0 100644 (file)
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@@ -32,6 +32,7 @@ int test(char *URL)
   struct timeval mp_start;
   char ml_timedout = FALSE;
   char mp_timedout = FALSE;
+  char target_url[80];
 
   if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
     fprintf(stderr, "curl_global_init() failed\n");
@@ -58,7 +59,9 @@ int test(char *URL)
       curl_global_cleanup();
       return TEST_ERR_MAJOR_BAD + i;
     }
-    curl_easy_setopt(curl[i], CURLOPT_URL, URL);
+    snprintf(target_url, sizeof(target_url), "%s%04i", URL, i + 1);
+    target_url[sizeof(target_url) - 1] = '\0';
+    curl_easy_setopt(curl[i], CURLOPT_URL, target_url);
 
     /* go verbose */
     curl_easy_setopt(curl[i], CURLOPT_VERBOSE, 1);