~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-01 08:36:29 UTC
mfrom: (6015.11.1 integration-2.4)
mto: (6046.1.1 integration) (6015.14.1 bzr24-filter-809901) (6060.2.1 trunk) (6069.1.1 trunk) (6082.5.1 expand-in-stack) (6089.1.1 trunk) (6090.1.1 trunk) (6092.1.1 810701-lang-not-set) (6093.1.1 trunk) (6104.1.1 2.5-get_cached_parent_map-388269) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev) (6206.1.1 2.5-client-reconnect-819604)
mto: This revision was merged to the branch mainline in revision 6047.
Revision ID: pqm@pqm.ubuntu.com-20110801083629-01vbiolx4vyww001

(mbp) merge up fix for bug 198646 from bzr.2.3

added added

removed removed

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

109

# To be on the safe side we allow it before any boundary line

110

boundary_line = self._file.readline()

111

112

if boundary_line == '':

113

# A timeout in the proxy server caused the response to end early.

114

# See launchpad bug 198646.

115

raise errors.HttpBoundaryMissing(

116

self._path,

117

self._boundary)

118

112

119

if boundary_line != '--' + self._boundary + '\r\n':

113

120

# rfc822.unquote() incorrectly unquotes strings enclosed in <>

114

121

# IIS 6 and 7 incorrectly wrap boundary strings in <>