Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit eba7d6f

Browse files
committed
Merge branch '3.2'
* 3.2: [minor] Remove spaces in configuration Use PHP_SAPI instead of php_sapi_name() updated VENDORS for 3.2.8 updated VENDORS for 2.8.20 updated VENDORS for 2.7.27 remove AsseticBundle after broken merge updated VENDORS for 3.2.7 updated VENDORS for 2.8.19 updated VENDORS for 2.7.26
2 parents e44c4b1 + aa49b52 commit eba7d6f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/config/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ framework:
2525
trusted_hosts: ~
2626
session:
2727
# http://symfony.com/doc/current/reference/configuration/framework.html#handler-id
28-
handler_id: session.handler.native_file
29-
save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
28+
handler_id: session.handler.native_file
29+
save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%'
3030
fragments: ~
3131
http_method_override: true
3232
assets: ~

web/app_dev.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Feel free to remove this, extend it, or make something more sophisticated.
1313
if (isset($_SERVER['HTTP_CLIENT_IP'])
1414
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
15-
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1']) || php_sapi_name() === 'cli-server')
15+
|| !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1']) || PHP_SAPI === 'cli-server')
1616
) {
1717
header('HTTP/1.0 403 Forbidden');
1818
exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');

0 commit comments

Comments
 (0)