aboutsummaryrefslogtreecommitdiff
path: root/lib/http.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-02-04 15:07:02 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-02-08 11:09:40 +0100
commit113f04e664b16b944e64498a73a4dab990fe9a68 (patch)
tree1147a853d194503c7d6eb6c878989029c2a8a40b /lib/http.c
parent7f97fd5a83931ef4b84308d690d54dd83a752433 (diff)
Proxy-Connection: stop sending this header by default
RFC 7230 says we should stop. Firefox already stopped. Bug: https://github.com/curl/curl/issues/633 Reported-By: Brad Fitzpatrick Closes #633
Diffstat (limited to 'lib/http.c')
-rw-r--r--lib/http.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/http.c b/lib/http.c
index 53c6cf889..62952a871 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -2292,7 +2292,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
"%s" /* TE: */
"%s" /* accept-encoding */
"%s" /* referer */
- "%s" /* Proxy-Connection */
"%s",/* transfer-encoding */
ftp_typecode,
@@ -2315,10 +2314,6 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
conn->allocptr.accept_encoding:"",
(data->change.referer && conn->allocptr.ref)?
conn->allocptr.ref:"" /* Referer: <data> */,
- (conn->bits.httpproxy &&
- !conn->bits.tunnel_proxy &&
- !Curl_checkProxyheaders(conn, "Proxy-Connection:"))?
- "Proxy-Connection: Keep-Alive\r\n":"",
te
);