Merge branch 'maint-0.2.2' into release-0.2.2
This commit is contained in:
commit
1614e00a21
|
@ -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.
|
|
@ -0,0 +1,3 @@
|
|||
o Minor features:
|
||||
- Update to the April 3 2012 Maxmind GeoLite Country database.
|
||||
|
9553
src/config/geoip
9553
src/config/geoip
File diff suppressed because it is too large
Load Diff
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue