Description: Use localhost rather than 127.0.0.1, as the latter trips up pycurl.
Bug-Debian: https://bugs.debian.org/868966
Bug: https://bugs.launchpad.net/bzr/+bug/1707499
Author: Jelmer Vernooĳ <jelmer@debian.org>

=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py
+++ b/bzrlib/tests/http_server.py
@@ -478,7 +478,8 @@
 
         super(HttpServer, self).start_server()
+        self.host = 'localhost'
         self._http_base_url = '%s://%s:%s/' % (
             self._url_protocol, self.host, self.port)
 
     def get_url(self):
         """See bzrlib.transport.Server.get_url."""
--- a/bzrlib/tests/ssl_certs/create_ssls.py
+++ b/bzrlib/tests/ssl_certs/create_ssls.py
@@ -112,7 +112,7 @@
     server_locality='LocalHost',
     server_organization='Testing Ltd',
     server_section='https server',
-    server_name='127.0.0.1',  # Always accessed under that name
+    server_name='localhost',  # Always accessed under that name
     server_email='https_server@localhost',
     server_optional_company_name='',
 )
--- a/bzrlib/tests/ssl_certs/server.crt
+++ b/bzrlib/tests/ssl_certs/server.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFpDCCA4wCAQEwDQYJKoZIhvcNAQEFBQAwgZMxCzAJBgNVBAYTAkJaMREwDwYD
+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
-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
+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
-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
-tW5I+uMneHg=
+AAOCAg8AMIICCgKCAgEA3FGQLpuEkfLTVePtymNQeR0lQF4iX+CaKCPaJuzJFD5F
+u9CP5eIu1UzFGecg4jqc5wvqvejtMVDtDqBxfA4Gj3304T+uG0d2WnO2R2Djj6Yl
+2c67hdaFT4h0NYXdX3vYo3wnYWq5OOJ7gYsjK+ML+lJiYfaKU+/zggZEz69Omxzk
+zenJ+jRgF/tfW9Iy7dD6h/2/1R+kZfondXxIRqKN4Bm/Z1q6hZj/MVnP+TeYPXbF
+NHg1JwQeHoP05ArH3f4/5K9GzanRiRTssSfE2eZdTzXgrQqZtA4LGN8vhgZJ3Q+w
+8Sa4VZwHKlEKah2SCF/QvhN3fy718uAXbOfVZP0/Mpk2afHJpdsJ5VundEWVtdmV
+GJ4NUsLn3U/1id5VD52pfttIxCLdhF4oObWMilaS3jb9rMRp+TcTeqewJXTUc8cX
+HcR+ZXsFPxEBKpjJGfpCD4n+5OVQbUp74JzrHNbLWVkbtcMqu38+3hllhttX2RHh
+drQRdKnSLGvf4ANvZTQ0aGBhmoBvfRuRWvTYaEoSe1Z6B2HoiPYTT+3CHw4DZgrO
+wG/NhxpQ2M+rXROThxHcS+M5XPVvporlDOpWbhwUllDKLILXA8OeHofrSJMMOtF9
+kkw1QXE0KIEcB2XHwaqQqJ+0Jy4ASHHjPiFddMBcof6gQocRkHtq/bGd4YbpDmUC
+AwEAATANBgkqhkiG9w0BAQsFAAOCAgEAGB5xsGtYiQw0iMSkIzL2rMIUhOHz2+L6
+nb7OXtV2wAtdiNIze0G5ycz5/HLoR5CYzoNEWr8PN3YHkXZ3U8NG4cW7cxzPlCnH
++6F53RpESLjX7iB3biVCkYPECgcthVlLnd5uf0yzdf0t4hpbvXuHMOusytZl9zJY
+dHSFQ0szbQ5dXQUQ+J74faY7bWLwh3E2bA8tj32+60tsa9EdJdk5e+KyDqXjsGrw
+IsvfHVfpwWouoEQIbUiW2EQ1WlJpWVNwr6snFEFQQKdXvo/JXewmQpv/HUN9XppT
+m4LI6DH4C4Z/HDrxhAZ/T4mYqamQxKClS8fdpsSvfLmTqMcnDEtl41BS0dFIJ8Uh
+HQsgOUrOL/yTuTWuWYi8V1b2ctup21Y2l4pTFWTpVAEck9ehINJqHiYP+VUTwlHl
+TI5UAxK3ViZeiIJ5fzmF9tL9Q2SRnXv9lt35QCu865Ssw8bRrMMM6nADpHOmuBBO
+4vdnuz687xEtyC/D9khuf17XKkvHRRQ91FN9GOaL8MC46eM5ZLd6FFhqUQ0asrD9
+l4UVplp+/fNUQDL4uIdMM0Js+BLg2vz+PNVC4NpaR8vLHx5elkXpfVzSDUgTT16m
+gzc8v/B4fL+Ry6biQ4N+z7KSCRJjbBlweH2LR/iJqA305cX0gA28NgJi20tFxTlM
+WyALMn4HND8=
 -----END CERTIFICATE-----
--- a/bzrlib/tests/ssl_certs/server.csr
+++ b/bzrlib/tests/ssl_certs/server.csr
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE REQUEST-----
-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
+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
-ADCCAgoCggIBAKtrsG0+mbP4AucrSogGX1xjVTEMhi7nrYFK30E2zi/v6eLCve4Y
-VpP6myUUFcvKkOaOCSpk8AJn/3sRsYfeBN3mnAvRBCHSNwNCNnW56PagLswV12nI
-6nCk/z3MyDfVNf/ktHubzrLArb1RVs3Wxu704N0obOQRvMtVHvAg1LXMwfIBo20F
-pLoMwKivCKIHjCpAhpolhc0bmx8C/Rx+bWJtcORByc8f2r3qTskyigUKRQNLM2tC
-GMBCLkRDFnDeuGD6rPzpCxZhgn6TAmbzprJsBk8X/jKAzYqgXKOu8QbminuKUlH9
-X9T624B6RCauvELgrEYFhWIoNI0ZIdOqMeW3slfZ/20P2wO1utCU/zVKPbjbRYAt
-rotshwOXN6M1vjLpO7UuNq/UnXt4Fv/NXPpGW1UvOxDONl0BTD9bLQEfFlzMM5VZ
-4620PxEcLfjqBmzrfcKB3hCqYvXIZhbQ0eYq2N7iaD/f/vQ+dYJcURkKpZKTXPxS
-+FWG5gmWPEAnhFx2sZdTHrmQiOqLxh6I6VLxTUCvu6hToWytBvJnu6Ppcj/6gm40
-076Jvyr4PZBbQL8Ls+hK1mCodMWUMTYRZd7hrccnALYtPuTupf5S1EML/J+/SFms
-Fg08uLPJGH1gYh/DTUAS4m+rZZZc7ey17XDyY05GdX4p0+WBasHkAokfAgMBAAGg
-JTAjBgkqhkiG9w0BCQcxFhMUQ2hhbGxlbmdlIGZvciB0aGUgQ0EwDQYJKoZIhvcN
-AQEFBQADggIBAGeE6ml7EshJvPvOv+I8DrcjzHiAO4+0w/weknWfS/ndAafkLBa7
-5TMFhnBFHQ9/XbvctyNCc5u5OQfRxQwJccV4OUiTPPXqN4UWWSzxIw8zVM/8MdiH
-yaVFYqr2gyAKlcCvKavWNKMXVdeoOFnAwA7rfgtA2mMNM0ZoSJr/PISkzN6ZFyh2
-VSCrVdBZ1pTMslIKqWkRgqeqlrRhEVXZIljrG5+vVVnzfxycPjeN3VD5US8Pr9B0
-im6sbDTn2z5pRTkVWc/cL1F7spxsa67KVqwwHx9GNojo7SY/NNeWQTaTe3uVa/Hp
-VXRAcutovboGVcMhu92Udz+bpn2XpbNZnWJGRkRZRLWG2Z+k/REGhMk+5LuMh/+N
-uumIThiNtCPeg3/esVxlAqDokteqnoE0XHtcBUTacvedgmxASV98Wu+Rx7MnVgTf
-29wGb132ZSRMEzoB0hSm9tjB2DVI/O1+YOcPDhoLHpfkUE+qXQTWPKCvrZCspJp9
-UYkWVTfbRJavXOOi8tRHvt0AfxEnyq3o1H7veqDxL0NMuXvNAL2fEt0Av1zfyHyS
-Ch+NpByF9m2BMG0TUrrMhtb83X+Rb7VOC6sbs8H+ste9DOwh2930T1eFsb0/32R8
-ix0EMI5Yi60RLcL9WOjdQ1JAMeO6+dywL8WpjyAyUegeMxwlzZCMRSvv
+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
 -----END CERTIFICATE REQUEST-----
--- a/bzrlib/tests/ssl_certs/server_with_pass.key
+++ b/bzrlib/tests/ssl_certs/server_with_pass.key
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,60937C843264DF9B
+DEK-Info: DES-EDE3-CBC,15B6F0DACF831BB5
 
-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
+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
 -----END RSA PRIVATE KEY-----
--- a/bzrlib/tests/ssl_certs/server_without_pass.key
+++ b/bzrlib/tests/ssl_certs/server_without_pass.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
