| author | Danek Duvall <danek.duvall@oracle.com> |
| Fri, 01 Apr 2011 09:53:52 -0700 | |
| changeset 196 | 816e398e992c |
| parent 150 | 2e044e9ef7de |
| child 400 | 675bae2e4833 |
| permissions | -rw-r--r-- |
|
150
2e044e9ef7de
7029500 Mercurial doesn't work through https in snv_161
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
1 |
# 7029500 Mercurial doesn't work through https in snv_161 |
|
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
2 |
|
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
3 |
--- mercurial-1.8.2/mercurial/keepalive.py.orig Fri Apr 1 17:41:52 2011 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
4 |
+++ mercurial-1.8.2/mercurial/keepalive.py Fri Apr 1 11:07:32 2011 |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
5 |
@@ -249,6 +249,8 @@ |
|
150
2e044e9ef7de
7029500 Mercurial doesn't work through https in snv_161
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
6 |
else: |
|
2e044e9ef7de
7029500 Mercurial doesn't work through https in snv_161
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
7 |
# no (working) free connections were found. Create a new one. |
|
2e044e9ef7de
7029500 Mercurial doesn't work through https in snv_161
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents:
diff
changeset
|
8 |
h = http_class(host) |
|
196
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
9 |
+ if req._tunnel_host: |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
10 |
+ h._set_tunnel(req._tunnel_host) |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
11 |
if DEBUG: |
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
12 |
DEBUG.info("creating new connection to %s (%d)",
|
|
816e398e992c
6907515 mercurial 1.8.2
Danek Duvall <danek.duvall@oracle.com>
parents:
150
diff
changeset
|
13 |
host, id(h)) |