aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/http.c3
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index c95b515d5..1cdc0d7c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
Changelog
+Daniel S (15 Feb 2008)
+- Pooyan McSporran found and fixed a flaw where you first would do a normal
+ http request and then you'd reuse the handle and replace the Accept: header,
+ as then libcurl would send two Accept: headers!
+
Daniel S (11 Feb 2008)
- Yang Tse pointed out a few remaining quirks from my timeout refactoring from
Feb 7 that didn't abort properly on timeouts. These are actually old
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 286cc17d7..b37d4818f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,7 @@ This release includes the following bugfixes:
o improved strdup replacement
o GnuTLS-built libcurl failed when doing global cleanup and reinit
o error message problem when unable to resolve a host on Windows
+ o Accept: header replacing
This release includes the following known bugs:
@@ -36,6 +37,6 @@ This release would not have looked like this without help, code, reports and
advice from friends like these:
Michal Marek, Dmitry Kurochkin, Niklas Angebrand, Günter Knauf, Yang Tse,
- Dan Fandrich, Mike Hommey
+ Dan Fandrich, Mike Hommey, Pooyan McSporran
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/http.c b/lib/http.c
index 4d42635e2..08c2ea88f 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -2182,8 +2182,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
(conn->bits.httpproxy && !conn->bits.tunnel_proxy) )?
"Pragma: no-cache\r\n":NULL;
- if(!checkheaders(data, "Accept:"))
- http->p_accept = "Accept: */*\r\n";
+ http->p_accept = checkheaders(data, "Accept:")?NULL:"Accept: */*\r\n";
if(( (HTTPREQ_POST == httpreq) ||
(HTTPREQ_POST_FORM == httpreq) ||