From 7db0c8cf624d70d852eae837825bfaf97a459fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Fri, 7 Apr 2023 15:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96HTTP2=E3=80=81HTTP=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/nodes/http_request_utils.go | 10 ++++++++++ internal/nodes/listener_http.go | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/internal/nodes/http_request_utils.go b/internal/nodes/http_request_utils.go index 78d74bb..4c2b874 100644 --- a/internal/nodes/http_request_utils.go +++ b/internal/nodes/http_request_utils.go @@ -208,3 +208,13 @@ func httpAcceptEncoding(acceptEncodings string, encoding string) bool { } return false } + +// 跳转到某个URL +func httpRedirect(writer http.ResponseWriter, req *http.Request, url string, code int) { + if len(writer.Header().Get("Content-Type")) == 0 { + // 设置Content-Type，是为了让页面不输出链接 + writer.Header().Set("Content-Type", "text/html; charset=utf-8") + } + + http.Redirect(writer, req, url, code) +} diff --git a/internal/nodes/listener_http.go b/internal/nodes/listener_http.go index 861e2ac..a61bed1 100644 --- a/internal/nodes/listener_http.go +++ b/internal/nodes/listener_http.go @@ -4,9 +4,7 @@ import ( "context" "crypto/tls" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs" - "github.com/TeaOSLab/EdgeNode/internal/remotelogs" "github.com/iwind/TeaGo/Tea" - "golang.org/x/net/http2" "io" "log" "net" @@ -84,13 +82,7 @@ func (this *HTTPListener) Serve() error { if this.isHTTPS { this.httpServer.TLSConfig = this.buildTLSConfig() - // support http/2 - err := http2.ConfigureServer(this.httpServer, nil) - if err != nil { - remotelogs.Error("HTTP_LISTENER", "configure http2 error: "+err.Error()) - } - - err = this.httpServer.ServeTLS(this.Listener, "", "") + err := this.httpServer.ServeTLS(this.Listener, "", "") if err != nil && err != http.ErrServerClosed { return err }