← Back to branch summary

~ubuntu-branches/ubuntu/saucy/golang/saucy

« back to all changes in this revision

Viewing changes to src/pkg/net/http/transport.go

  • Committer: Package Import Robot
  • Author(s): Michael Stapelberg
  • Date: 2012-08-02 14:25:58 UTC
  • Revision ID: package-import@ubuntu.com-20120802142558-mh6g6tubguhdx40q
Tags: 2:1.0.2-2
http://bugs.debian.org/683421
* Add myself to uploaders, as discussed in #683421.
* cherry-pick r820ffde8c396 (net/http: non-keepalive connections close
  successfully) (Closes: #683421)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/net/http/transport.go
603
603
                // before we race and peek on the underlying bufio reader.
604
604
                if waitForBodyRead != nil {
605
605
                        <-waitForBodyRead
 
606
                } else if !alive {
 
607
                        // If waitForBodyRead is nil, and we're not alive, we
 
608
                        // must close the connection before we leave the loop.
 
609
                        pc.close()
606
610
                }
607
611
        }
608
612
}