net/http: backport TimeoutHandler fix to Go 1.6.2

[bradfitz]

As Andy Hochhaus writes on golang-nuts:

Starting in go 1.6.0 issue #14568 caused http.TimeoutHandler() to not behave correctly (timer was started too early and was not reset per http request). This bug was introduced in Dec 2015 in 0478f7b and resolved in Feb 2016 in bd68b8a.

Any chance the fix could be included in 1.6.2 as the bug was a 1.6 regression?

I agree we should backport the fix. I never realized it was introduced in 1.6.

@adg, @rsc?

[adg]

Looks low-risk enough to be worthy of inclusion.

[adg]

Looks low-risk enough to be worthy of inclusion.

[adg]

@bradfitz the cherry-pick of bd68b8a doesn't apply cleanly. Would you mind doing the cherry-pick, since you're the domain expert? Thank you.

[adg]

@bradfitz the cherry-pick of bd68b8a doesn't apply cleanly. Would you mind doing the cherry-pick, since you're the domain expert? Thank you.

[bradfitz]

Remind me of the process? (Or link to docs?)

[bradfitz]

Remind me of the process? (Or link to docs?)

[adg]

# create work branch tracking release branch
$ git change release-branch.go1.6
$ git change go16pick
# cherry pick and mail cl
$ git cherry-pick $HASH
$ git mail

[adg]

# create work branch tracking release branch
$ git change release-branch.go1.6
$ git change go16pick
# cherry pick and mail cl
$ git cherry-pick $HASH
$ git mail