diff --git a/CHANGES b/CHANGES index f65227c67d3a3fdf2cf65599fdd5fee7fa6a5d6f..834adc97de2c1da3aa7fa0d998cdbff3e10ee779 100644 --- a/CHANGES +++ b/CHANGES @@ -7,6 +7,12 @@ Changelog Daniel S (2 May 2007) +- Anders Gustafsson remarked that requiring CURLOPT_HTTP_VERSION set to 1.0 + when CURLOPT_HTTP200ALIASES is used to avoid the problem mentioned below is + not very nice if the client wants to be able to use _either_ a HTTP 1.1 + server or one within the aliases list... so starting now, libcurl will + simply consider 200-alias matches the to be HTTP 1.0 compliant. + - Tobias Rundström reported a problem they experienced with xmms2 and recent libcurls, which turned out to be the 25-nov-2006 change which treats HTTP responses without Content-Length or chunked encoding as without bodies. We diff --git a/RELEASE-NOTES b/RELEASE-NOTES index f349796d086f4a571fcb1fbfd1f61b961db941e0..866fe9e4c384866b9447ede9fc7379213b4097af 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -14,6 +14,7 @@ This release includes the following changes: o added curl_multi_socket_action() o deprecated curl_multi_socket() o uses less memory in non-pipelined use cases + o CURLOPT_HTTP200ALIASES matched transfers assume HTTP 1.0 compliance This release includes the following bugfixes: @@ -59,6 +60,7 @@ advice from friends like these: Song Ma, Dan Fandrich, Yang Tse, Jay Austin, Robert Iakobashvil, James Housley, Daniel Black, Steve Little, Sonia Subramanian, Peter O'Gorman, - Frank Hempel, Michael Wallner, Jeff Pohlmeyer, Tobias Rundström + Frank Hempel, Michael Wallner, Jeff Pohlmeyer, Tobias Rundström, + Anders Gustafsson Thanks! (and sorry if I forgot to mention someone) diff --git a/lib/transfer.c b/lib/transfer.c index d9e37b01b2e92b95371511f85c44506edd86733b..10a3f87dcc01bd3b65baa64058ca2a4148ed9932 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -766,8 +766,7 @@ CURLcode Curl_readwrite(struct connectdata *conn, if (checkhttpprefix(data, k->p)) { nc = 1; k->httpcode = 200; - k->httpversion = - (data->set.httpversion==CURL_HTTP_VERSION_1_0)? 10 : 11; + k->httpversion = 10; } } }