Index: data/test530
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test530,v
retrieving revision 1.4
diff -U 20 -r1.4 test530
--- data/test530	16 Jan 2008 12:24:00 -0000	1.4
+++ data/test530	18 Jan 2008 08:24:57 -0000
@@ -1,79 +1,81 @@
 <testcase>
 <info>
 <keywords>
 HTTP
 Pipelining
 </keywords>
 </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
 
 file contents should appear once for each file
 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
 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
-</data>
+</data4>
 </reply>
 
 # Client-side
 <client>
 <server>
 http
 </server>
 <tool>
 lib530
 </tool>
  <name>
 HTTP GET using pipelining
  </name>
  <command>
 http://%HOSTIP:%HTTPPORT/path/530
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-GET /path/530 HTTP/1.1
+GET /path/5300001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/530 HTTP/1.1
+GET /path/5300002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/530 HTTP/1.1
+GET /path/5300003 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
-GET /path/530 HTTP/1.1
+GET /path/5300004 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
 </protocol>
 </verify>
 </testcase>
Index: libtest/lib530.c
===================================================================
RCS file: /cvsroot/curl/curl/tests/libtest/lib530.c,v
retrieving revision 1.13
diff -U 20 -r1.13 lib530.c
--- libtest/lib530.c	10 Mar 2007 00:19:05 -0000	1.13
+++ libtest/lib530.c	18 Jan 2008 08:24:58 -0000
@@ -15,67 +15,70 @@
 
 #include "testutil.h"
 
 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
 
 #define NUM_HANDLES 4
 
 int test(char *URL)
 {
   int res = 0;
   CURL *curl[NUM_HANDLES];
   int running;
   char done=FALSE;
   CURLM *m;
   int i, j;
   struct timeval ml_start;
   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");
     return TEST_ERR_MAJOR_BAD;
   }
 
   if ((m = curl_multi_init()) == NULL) {
     fprintf(stderr, "curl_multi_init() failed\n");
     curl_global_cleanup();
     return TEST_ERR_MAJOR_BAD;
   }
 
   /* get NUM_HANDLES easy handles */
   for(i=0; i < NUM_HANDLES; i++) {
     curl[i] = curl_easy_init();
     if(!curl[i]) {
       fprintf(stderr, "curl_easy_init() failed "
               "on handle #%d\n", i);
       for (j=i-1; j >= 0; j--) {
         curl_multi_remove_handle(m, curl[j]);
         curl_easy_cleanup(curl[j]);
       }
       curl_multi_cleanup(m);
       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);
 
     /* include headers */
     curl_easy_setopt(curl[i], CURLOPT_HEADER, 1);
 
     /* add handle to multi */
     if ((res = (int)curl_multi_add_handle(m, curl[i])) != CURLM_OK) {
       fprintf(stderr, "curl_multi_add_handle() failed, "
               "on handle #%d with code %d\n", i, res);
       curl_easy_cleanup(curl[i]);
       for (j=i-1; j >= 0; j--) {
         curl_multi_remove_handle(m, curl[j]);
         curl_easy_cleanup(curl[j]);
       }
       curl_multi_cleanup(m);
       curl_global_cleanup();
       return TEST_ERR_MAJOR_BAD + i;
     }