comparison vendor/symfony/http-kernel/Fragment/InlineFragmentRenderer.php @ 16:c2387f117808

Routine composer update
author Chris Cannam
date Tue, 10 Jul 2018 15:07:59 +0100
parents 1fec387a4317
children 129ea1e6d783
comparison
equal deleted inserted replaced
15:e200cb7efeb3 16:c2387f117808
124 } 124 }
125 } catch (\InvalidArgumentException $e) { 125 } catch (\InvalidArgumentException $e) {
126 // Do nothing 126 // Do nothing
127 } 127 }
128 128
129 $server['REMOTE_ADDR'] = '127.0.0.1'; 129 $trustedProxies = Request::getTrustedProxies();
130 $server['REMOTE_ADDR'] = $trustedProxies ? reset($trustedProxies) : '127.0.0.1';
131
130 unset($server['HTTP_IF_MODIFIED_SINCE']); 132 unset($server['HTTP_IF_MODIFIED_SINCE']);
131 unset($server['HTTP_IF_NONE_MATCH']); 133 unset($server['HTTP_IF_NONE_MATCH']);
132 134
133 $subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server); 135 $subRequest = Request::create($uri, 'get', array(), $cookies, array(), $server);
134 if ($request->headers->has('Surrogate-Capability')) { 136 if ($request->headers->has('Surrogate-Capability')) {