lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-21 21:19:12 -04:00
Code Issues Releases Wiki Activity

allow tls connection in http proxy

Browse Source
This commit is contained in:
v2ray
2016-05-07 10:36:36 +02:00
parent b65017d28d
commit f2c656843e
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/http/http.go
View File

@@ -2,6 +2,7 @@ package http
import (
"bufio"
"crypto/tls"
"io"
"net"
"net/http"
@@ -60,7 +61,11 @@ func (this *HttpProxyServer) Listen(port v2net.Port) error {
}
this.listeningPort = port
tcpListener, err := hub.ListenTCP(port, this.handleConnection, nil)
var tlsConfig *tls.Config = nil
if this.config.TlsConfig != nil {
tlsConfig = this.config.TlsConfig.GetConfig()
}
tcpListener, err := hub.ListenTCP(port, this.handleConnection, tlsConfig)
if err != nil {
log.Error("Http: Failed listen on port ", port, ": ", err)
return err