]> Cypherpunks repositories - gostls13.git/commit
net/http: make Transport.CloseIdleConnections close non-bundled http2.Transport
authorBrad Fitzpatrick <bradfitz@golang.org>
Thu, 12 Jul 2018 18:47:31 +0000 (18:47 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Thu, 12 Jul 2018 20:05:15 +0000 (20:05 +0000)
commitf22dd66b23ec1a703a3984cad1840bc8692cf1d0
treecca6d1be042d489715ca6d540ebe9612b8bd4a8b
parentb888a6227fa56f4698f9e5ca74e8bee10830bebe
net/http: make Transport.CloseIdleConnections close non-bundled http2.Transport

Previously Transport.CloseIdleConnections only closed the HTTP/2
Transport's idle connections if the HTTP/2 transport was configured
automatically via the bundled copy (in h2_bundle.go).

This makes it also work if the user called http2.ConfigureTransport
themselves using golang.org/x/net/http2 instead of the bundled copy.

No tests because we have no current way to run such cross-repo tests,
at least in any efficient or non-flaky way.

Tested by hand that:

    package main

    import (
        "net/http"

        "golang.org/x/net/http2"
    )

    func main() {
        tr := &http.Transport{}
        http2.ConfigureTransport(tr)
        tr.CloseIdleConnections()
    }

... now works and calls the x/net/http2.Transport.CloseIdleConnections
code. (I threw in a print statement locally)

Fixes #22891 once CL 123656 is also in.

Change-Id: Id697fd3e7877c3a988bc3c3368b88940ba56cfd0
Reviewed-on: https://go-review.googlesource.com/123657
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/net/http/export_test.go
src/net/http/transport.go