github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix test break

pull/255/merge
Darien Raymond 2016-12-30 23:30:35 +01:00
parent a44d556667
commit 3cc0783d9c
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
transport/internet/tls/config.go
View File

@ -26,7 +26,7 @@ func (v *Config) BuildCertificates() []tls.Certificate {
func (v *Config) GetTLSConfig() *tls.Config {
config := &tls.Config{
ClientSessionCache: globalSessionCache,
NextProtos: []string{"http/2", "spdy/3"},
//NextProtos: []string{"http/2.0", "spdy/3", "http/1.1"},
}
if v == nil {
return config

6
transport/internet/websocket/ws_test.go
View File

@ -2,6 +2,8 @@ package websocket_test
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
"time"
@ -100,8 +102,8 @@ func Test_listenWSAndDial_TLS(t *testing.T) {
AllowInsecure: true,
Certificate: []*v2tls.Certificate{
{
Certificate: ReadFile("./../../../testing/tls/cert.pem", assert),
Key: ReadFile("./../../../testing/tls/key.pem", assert),
Certificate: ReadFile(filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "testing", "tls", "cert.pem"), assert),
Key: ReadFile(filepath.Join(os.Getenv("GOPATH"), "src", "v2ray.com", "core", "testing", "tls", "key.pem"), assert),
},
},
}