Fix HTTP request forwarding issues

- Create new URL object instead of mutating original request URL
- Add shorter 5-second timeout to prevent hanging
- Skip connection-specific headers that cause issues
- Use request context for proper cancellation handling
- Filter problematic response headers (connection, transfer-encoding)
- Should resolve 'Empty reply from server' error

Co-authored-by: f0ssel <[email protected]>

Author: blink-so[bot]

proxy/proxy.go

@@ -186,19 +186,18 @@ func (p *Server) forwardHTTPRequest(w http.ResponseWriter, r *http.Request) {
 	p.logger.Debug("forwardHTTPRequest called", "method", r.Method, "url", r.URL.String(), "host", r.Host)
 
 	// Create a new request to the target server
-	targetURL := r.URL
-	if targetURL.Scheme == "" {
-		targetURL.Scheme = "http"
-	}
-	if targetURL.Host == "" {
-		targetURL.Host = r.Host
+	targetURL := &url.URL{
+		Scheme: "http",
+		Host:   r.Host,
+		Path:   r.URL.Path,
+		RawQuery: r.URL.RawQuery,
 	}
 
 	p.logger.Debug("Target URL constructed", "target", targetURL.String())
 
-	// Create HTTP client
+	// Create HTTP client with shorter timeout
 	client := &http.Client{
-		Timeout: 10 * time.Second, // Add timeout to avoid hanging
+		Timeout: 5 * time.Second,
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {
 			return http.ErrUseLastResponse // Don't follow redirects
 		},
@@ -214,15 +213,19 @@ func (p *Server) forwardHTTPRequest(w http.ResponseWriter, r *http.Request) {
 
 	// Copy headers
 	for name, values := range r.Header {
+		// Skip connection-specific headers
+		if strings.ToLower(name) == "connection" || strings.ToLower(name) == "proxy-connection" {
+			continue
+		}
 		for _, value := range values {
 			req.Header.Add(name, value)
 		}
 	}
 
 	p.logger.Debug("About to make HTTP request", "target", targetURL.String())
 
-	// Make the request
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	// Make the request with context
+	ctx, cancel := context.WithTimeout(r.Context(), 5*time.Second)
 	defer cancel()
 	req = req.WithContext(ctx)
 
@@ -236,8 +239,11 @@ func (p *Server) forwardHTTPRequest(w http.ResponseWriter, r *http.Request) {
 
 	p.logger.Debug("Received response", "status", resp.StatusCode, "target", targetURL.String())
 
-	// Copy response headers
+	// Copy response headers (except connection-specific ones)
 	for name, values := range resp.Header {
+		if strings.ToLower(name) == "connection" || strings.ToLower(name) == "transfer-encoding" {
+			continue
+		}
 		for _, value := range values {
 			w.Header().Add(name, value)
 		}