CONNECT response headers are now passed back as "regular" headers

diff --git a/CHANGES b/CHANGES
index b3a7b929141f55d412780425a32071e39a1d0eff..e721482295002529a0379abaa286487e59f5f244 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,17 @@
 
                                   Changelog
 
+Daniel(27 January 2004)
+- Made the response-headers during a CONNECT request to a proxy get passed on
+  as regular headers, so they appear with -i/-I options and similar.
+
+- Based on a patch by Gisle Vanem, I've made the progress meter display
+  properly switch to a GB-display when more than 9999MB have been transfered.
+
 Daniel(23 January 2004)
+- Gisle Vanem pointed out a curlrc parser problem/crash when an option with a
+  required didn't have one and was on the last line of a file.
+
 - More Windows fixes for large files. We now build and link with
   ../lib/strtoofft.c in the app code since Curl_strtoll() is not a provided
   libcurl function... Perhaps we should consider a 'common' dir or similar

diff --git a/lib/http.c b/lib/http.c
index 2d8e87b65bf50a36348eb32778e8b3c3142be0d8..0dcaf78664c202412cc501753140fe67c4732dc2 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -869,6 +869,21 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
             perline++; /* amount of bytes in this line so far */
             if(*ptr=='\n') {
               char letter;
+              int writetype;
+            
+              /* output debug output if that is requested */
+              if(data->set.verbose)
+                Curl_debug(data, CURLINFO_HEADER_IN, line_start, perline);
+
+              /* send the header to the callback */
+              writetype = CLIENTWRITE_HEADER;
+              if(data->set.http_include_header)
+                writetype |= CLIENTWRITE_BODY;
+
+              result = Curl_client_write(data, writetype, line_start, perline);
+              if(result)
+                return result;
+
               /* Newlines are CRLF, so the CR is ignored as the line isn't
                  really terminated until the LF comes. Treat a following CR
                  as end-of-headers as well.*/
@@ -880,10 +895,6 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
                 break; /* breaks out of for-loop, not switch() */
               }
 
-              /* output debug output if that is requested */
-              if(data->set.verbose)
-                Curl_debug(data, CURLINFO_HEADER_IN, line_start, perline);
-
               /* keep a backup of the position we are about to blank */
               letter = line_start[perline];
               line_start[perline]=0; /* zero terminate the buffer */

diff --git a/tests/data/test503 b/tests/data/test503
index a6727424ee9bc36a522eae006fa21cc9effc68d3..10daf828d9c2e085d7aeeeb1e081496733692eed 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -8,6 +8,15 @@ Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
 ETag: "21025-dc7-39462498"
 
 </data>
+<datacheck>
+HTTP/1.1 200 Mighty fine indeed
+HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+
+</datacheck>
 </reply>
 
 # Client-side

diff --git a/tests/data/test80 b/tests/data/test80
index dd012fd2a107d3666823090249dda916824b3bf8..893ed85ea815e849ad55102bb4046cfbe7da4acf 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -10,6 +10,17 @@ Funny-head: yesyes
 
 contents
 </data>
+<datacheck>
+HTTP/1.1 200 Mighty fine indeed
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+contents
+</datacheck>
 </reply>
 
 #

diff --git a/tests/data/test82 b/tests/data/test82
index 9fef0fabd599c22507c8d4b6ced335f5ff812f55..1e967f01651549b7e7036458e7d3395fbcf81567 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -9,7 +9,7 @@ Content-Length: 34
 Proxy-Authenticate: NTLM
 \r
 This is not the real page either!
-</data1001>
+</data>
 
 </reply>
 

diff --git a/tests/data/test83 b/tests/data/test83
index cbcd47a3c9ebb5e0af740693af7689c79a47fd7a..64a69fc876f40673d5510d97f72874d2f18e4ffd 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -10,6 +10,17 @@ Funny-head: yesyes
 
 contents
 </data>
+<datacheck>
+HTTP/1.1 200 Mighty fine indeed
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+contents
+</datacheck>
 </reply>
 
 #

diff --git a/tests/data/test95 b/tests/data/test95
index 4af2f70afba175e8acc103cf27d7e213c0cc700a..b83735d65f9343ebc070ea4844663a4ed472386f 100644 (file)
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -10,6 +10,17 @@ Funny-head: yesyes
 
 contents
 </data>
+<datacheck>
+HTTP/1.1 200 Mighty fine indeed
+
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+contents
+</datacheck>
 </reply>
 
 #