Bugfix: Check cancel func prior to invoking it.

kr · Mar 5, 2015 · b3137ac · b3137ac
1 parent 8e5d1e6
commit b3137ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/limit/sanity_test.go b/limit/sanity_test.go
@@ -5,6 +5,11 @@ import (
 	"testing"
 )
 
+func TestCancel(t *testing.T) {
+	tr := &Transport{}
+	tr.CancelRequest(new(http.Request))
+}
+
 func TestSanity(t *testing.T) {
 	f := func(r *http.Request) interface{} { return 0 }
 	tr := &Transport{

diff --git a/limit/transport.go b/limit/transport.go
@@ -71,7 +71,9 @@ func (t *Transport) RoundTrip(r *http.Request) (*http.Response, error) {
 // on the underlying RoundTripper.
 func (t *Transport) CancelRequest(r *http.Request) {
 	cancel := t.setCanceler(r, nil)
-	cancel()
+	if cancel != nil {
+		cancel()
+	}
 	type canceler interface {
 		CancelRequest(*http.Request)
 	}