| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Mon, 11 Mar 2013 10:38:09 -0700 | |
| branch | s11-update |
| changeset 2520 | ceec631e74d1 |
| parent 821 | 5450c885c205 |
| child 1637 | 54bd5ac8db85 |
| 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 |
|
|
821
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
3 |
--- mercurial-1.8.2/mercurial/keepalive.py Thu May 3 21:06:28 2012 |
|
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
4 |
+++ mercurial-1.8.2/mercurial/keepalive.py Thu May 3 21:06:28 2012 |
|
5450c885c205
7167655 mercurial 2.2.1
Danek Duvall <danek.duvall@oracle.com>
parents:
400
diff
changeset
|
5 |
@@ -247,6 +251,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)) |