Rev 4806: Merge 2.1.0b4-http-host in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-dev

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-dev

------------------------------------------------------------
revno: 4806 [merge]
revision-id: john at arbash-meinel.com-20091116201345-e5l08x8nfbqlvs37
parent: john at arbash-meinel.com-20091116201253-bdns2kd204ig5kbr
parent: john at arbash-meinel.com-20091111073508-gqtuov3w0za0omu9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-dev
timestamp: Mon 2009-11-16 14:13:45 -0600
message:
  Merge 2.1.0b4-http-host
modified:
  bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
-------------- next part --------------
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py	2009-07-08 15:24:31 +0000
+++ b/bzrlib/tests/http_server.py	2009-11-11 07:23:59 +0000
@@ -462,7 +462,7 @@
                 raise httplib.UnknownProtocol(proto_vers)
             else:
                 self._httpd = self.create_httpd(serv_cls, rhandler)
-            host, self.port = self._httpd.socket.getsockname()
+            self.host, self.port = self._httpd.socket.getsockname()
         return self._httpd
 
     def _http_start(self):

=== modified file 'bzrlib/transport/sftp.py'
--- a/bzrlib/transport/sftp.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/transport/sftp.py	2009-11-11 07:35:08 +0000
@@ -917,7 +917,7 @@
         self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self._socket.bind(('localhost', 0))
         self._socket.listen(1)
-        self.port = self._socket.getsockname()[1]
+        self.host, self.port = self._socket.getsockname()[:2]
         self._stop_event = threading.Event()
 
     def stop(self):
@@ -1045,7 +1045,8 @@
 
     def _get_sftp_url(self, path):
         """Calculate an sftp url to this server for path."""
-        return 'sftp://foo:bar@localhost:%d/%s' % (self._listener.port, path)
+        return 'sftp://foo:bar@%s:%d/%s' % (self._listener.host,
+                                            self._listener.port, path)
 
     def log(self, message):
         """StubServer uses this to log when a new server is created."""