[PR #4151] [MERGED] return 504 instead of 404 for proxy type http request timeout #4930

New issue

Closed

opened 2026-05-05 14:51:29 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:51:29 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/4151
Author: @fatedier
Created: 4/11/2024
Status: ✅ Merged
Merged: 4/11/2024
Merged by: @fatedier

Base: dev ← Head: new

📝 Commits (1)

f7e168b return 504 instead of 404 for proxy type http request timeout

📊 Changes

22 files changed (+162 additions, -74 deletions)

View changed files

📝 .golangci.yml (+1 -5)
📝 Release.md (+3 -1)
📝 client/admin_api.go (+1 -1)
📝 client/connector.go (+17 -17)
📝 client/proxy/proxy.go (+3 -3)
📝 go.mod (+1 -1)
📝 go.sum (+2 -2)
📝 pkg/plugin/client/http2https.go (+7 -1)
📝 pkg/plugin/client/http_proxy.go (+2 -1)
📝 pkg/plugin/client/https2http.go (+9 -1)
📝 pkg/plugin/client/https2https.go (+10 -2)
📝 pkg/plugin/client/static_file.go (+2 -1)
📝 pkg/util/log/log.go (+30 -0)
📝 pkg/util/net/dial.go (+3 -3)
📝 pkg/util/net/websocket.go (+4 -2)
📝 pkg/util/vhost/http.go (+9 -21)
📝 pkg/util/vhost/https_test.go (+1 -1)
📝 server/service.go (+5 -4)
📝 test/e2e/framework/framework.go (+1 -1)
📝 test/e2e/framework/process.go (+3 -3)

...and 2 more files

📄 Description

WHY

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fatedier/frp/pull/4151 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 4/11/2024 **Status:** ✅ Merged **Merged:** 4/11/2024 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `new` --- ### 📝 Commits (1) - [`f7e168b`](https://github.com/fatedier/frp/commit/f7e168bc9e755976c483a1567f0558b1efa421b8) return 504 instead of 404 for proxy type http request timeout ### 📊 Changes **22 files changed** (+162 additions, -74 deletions) <details> <summary>View changed files</summary> 📝 `.golangci.yml` (+1 -5) 📝 `Release.md` (+3 -1) 📝 `client/admin_api.go` (+1 -1) 📝 `client/connector.go` (+17 -17) 📝 `client/proxy/proxy.go` (+3 -3) 📝 `go.mod` (+1 -1) 📝 `go.sum` (+2 -2) 📝 `pkg/plugin/client/http2https.go` (+7 -1) 📝 `pkg/plugin/client/http_proxy.go` (+2 -1) 📝 `pkg/plugin/client/https2http.go` (+9 -1) 📝 `pkg/plugin/client/https2https.go` (+10 -2) 📝 `pkg/plugin/client/static_file.go` (+2 -1) 📝 `pkg/util/log/log.go` (+30 -0) 📝 `pkg/util/net/dial.go` (+3 -3) 📝 `pkg/util/net/websocket.go` (+4 -2) 📝 `pkg/util/vhost/http.go` (+9 -21) 📝 `pkg/util/vhost/https_test.go` (+1 -1) 📝 `server/service.go` (+5 -4) 📝 `test/e2e/framework/framework.go` (+1 -1) 📝 `test/e2e/framework/process.go` (+3 -3) _...and 2 more files_ </details> ### 📄 Description ### WHY  --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>