Commitcd52a80

committed

[HttpKernel] FC with HttpFoundation 4.0

1 parent5f29144 commitcd52a80Copy full SHA for cd52a80

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,10 +119,14 @@ protected function createSubRequest($uri, Request $request)`
`119`	`119`	`// Sub-request object will point to localhost as client ip and real client ip`
`120`	`120`	`// will be included into trusted header for client ip`
`121`	`121`	`try {`
`122`		`-if ($trustedHeaderName = Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP,false)) {`
	`122`	`+if (method_exists(Request::class,'getTrustedHeaderName') &&$trustedHeaderName = Request::getTrustedHeaderName(Request::HEADER_CLIENT_IP,false)) {`
`123`	`123`	`$currentXForwardedFor =$request->headers->get($trustedHeaderName,'');`
`124`	`124`
`125`	`125`	`$server['HTTP_'.$trustedHeaderName] = ($currentXForwardedFor ?$currentXForwardedFor.',' :'').$request->getClientIp();`
	`126`	`+ }elseif (Request::HEADER_X_FORWARDED_FOR & Request::getTrustedHeaderSet()) {`
	`127`	`+$currentXForwardedFor =$request->headers->get('X_FORWARDED_FOR','');`
	`128`	`+`
	`129`	`+$server['HTTP_X_FORWARDED_FOR'] = ($currentXForwardedFor ?$currentXForwardedFor.',' :'').$request->getClientIp();`
`126`	`130`	`}`
`127`	`131`	`}catch (\InvalidArgumentException$e) {`
`128`	`132`	`// Do nothing`

Comments

(0)