Skip to content
Snippets Groups Projects
Commit cf6ab10f authored by Travis Ralston's avatar Travis Ralston
Browse files

Clean up deprecations in federation code too

parent 1fd3cb31
No related branches found
No related tags found
No related merge requests found
package matrix
import (
"context"
"crypto/tls"
"encoding/json"
"errors"
......@@ -242,7 +243,7 @@ func FederatedGet(url string, realHost string, ctx rcontext.RequestContext) (*ht
DisableKeepAlives: true,
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
// Based on https://github.com/matrix-org/gomatrixserverlib/blob/51152a681e69a832efcd934b60080b92bc98b286/client.go#L74-L90
DialTLS: func(network, addr string) (net.Conn, error) {
DialTLSContext: func(ctx2 context.Context, network, addr string) (net.Conn, error) {
rawconn, err := net.Dial(network, addr)
if err != nil {
return nil, err
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment