Index: docs/MANUAL
===================================================================
RCS file: /cvsroot/curl/curl/docs/MANUAL,v
retrieving revision 1.41
diff -u -r1.41 MANUAL
--- docs/MANUAL	25 Jan 2009 23:26:30 -0000	1.41
+++ docs/MANUAL	31 Jan 2009 21:58:00 -0000
@@ -141,6 +141,9 @@
 
         curl --noproxy localhost,get.this -x my-proxy:888 http://www.get.this/
 
+ If the proxy is specified with --proxy1.0 instead of --proxy or -x, then
+ curl will use HTTP/1.0 instead of HTTP/1.1 for any CONNECT attempts.
+
  curl also supports SOCKS4 and SOCKS5 proxies with --socks4 and --socks5.
 
  See also the environment variables Curl support that offer further proxy
Index: docs/curl.1
===================================================================
RCS file: /cvsroot/curl/curl/docs/curl.1,v
retrieving revision 1.264
diff -u -r1.264 curl.1
--- docs/curl.1	28 Jan 2009 21:34:15 -0000	1.264
+++ docs/curl.1	31 Jan 2009 21:58:01 -0000
@@ -903,6 +903,13 @@
 .IP "--proxy-ntlm"
 Tells curl to use HTTP NTLM authentication when communicating with the given
 proxy. Use \fI--ntlm\fP for enabling NTLM with a remote host.
+.IP "--proxy1.0 <proxyhost[:port]>"
+Use the specified HTTP 1.0 proxy. If the port number is not specified, it is
+assumed at port 1080.
+
+The only difference between this and the HTTP proxy option (\fI-x/--proxy\fP),
+is that attempts to use CONNECT through the proxy will specify an HTTP 1.0
+protocol instead of the default HTTP 1.1.
 .IP "-p/--proxytunnel"
 When an HTTP proxy is used (\fI-x/--proxy\fP), this option will cause non-HTTP
 protocols to attempt to tunnel through the proxy instead of merely using it to
Index: docs/libcurl/curl_easy_setopt.3
===================================================================
RCS file: /cvsroot/curl/curl/docs/libcurl/curl_easy_setopt.3,v
retrieving revision 1.248
diff -u -r1.248 curl_easy_setopt.3
--- docs/libcurl/curl_easy_setopt.3	28 Jan 2009 21:34:16 -0000	1.248
+++ docs/libcurl/curl_easy_setopt.3	31 Jan 2009 21:58:02 -0000
@@ -470,10 +470,10 @@
 specified in the proxy string \fICURLOPT_PROXY\fP.
 .IP CURLOPT_PROXYTYPE
 Pass a long with this option to set type of the proxy. Available options for
-this are \fICURLPROXY_HTTP\fP, \fICURLPROXY_SOCKS4\fP (added in 7.15.2),
-\fICURLPROXY_SOCKS5\fP, \fICURLPROXY_SOCKS4A\fP (added in 7.18.0) and
-\fICURLPROXY_SOCKS5_HOSTNAME\fP (added in 7.18.0). The HTTP type is
-default. (Added in 7.10)
+this are \fICURLPROXY_HTTP\fP, \fICURLPROXY_HTTP_1_0\fP (added in 7.19.4),
+\fICURLPROXY_SOCKS4\fP (added in 7.15.2), \fICURLPROXY_SOCKS5\fP,
+\fICURLPROXY_SOCKS4A\fP (added in 7.18.0) and \fICURLPROXY_SOCKS5_HOSTNAME\fP
+(added in 7.18.0). The HTTP type is default. (Added in 7.10)
 .IP CURLOPT_NOPROXY
 Pass a pointer to a zero terminated string. The should be a comma- separated
 list of hosts which do not use a proxy, if one is specified.  The only
Index: include/curl/curl.h
===================================================================
RCS file: /cvsroot/curl/curl/include/curl/curl.h,v
retrieving revision 1.374
diff -u -r1.374 curl.h
--- include/curl/curl.h	28 Jan 2009 21:34:16 -0000	1.374
+++ include/curl/curl.h	31 Jan 2009 21:58:02 -0000
@@ -459,7 +459,10 @@
                                           void *userptr);
 
 typedef enum {
-  CURLPROXY_HTTP = 0,   /* added in 7.10 */
+  CURLPROXY_HTTP = 0,   /* added in 7.10, new in 7.19.4 default is to use
+                           CONNECT HTTP/1.1 */
+  CURLPROXY_HTTP_1_0 = 1,   /* added in 7.19.4, force to use CONNECT
+                               HTTP/1.0  */
   CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already
                            in 7.10 */
   CURLPROXY_SOCKS5 = 5, /* added in 7.10 */
Index: lib/ftp.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/ftp.c,v
retrieving revision 1.497
diff -u -r1.497 ftp.c
--- lib/ftp.c	30 Jan 2009 19:29:25 -0000	1.497
+++ lib/ftp.c	31 Jan 2009 21:58:04 -0000
@@ -1894,6 +1894,7 @@
     break;
 #endif /* CURL_DISABLE_PROXY */
   case CURLPROXY_HTTP:
+  case CURLPROXY_HTTP_1_0:
     /* do nothing here. handled later. */
     break;
   default:
Index: lib/http.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/http.c,v
retrieving revision 1.410
diff -u -r1.410 http.c
--- lib/http.c	21 Jan 2009 04:42:47 -0000	1.410
+++ lib/http.c	31 Jan 2009 21:58:05 -0000
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, 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
@@ -1343,6 +1343,8 @@
         char *host=(char *)"";
         const char *proxyconn="";
         const char *useragent="";
+        const char *http = (conn->proxytype == CURLPROXY_HTTP_1_0) ?
+          "1.0" : "1.1";
 
         if(!checkheaders(data, "Host:")) {
           host = aprintf("Host: %s\r\n", host_port);
@@ -1363,12 +1365,12 @@
         /* BLOCKING */
         result =
           add_bufferf(req_buffer,
-                      "CONNECT %s:%d HTTP/1.0\r\n"
+                      "CONNECT %s:%d HTTP/%s\r\n"
                       "%s"  /* Host: */
                       "%s"  /* Proxy-Authorization */
                       "%s"  /* User-Agent */
                       "%s", /* Proxy-Connection */
-                      hostname, remote_port,
+                      hostname, remote_port, http,
                       host,
                       conn->allocptr.proxyuserpwd?
                       conn->allocptr.proxyuserpwd:"",
Index: lib/url.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/url.c,v
retrieving revision 1.784
diff -u -r1.784 url.c
--- lib/url.c	28 Jan 2009 21:34:16 -0000	1.784
+++ lib/url.c	31 Jan 2009 21:58:06 -0000
@@ -1453,7 +1453,7 @@
 
   case CURLOPT_PROXYTYPE:
     /*
-     * Set proxy type. HTTP/SOCKS4/SOCKS4a/SOCKS5/SOCKS5_HOSTNAME
+     * Set proxy type. HTTP/HTTP_1_0/SOCKS4/SOCKS4a/SOCKS5/SOCKS5_HOSTNAME
      */
     data->set.proxytype = (curl_proxytype)va_arg(param, long);
     break;
@@ -2857,6 +2857,7 @@
       break;
 #endif /* CURL_DISABLE_PROXY */
     case CURLPROXY_HTTP:
+    case CURLPROXY_HTTP_1_0:
       /* do nothing here. handled later. */
       break;
     default:
@@ -4214,9 +4215,11 @@
 
   conn->bits.proxy = (bool)(data->set.str[STRING_PROXY] &&
                             *data->set.str[STRING_PROXY]);
-  conn->bits.httpproxy = (bool)(conn->bits.proxy
-                                && (conn->proxytype == CURLPROXY_HTTP));
-  conn->bits.proxy_user_passwd = (bool)(NULL != data->set.str[STRING_PROXYUSERNAME]);
+  conn->bits.httpproxy = (bool)(conn->bits.proxy &&
+                                (conn->proxytype == CURLPROXY_HTTP ||
+                                 conn->proxytype == CURLPROXY_HTTP_1_0));
+  conn->bits.proxy_user_passwd =
+    (bool)(NULL != data->set.str[STRING_PROXYUSERNAME]);
   conn->bits.tunnel_proxy = data->set.tunnel_thru_httpproxy;
 
 #endif /* CURL_DISABLE_PROXY */
@@ -4315,7 +4318,8 @@
   if(proxy && *proxy) {
     long bits = conn->protocol & (PROT_HTTPS|PROT_SSL|PROT_MISSING);
 
-    if(conn->proxytype == CURLPROXY_HTTP) {
+    if((conn->proxytype == CURLPROXY_HTTP) ||
+       (conn->proxytype == CURLPROXY_HTTP_1_0)) {
       /* force this connection's protocol to become HTTP */
       conn->protocol = PROT_HTTP | bits;
       conn->bits.httpproxy = TRUE;
Index: src/main.c
===================================================================
RCS file: /cvsroot/curl/curl/src/main.c,v
retrieving revision 1.504
diff -u -r1.504 main.c
--- src/main.c	28 Jan 2009 21:34:17 -0000	1.504
+++ src/main.c	31 Jan 2009 21:58:08 -0000
@@ -448,6 +448,7 @@
   char *userpwd;
   char *proxyuserpwd;
   char *proxy;
+  int proxyver;     /* set to CURLPROXY_HTTP* define */
   char *noproxy;
   bool proxytunnel;
   bool ftp_append;         /* APPE on ftp */
@@ -791,6 +792,7 @@
     "    --proxy-negotiate Use Negotiate authentication on the proxy (H)",
     "    --proxy-ntlm    Use NTLM authentication on the proxy (H)",
     " -U/--proxy-user <user[:password]> Set proxy user and password",
+    "    --proxy1.0 <host[:port]> Use HTTP/1.0 proxy on given port",
     " -p/--proxytunnel   Operate through a HTTP proxy tunnel (using CONNECT)",
     "    --pubkey <key>  Public key file name (SSH)",
     " -Q/--quote <cmd>   Send command(s) to server before file transfer (F/SFTP)",
@@ -1681,6 +1683,7 @@
     {"$6", "socks5-gssapi-service",  TRUE},
     {"$7", "socks5-gssapi-nec",  FALSE},
 #endif
+    {"$8", "proxy1.0",   TRUE},
 
     {"0", "http1.0",     FALSE},
     {"1", "tlsv1",       FALSE},
@@ -2202,6 +2205,11 @@
         config->socks5_gssapi_nec = TRUE;
         break;
 #endif
+      case '8': /* --proxy1.0 */
+        /* http 1.0 proxy */
+        GetStr(&config->proxy, nextarg);
+        config->proxyver = CURLPROXY_HTTP_1_0;
+        break;
       }
       break;
     case '#': /* --progress-bar */
@@ -2887,6 +2895,7 @@
     case 'x':
       /* proxy */
       GetStr(&config->proxy, nextarg);
+      config->proxyver = CURLPROXY_HTTP;
       break;
     case 'X':
       /* set custom request */
@@ -4567,6 +4576,8 @@
         my_setopt(curl, CURLOPT_INFILESIZE_LARGE, uploadfilesize);
         my_setopt(curl, CURLOPT_URL, url);     /* what to fetch */
         my_setopt(curl, CURLOPT_PROXY, config->proxy); /* proxy to use */
+        if(config->proxy)
+          my_setopt(curl, CURLOPT_PROXYTYPE, config->proxyver);
         my_setopt(curl, CURLOPT_NOPROGRESS, config->noprogress);
         if(config->no_body) {
           my_setopt(curl, CURLOPT_NOBODY, 1);
Index: tests/data/test1008
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test1008,v
retrieving revision 1.3
diff -u -r1.3 test1008
--- tests/data/test1008	11 Aug 2008 23:16:48 -0000	1.3
+++ tests/data/test1008	31 Jan 2009 21:58:08 -0000
@@ -102,12 +102,12 @@
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-CONNECT test.remote.server.com:1008 HTTP/1.0

+CONNECT test.remote.server.com:1008 HTTP/1.1

 Host: test.remote.server.com:1008

 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:1008 HTTP/1.0

+CONNECT test.remote.server.com:1008 HTTP/1.1

 Host: test.remote.server.com:1008

 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive

Index: tests/data/test1021
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test1021,v
retrieving revision 1.3
diff -u -r1.3 test1021
--- tests/data/test1021	11 Aug 2008 23:16:49 -0000	1.3
+++ tests/data/test1021	31 Jan 2009 21:58:08 -0000
@@ -111,16 +111,16 @@
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-CONNECT test.remote.server.com:1021 HTTP/1.0

+CONNECT test.remote.server.com:1021 HTTP/1.1

 Host: test.remote.server.com:1021

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:1021 HTTP/1.0

+CONNECT test.remote.server.com:1021 HTTP/1.1

 Host: test.remote.server.com:1021

 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:1021 HTTP/1.0

+CONNECT test.remote.server.com:1021 HTTP/1.1

 Host: test.remote.server.com:1021

 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive

Index: tests/data/test1059
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test1059,v
retrieving revision 1.2
diff -u -r1.2 test1059
--- tests/data/test1059	8 Aug 2008 07:51:50 -0000	1.2
+++ tests/data/test1059	31 Jan 2009 21:58:08 -0000
@@ -49,7 +49,7 @@
 ^User-Agent:.*
 </strip>
 <protocol>
-CONNECT test-number:1059 HTTP/1.0

+CONNECT test-number:1059 HTTP/1.1

 Host: test-number:1059

 Proxy-Connection: Keep-Alive

 

Index: tests/data/test1060
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test1060,v
retrieving revision 1.1
diff -u -r1.1 test1060
--- tests/data/test1060	12 Aug 2008 20:07:52 -0000	1.1
+++ tests/data/test1060	31 Jan 2009 21:58:08 -0000
@@ -884,11 +884,11 @@
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:1060 HTTP/1.0

+CONNECT test.remote.server.com:1060 HTTP/1.1

 Host: test.remote.server.com:1060

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:1060 HTTP/1.0

+CONNECT test.remote.server.com:1060 HTTP/1.1

 Host: test.remote.server.com:1060

 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.server.com:1060", response="b527d164630481e2cc48c04d18ed2212"

 Proxy-Connection: Keep-Alive

Index: tests/data/test1061
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test1061,v
retrieving revision 1.1
diff -u -r1.1 test1061
--- tests/data/test1061	12 Aug 2008 20:07:52 -0000	1.1
+++ tests/data/test1061	31 Jan 2009 21:58:09 -0000
@@ -889,11 +889,11 @@
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:1061 HTTP/1.0

+CONNECT test.remote.server.com:1061 HTTP/1.1

 Host: test.remote.server.com:1061

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:1061 HTTP/1.0

+CONNECT test.remote.server.com:1061 HTTP/1.1

 Host: test.remote.server.com:1061

 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.server.com:1061", response="244a8caab5f343a1a20d2425e4d6e951"

 Proxy-Connection: Keep-Alive

Index: tests/data/test1078
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test1078,v
retrieving revision 1.3
diff -u -r1.3 test1078
--- tests/data/test1078	7 Jan 2009 21:57:26 -0000	1.3
+++ tests/data/test1078	31 Jan 2009 21:58:09 -0000
@@ -33,10 +33,10 @@
 http
 </server>
  <name>
-HTTP CONNECT with proxytunnel and downgrade to HTTP/1.0
+HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
  </name>
  <command>
--x %HOSTIP:%HTTPPORT -p http://%HOSTIP:%HTTPPORT/we/want/that/page/1078 http://%HOSTIP:%HTTPPORT/we/want/that/page/1078
+--proxy1.0 %HOSTIP:%HTTPPORT -p http://%HOSTIP:%HTTPPORT/we/want/that/page/1078 http://%HOSTIP:%HTTPPORT/we/want/that/page/1078
 </command>
 </client>
 
Index: tests/data/test206
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test206,v
retrieving revision 1.8
diff -u -r1.8 test206
--- tests/data/test206	11 Aug 2008 23:16:49 -0000	1.8
+++ tests/data/test206	31 Jan 2009 21:58:09 -0000
@@ -81,11 +81,11 @@
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:206 HTTP/1.0

+CONNECT test.remote.server.com:206 HTTP/1.1

 Host: test.remote.server.com:206

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:206 HTTP/1.0

+CONNECT test.remote.server.com:206 HTTP/1.1

 Host: test.remote.server.com:206

 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.server.com:206", response="5059a96c954981ceb94e17d667c8d3f8"

 Proxy-Connection: Keep-Alive

Index: tests/data/test209
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test209,v
retrieving revision 1.11
diff -u -r1.11 test209
--- tests/data/test209	11 Aug 2008 23:16:50 -0000	1.11
+++ tests/data/test209	31 Jan 2009 21:58:09 -0000
@@ -95,12 +95,12 @@
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-CONNECT test.remote.server.com:209 HTTP/1.0

+CONNECT test.remote.server.com:209 HTTP/1.1

 Host: test.remote.server.com:209

 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:209 HTTP/1.0

+CONNECT test.remote.server.com:209 HTTP/1.1

 Host: test.remote.server.com:209

 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive

Index: tests/data/test213
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test213,v
retrieving revision 1.10
diff -u -r1.10 test213
--- tests/data/test213	11 Aug 2008 23:16:51 -0000	1.10
+++ tests/data/test213	31 Jan 2009 21:58:09 -0000
@@ -77,10 +77,10 @@
 NTLM
 </features>
  <name>
-HTTP proxy CONNECT auth NTLM and then POST
+HTTP 1.0 proxy CONNECT auth NTLM and then POST
  </name>
  <command>
-http://test.remote.server.com:213/path/2130002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.server.com:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
 </command>
 </client>
 
Index: tests/data/test217
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test217,v
retrieving revision 1.7
diff -u -r1.7 test217
--- tests/data/test217	7 Jan 2009 21:57:27 -0000	1.7
+++ tests/data/test217	31 Jan 2009 21:58:09 -0000
@@ -42,7 +42,7 @@
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:217 HTTP/1.0

+CONNECT test.remote.server.com:217 HTTP/1.1

 Host: test.remote.server.com:217

 Proxy-Connection: Keep-Alive

 

Index: tests/data/test265
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test265,v
retrieving revision 1.7
diff -u -r1.7 test265
--- tests/data/test265	11 Aug 2008 23:16:51 -0000	1.7
+++ tests/data/test265	31 Jan 2009 21:58:09 -0000
@@ -98,12 +98,12 @@
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol nonewline="yes">
-CONNECT test.remote.server.com:265 HTTP/1.0

+CONNECT test.remote.server.com:265 HTTP/1.1

 Host: test.remote.server.com:265

 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

 Proxy-Connection: Keep-Alive

 

-CONNECT test.remote.server.com:265 HTTP/1.0

+CONNECT test.remote.server.com:265 HTTP/1.1

 Host: test.remote.server.com:265

 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive

Index: tests/data/test275
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test275,v
retrieving revision 1.3
diff -u -r1.3 test275
--- tests/data/test275	29 Sep 2008 22:44:04 -0000	1.3
+++ tests/data/test275	31 Jan 2009 21:58:09 -0000
@@ -57,7 +57,7 @@
 ^User-Agent:.*
 </strip>
 <protocol>
-CONNECT remotesite.com:80 HTTP/1.0

+CONNECT remotesite.com:80 HTTP/1.1

 Host: remotesite.com:80

 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm

 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3

Index: tests/data/test287
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test287,v
retrieving revision 1.3
diff -u -r1.3 test287
--- tests/data/test287	7 Jan 2009 21:57:27 -0000	1.3
+++ tests/data/test287	31 Jan 2009 21:58:09 -0000
@@ -36,7 +36,7 @@
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.server.com:287 HTTP/1.0

+CONNECT test.remote.server.com:287 HTTP/1.1

 Host: test.remote.server.com:287

 Proxy-Connection: Keep-Alive

 User-Agent: looser/2007

Index: tests/data/test503
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test503,v
retrieving revision 1.18
diff -u -r1.18 test503
--- tests/data/test503	11 Aug 2008 23:16:52 -0000	1.18
+++ tests/data/test503	31 Jan 2009 21:58:09 -0000
@@ -61,7 +61,7 @@
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT %HOSTIP:%HTTPSPORT HTTP/1.0

+CONNECT %HOSTIP:%HTTPSPORT HTTP/1.1

 Host: %HOSTIP:%HTTPSPORT

 Proxy-Authorization: Basic dGVzdDppbmc=

 Proxy-Connection: Keep-Alive

Index: tests/data/test80
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test80,v
retrieving revision 1.14
diff -u -r1.14 test80
--- tests/data/test80	29 Sep 2008 22:44:04 -0000	1.14
+++ tests/data/test80	31 Jan 2009 21:58:10 -0000
@@ -45,10 +45,10 @@
 http
 </server>
  <name>
-HTTP CONNECT with proxytunnel and host Basic authentication
+HTTP 1.0 CONNECT with proxytunnel and host Basic authentication
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself
+http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p --proxy1.0 %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself
 </command>
 </client>
 
Index: tests/data/test83
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test83,v
retrieving revision 1.11
diff -u -r1.11 test83
--- tests/data/test83	14 Sep 2007 19:32:32 -0000	1.11
+++ tests/data/test83	31 Jan 2009 21:58:10 -0000
@@ -56,7 +56,7 @@
 ^User-Agent:.*
 </strip>
 <protocol>
-CONNECT %HOSTIP:%HTTPPORT HTTP/1.0

+CONNECT %HOSTIP:%HTTPPORT HTTP/1.1

 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3

 Host: %HOSTIP:%HTTPPORT

 Proxy-Connection: Keep-Alive

Index: tests/data/test94
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test94,v
retrieving revision 1.8
diff -u -r1.8 test94
--- tests/data/test94	7 Jan 2009 21:57:27 -0000	1.8
+++ tests/data/test94	31 Jan 2009 21:58:10 -0000
@@ -31,10 +31,10 @@
 SSL
 </features>
  <name>
-HTTPS GET with failed proxy auth
+HTTPS GET with failed proxy auth (CONNECT 1.0)
  </name>
  <command>
-https://test.anything.really.com:94 -x %HOSTIP:%HTTPPORT
+https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
 </command>
 </client>
 
Index: tests/data/test95
===================================================================
RCS file: /cvsroot/curl/curl/tests/data/test95,v
retrieving revision 1.12
diff -u -r1.12 test95
--- tests/data/test95	11 Aug 2008 23:16:53 -0000	1.12
+++ tests/data/test95	31 Jan 2009 21:58:10 -0000
@@ -56,7 +56,7 @@
 ^User-Agent:.*
 </strip>
 <protocol nonewline="yes">
-CONNECT %HOSTIP:%HTTPPORT HTTP/1.0

+CONNECT %HOSTIP:%HTTPPORT HTTP/1.1

 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3

 Host: %HOSTIP:%HTTPPORT

 Proxy-Connection: Keep-Alive