← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
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
import errno
18
18
import httplib
137
137
            # common)
138
138
            self.send_response(301)
139
139
            self.send_header("Location", self.path + "/")
140
 
            # Indicates that the body is empty for HTTP/1.1 clients 
 
140
            # Indicates that the body is empty for HTTP/1.1 clients
141
141
            self.send_header('Content-Length', '0')
142
142
            self.end_headers()
143
143
            return None
320
320
 
321
321
    def tearDown(self):
322
322
         """Called to clean-up the server.
323
 
 
 
323
 
324
324
         Since the server may be (surely is, even) in a blocking listen, we
325
325
         shutdown its socket before closing it.
326
326
         """
503
503
 
504
504
    def setUp(self, backing_transport_server=None):
505
505
        """See bzrlib.transport.Server.setUp.
506
 
        
 
506
 
507
507
        :param backing_transport_server: The transport that requests over this
508
508
            protocol should be forwarded to. Note that this is currently not
509
509
            supported for HTTP.