Merge branch 'fredbcode-master'

* fredbcode-master:
  Fix bug tls renegociation problem in Notification channel (webhook) #14800
This commit is contained in:
bergquist 2019-01-13 21:43:47 +01:00
commit db448b5d53

View File

@ -3,6 +3,7 @@ package notifications
import (
"bytes"
"context"
"crypto/tls"
"fmt"
"io"
"io/ioutil"
@ -26,6 +27,9 @@ type Webhook struct {
}
var netTransport = &http.Transport{
TLSClientConfig: &tls.Config{
Renegotiation: tls.RenegotiateFreelyAsClient,
},
Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{
Timeout: 30 * time.Second,