← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/wsgi.py

(vila) Open 2.4.3 for bug fixes (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/wsgi.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""WSGI application for bzr HTTP smart server.
18
18
 
101
101
            backing_transport.  This is used to interpret relpaths received from
102
102
            the client.
103
103
        """
104
 
        # Use a ChrootTransportDecorator so that this web application won't
 
104
        # Use a ChrootServer so that this web application won't
105
105
        # accidentally let people access locations they shouldn't.
106
106
        # e.g. consider a smart server request for "get /etc/passwd" or
107
107
        # something.
108
108
        self.chroot_server = chroot.ChrootServer(backing_transport)
109
 
        self.chroot_server.setUp()
 
109
        self.chroot_server.start_server()
110
110
        self.backing_transport = get_transport(self.chroot_server.get_url())
111
111
        self.root_client_path = root_client_path
112
112
        # While the chroot server can technically be torn down at this point,
114
114
        # protocol dictionary, we don't *just in case* there are parts of
115
115
        # bzrlib that will invoke 'get_transport' on urls rather than cloning
116
116
        # around the existing transport.
117
 
        #self.chroot_server.tearDown()
 
117
        #self.chroot_server.stop_server()
118
118
 
119
119
    def __call__(self, environ, start_response):
120
120
        """WSGI application callable."""
176
176
    def make_request(self, transport, write_func, request_bytes, rcp):
177
177
        protocol_factory, unused_bytes = medium._get_protocol_factory_for_bytes(
178
178
            request_bytes)
179
 
        server_protocol = protocol_factory(transport, write_func, rcp)
 
179
        server_protocol = protocol_factory(
 
180
            transport, write_func, rcp, self.backing_transport)
180
181
        server_protocol.accept_bytes(unused_bytes)
181
182
        return server_protocol