Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.1'

* 2.1:
  fixed links in the UPGRADE file (closes #431)
  added fe80::1 as a local IP address in config.php
  Add fe80::1 to list of loopback addresses.
  updated VENDORS for 2.1.3

Conflicts:
	composer.lock
  • Loading branch information...
commit f3bda6ed2a12b8aee758cb94cc8d1ea93516ed2b 2 parents 67da619 + 3cee635
@fabpot fabpot authored
Showing with 4 additions and 10 deletions.
  1. +2 −2 UPGRADE.md
  2. +1 −4 web/app_dev.php
  3. +1 −4 web/config.php
View
4 UPGRADE.md
@@ -18,9 +18,9 @@ As of Symfony 2.1, project dependencies are managed by
it is automatically generated by Composer.
Download the default
-[`composer.json`](https://raw.github.com/symfony/symfony-standard/master/composer.json)
+[`composer.json`](https://raw.github.com/symfony/symfony-standard/2.1/composer.json)
and
-[`composer.lock`](https://raw.github.com/symfony/symfony-standard/master/composer.lock)
+[`composer.lock`](https://raw.github.com/symfony/symfony-standard/2.1/composer.lock)
files for Symfony 2.1 and put them into the main directory of your project. If
you have customized your `deps` file, move the added dependencies to the
`composer.json` file (many bundles and PHP libraries are already available as
View
5 web/app_dev.php
@@ -10,10 +10,7 @@
// Feel free to remove this, extend it, or make something more sophisticated.
if (isset($_SERVER['HTTP_CLIENT_IP'])
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
- || !in_array(@$_SERVER['REMOTE_ADDR'], array(
- '127.0.0.1',
- '::1',
- ))
+ || !in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1'))
) {
header('HTTP/1.0 403 Forbidden');
exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
View
5 web/config.php
@@ -4,10 +4,7 @@
exit('This script cannot be run from the CLI. Run it from a browser.');
}
-if (!in_array(@$_SERVER['REMOTE_ADDR'], array(
- '127.0.0.1',
- '::1',
-))) {
+if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1'))) {
header('HTTP/1.0 403 Forbidden');
exit('This script is only accessible from localhost.');
}
Please sign in to comment.
Something went wrong with that request. Please try again.