diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-11 10:04:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-11 10:04:31 -0400 |
| commit | 86c4b750da6f25a0fb5291146dd60f151ae5ad7d (patch) | |
| tree | 46eaa4423128639caa90d65ae5b3260dcee2e50f | |
| parent | b395b59353ea4b1b3221e220b47420b93aadcd0b (diff) | |
| parent | dd3f4f1bdbc06137b36181fd3e958de5b8bc4a4e (diff) | |
| download | tor-86c4b750da6f25a0fb5291146dd60f151ae5ad7d.tar.gz tor-86c4b750da6f25a0fb5291146dd60f151ae5ad7d.zip | |
Merge branch 'bug5593' into 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 36e192a767..dc75601ab4 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", |