← 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: 2012-01-24 13:14:06 UTC
  • mto: (6445.4.5 nested-trees-spec)
  • mto: This revision was merged to the branch mainline in revision 6518.
  • Revision ID: jelmer@samba.org-20120124131406-wedftkorbpv37bm0
Import nested tree doc from devnotes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/response.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
21
21
responses.
22
22
"""
23
23
 
 
24
from __future__ import absolute_import
24
25
 
25
26
import httplib
26
27
from cStringIO import StringIO
28
29
 
29
30
from bzrlib import (
30
31
    errors,
31
 
    trace,
32
32
    osutils,
33
33
    )
34
34
 
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
 
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 <>