aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-11-24 16:17:55 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-11-24 16:17:55 +0000
commit45614d54c6b49cfa3f6b1296e0f88e48e4d76e55 (patch)
tree5911d435e8f57b041b21a63420a809a643352c4a
parent50e690f2dda2e5e0563ecb5f740f1d7e9a118058 (diff)
allow the end-of-headers from a proxy response to CONNECT end with a CRCR
as well as a CRLF
-rw-r--r--lib/http.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/http.c b/lib/http.c
index 0b36f1eea..d5c8cf604 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -849,9 +849,11 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
if(*ptr=='\n') {
char letter;
/* Newlines are CRLF, so the CR is ignored as the line isn't
- really terminated until the LF comes */
+ really terminated until the LF comes. Treat a following CR
+ as end-of-headers as well.*/
- if('\r' == line_start[0]) {
+ if(('\r' == line_start[0]) ||
+ ('\n' == line_start[0])) {
/* end of response-headers from the proxy */
keepon=FALSE;
break; /* breaks out of for-loop, not switch() */