mirror of
				https://github.com/caddyserver/caddy.git
				synced 2025-10-31 02:27:19 -04:00 
			
		
		
		
	Merge branch 'master' into log-request-body
This commit is contained in:
		
						commit
						ac0dd303be
					
				| @ -87,9 +87,6 @@ func NewReplacer(r *http.Request, rr *ResponseRecorder, emptyValue string) Repla | |||||||
| 			"{fragment}":      func() string { return r.URL.Fragment }, | 			"{fragment}":      func() string { return r.URL.Fragment }, | ||||||
| 			"{proto}":         func() string { return r.Proto }, | 			"{proto}":         func() string { return r.Proto }, | ||||||
| 			"{remote}": func() string { | 			"{remote}": func() string { | ||||||
| 				if fwdFor := r.Header.Get("X-Forwarded-For"); fwdFor != "" { |  | ||||||
| 					return fwdFor |  | ||||||
| 				} |  | ||||||
| 				host, _, err := net.SplitHostPort(r.RemoteAddr) | 				host, _, err := net.SplitHostPort(r.RemoteAddr) | ||||||
| 				if err != nil { | 				if err != nil { | ||||||
| 					return r.RemoteAddr | 					return r.RemoteAddr | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user