← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-04-09 19:25:42 UTC
  • mto: (5777.5.1 inventoryworkingtree)
  • mto: This revision was merged to the branch mainline in revision 5781.
  • Revision ID: jelmer@samba.org-20110409192542-8bbedp36s7nj928e
Split InventoryTree out of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/response.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 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
28
28
 
29
29
from bzrlib import (
30
30
    errors,
 
31
    trace,
31
32
    osutils,
32
33
    )
33
34
 
108
109
            # To be on the safe side we allow it before any boundary line
109
110
            boundary_line = self._file.readline()
110
111
 
111
 
        if boundary_line == '':
112
 
            # A timeout in the proxy server caused the response to end early.
113
 
            # See launchpad bug 198646.
114
 
            raise errors.HttpBoundaryMissing(
115
 
                self._path,
116
 
                self._boundary)
117
 
 
118
112
        if boundary_line != '--' + self._boundary + '\r\n':
119
113
            # rfc822.unquote() incorrectly unquotes strings enclosed in <>
120
114
            # IIS 6 and 7 incorrectly wrap boundary strings in <>