[tor-commits] [tor/master] Include a Host: header with any HTTP/1.1 proxy request

[nickm at torproject.org]

commit dd3f4f1bdbc06137b36181fd3e958de5b8bc4a4e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 10 12:00:20 2012 -0400

    Include a Host: header with any HTTP/1.1 proxy request
    
    Bugfix on 0.2.2.1-alpha, which added the orginal HTTP proxy
    authentication code.  Fix for bug 5593.
---
 changes/bug5593     |    3 +++
 src/or/connection.c |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/bug5593 b/changes/bug5593
new file mode 100644
index 0000000..358e8de
--- /dev/null
+++ b/changes/bug5593
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - When sending an HTTP/1.1 proxy request, include a Host header.
+      Fixes bug 5593; bugfix on 0.2.2.1-alpha.
diff --git a/src/or/connection.c b/src/or/connection.c
index 36e192a..dc75601 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1465,10 +1465,13 @@ connection_proxy_connect(connection_t *conn, int type)
       }
 
       if (base64_authenticator) {
+        const char *addr = fmt_addr(&conn->addr);
         tor_snprintf(buf, sizeof(buf), "CONNECT %s:%d HTTP/1.1\r\n"
+                     "Host: %s:%d\r\n"
                      "Proxy-Authorization: Basic %s\r\n\r\n",
-                     fmt_addr(&conn->addr),
-                     conn->port, base64_authenticator);
+                     addr, conn->port,
+                     addr, conn->port,
+                     base64_authenticator);
         tor_free(base64_authenticator);
       } else {
         tor_snprintf(buf, sizeof(buf), "CONNECT %s:%d HTTP/1.0\r\n\r\n",