pajoye Tue, 08 Jun 2010 13:48:02 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300278
Log: - duplicate entry Changed paths: U php/php-src/branches/PHP_5_3/php.ini-development U php/php-src/branches/PHP_5_3/php.ini-production U php/php-src/trunk/php.ini-development U php/php-src/trunk/php.ini-production Modified: php/php-src/branches/PHP_5_3/php.ini-development =================================================================== --- php/php-src/branches/PHP_5_3/php.ini-development 2010-06-08 13:46:19 UTC (rev 300277) +++ php/php-src/branches/PHP_5_3/php.ini-development 2010-06-08 13:48:02 UTC (rev 300278) @@ -1592,9 +1592,6 @@ ;session.entropy_file = /dev/urandom session.entropy_file = -; http://php.net/session.entropy-length -;session.entropy_length = 16 - ; Set to {nocache,private,public,} to determine HTTP caching aspects ; or leave this empty to avoid sending anti-caching headers. ; http://php.net/session.cache-limiter Modified: php/php-src/branches/PHP_5_3/php.ini-production =================================================================== --- php/php-src/branches/PHP_5_3/php.ini-production 2010-06-08 13:46:19 UTC (rev 300277) +++ php/php-src/branches/PHP_5_3/php.ini-production 2010-06-08 13:48:02 UTC (rev 300278) @@ -1599,9 +1599,6 @@ ; Windows random source (using the CryptoAPI) ;session.entropy_file = /dev/urandom -; http://php.net/session.entropy-length -;session.entropy_length = 16 - ; Set to {nocache,private,public,} to determine HTTP caching aspects ; or leave this empty to avoid sending anti-caching headers. ; http://php.net/session.cache-limiter Modified: php/php-src/trunk/php.ini-development =================================================================== --- php/php-src/trunk/php.ini-development 2010-06-08 13:46:19 UTC (rev 300277) +++ php/php-src/trunk/php.ini-development 2010-06-08 13:48:02 UTC (rev 300278) @@ -1499,10 +1499,6 @@ ; Windows random source (using the CryptoAPI) ;session.entropy_file = /dev/urandom -; http://php.net/session.entropy-length -; defaults to 32 -;session.entropy_length = 32 - ; Set to {nocache,private,public,} to determine HTTP caching aspects ; or leave this empty to avoid sending anti-caching headers. ; http://php.net/session.cache-limiter Modified: php/php-src/trunk/php.ini-production =================================================================== --- php/php-src/trunk/php.ini-production 2010-06-08 13:46:19 UTC (rev 300277) +++ php/php-src/trunk/php.ini-production 2010-06-08 13:48:02 UTC (rev 300278) @@ -1494,6 +1494,9 @@ ; http://php.net/session.referer-check session.referer_check = +; How many bytes to read from the file. +; http://php.net/session.entropy-length +;session.entropy_length = 32 ; Specified here to create the session id. ; http://php.net/session.entropy-file ; Defaults to /dev/urandom @@ -1503,10 +1506,6 @@ ; Windows random source (using the CryptoAPI) ;session.entropy_file = /dev/urandom -; http://php.net/session.entropy-length -; defaults to 32 -;session.entropy_length = 32 - ; Set to {nocache,private,public,} to determine HTTP caching aspects ; or leave this empty to avoid sending anti-caching headers. ; http://php.net/session.cache-limiter
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php