Development

Changeset 10030

You must first sign up to be able to contribute.

Changeset 10030

Show
Ignore:
Timestamp:
07/01/08 00:14:38 (5 months ago)
Author:
dwhittle
Message:

dwhittle: merged changes to branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/dwhittle/1.0/data/bin/symfony.php

    r8315 r10030  
    2121// set magic_quotes_runtime to off 
    2222ini_set('magic_quotes_runtime', 'Off'); 
     23 
     24// force populating $argc and $argv in the case PHP does not automatically create them (fixes #2943) 
     25$argv = $_SERVER['argv']; 
     26$argc = $_SERVER['argc']; 
    2327 
    2428// check if we are using an old project 
  • branches/dwhittle/1.1/lib/task/generator/sfGenerateAppTask.class.php

    r9563 r10030  
    139139      'IP_CHECK'    => '// this check prevents access to debug front conrollers that are deployed by accident to production servers.'.PHP_EOL. 
    140140                       '// feel free to remove this, extend it or make something more sophisticated.'.PHP_EOL. 
    141                        'if (!in_array(@$_SERVER[\'REMOTE_ADDR\'], array(\'127.0.0.1\')))'.PHP_EOL. 
     141                       'if (!in_array(@$_SERVER[\'REMOTE_ADDR\'], array(\'127.0.0.1\', \'::1\')))'.PHP_EOL. 
    142142                       '{'.PHP_EOL. 
    143143                       '  die(\'Your are not allowed to access this file. Check \'.basename(__FILE__).\' for more information.\');'.PHP_EOL.