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.

3 files changed, 10 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index f65227c67..834adc97d 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 f349796d0..866fe9e4c 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 d9e37b01b..10a3f87dc 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;
                   }
                 }
               }