diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-11 10:06:49 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-11 10:06:49 -0400 |
| commit | ab338e3bb8220de6c38d2b689f2e9593d256e9c4 (patch) | |
| tree | cdb9e745d2c674fc080edd339b0e7c4436d0c417 | |
| parent | 5465ac5ea3888fb86bd09d81f6f2ab5a8d7c9baf (diff) | |
| parent | 86c4b750da6f25a0fb5291146dd60f151ae5ad7d (diff) | |
| download | tor-ab338e3bb8220de6c38d2b689f2e9593d256e9c4.tar.gz tor-ab338e3bb8220de6c38d2b689f2e9593d256e9c4.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug5593 | 3 | ||||
| -rw-r--r-- | 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 0000000000..358e8de60d --- /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 c9093fe16e..1c034c655b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -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", |