← Back to branch summary

~ubuntu-branches/ubuntu/vivid/golang/vivid

« back to all changes in this revision

Viewing changes to src/pkg/net/http/httputil/dump.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-20 14:06:23 UTC
  • mfrom: (14.1.23 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130820140623-b414jfxi3m0qkmrq
Tags: 2:1.1.2-2ubuntu1
https://launchpad.net/bugs/1211749
https://launchpad.net/bugs/1202027
* Merge from Debian unstable (LP: #1211749, #1202027). Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - d/control,control.cross: Update Breaks/Replaces for Ubuntu
    versions to ensure smooth upgrades, regenerate control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/net/http/httputil/dump.go
75
75
 
76
76
        // Use the actual Transport code to record what we would send
77
77
        // on the wire, but not using TCP.  Use a Transport with a
78
 
        // customer dialer that returns a fake net.Conn that waits
 
78
        // custom dialer that returns a fake net.Conn that waits
79
79
        // for the full input (and recording it), and then responds
80
80
        // with a dummy response.
81
81
        var buf bytes.Buffer // records the output
89
89
 
90
90
        t := &http.Transport{
91
91
                Dial: func(net, addr string) (net.Conn, error) {
92
 
                        return &dumpConn{io.MultiWriter(pw, &buf), dr}, nil
 
92
                        return &dumpConn{io.MultiWriter(&buf, pw), dr}, nil
93
93
                },
94
94
        }
95
95