Commit ab338e3b authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'origin/maint-0.2.2'

parents 5465ac5e 86c4b750

changes/bug5593

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/or/connection.c

+5 −2
Original line number Diff line number Diff line
@@ -1484,10 +1484,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",