summaryrefslogtreecommitdiff
path: root/modules/caddyhttp/reverseproxy
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2021-06-16 14:29:42 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2021-06-16 14:29:42 -0600
commit238914d70b0f6c277494f0296a15eb9eb84ecc76 (patch)
tree1b322548c2f817008d662374d4b3633a903d58fc /modules/caddyhttp/reverseproxy
parente8ae80adca5db7102e646954fcc53827732ceb83 (diff)
Some misc. cleanup
The fastcgi changes came from v1 which don't make sense in v2. Fix comment about default value in reverse proxy keep alive.
Diffstat (limited to 'modules/caddyhttp/reverseproxy')
-rw-r--r--modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go10
-rw-r--r--modules/caddyhttp/reverseproxy/httptransport.go2
2 files changed, 3 insertions, 9 deletions
diff --git a/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go b/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go
index 0976437..d7a0e36 100644
--- a/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go
+++ b/modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go
@@ -236,13 +236,7 @@ func (t Transport) buildEnv(r *http.Request) (map[string]string, error) {
// original URI in as the value of REQUEST_URI (the user can overwrite this
// if desired). Most PHP apps seem to want the original URI. Besides, this is
// how nginx defaults: http://stackoverflow.com/a/12485156/1048862
- origReq, ok := r.Context().Value(caddyhttp.OriginalRequestCtxKey).(http.Request)
- if !ok {
- // some requests, like active health checks, don't add this to
- // the request context, so we can just use the current URL
- origReq = *r
- }
- reqURL := origReq.URL
+ origReq := r.Context().Value(caddyhttp.OriginalRequestCtxKey).(http.Request)
requestScheme := "http"
if r.TLS != nil {
@@ -285,7 +279,7 @@ func (t Transport) buildEnv(r *http.Request) (map[string]string, error) {
"DOCUMENT_ROOT": root,
"DOCUMENT_URI": docURI,
"HTTP_HOST": r.Host, // added here, since not always part of headers
- "REQUEST_URI": reqURL.RequestURI(),
+ "REQUEST_URI": origReq.URL.RequestURI(),
"SCRIPT_FILENAME": scriptFilename,
"SCRIPT_NAME": scriptName,
}
diff --git a/modules/caddyhttp/reverseproxy/httptransport.go b/modules/caddyhttp/reverseproxy/httptransport.go
index f217a4b..1932851 100644
--- a/modules/caddyhttp/reverseproxy/httptransport.go
+++ b/modules/caddyhttp/reverseproxy/httptransport.go
@@ -411,7 +411,7 @@ type KeepAlive struct {
// Maximum number of idle connections. Default: 0, which means no limit.
MaxIdleConns int `json:"max_idle_conns,omitempty"`
- // Maximum number of idle connections per host. Default: 0, which uses Go's default of 2.
+ // Maximum number of idle connections per host. Default: 32.
MaxIdleConnsPerHost int `json:"max_idle_conns_per_host,omitempty"`
// How long connections should be kept alive when idle. Default: 0, which means no timeout.