← 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: Vincent Ladeuil
  • Date: 2011-05-31 10:01:15 UTC
  • mto: (5993.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5994.
  • Revision ID: v.ladeuil+lp@free.fr-20110531100115-bkea029bq5oki70l
Put the '\n' back into the formats and fix tests accordingly (reducing code duplication).

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
109
109
            # To be on the safe side we allow it before any boundary line
110
110
            boundary_line = self._file.readline()
111
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
 
 
119
112
        if boundary_line != '--' + self._boundary + '\r\n':
120
113
            # rfc822.unquote() incorrectly unquotes strings enclosed in <>
121
114
            # IIS 6 and 7 incorrectly wrap boundary strings in <>