Merge changes from php.ini-dist

diff --git a/php.ini-recommended b/php.ini-recommended
index ecbc97291cce8d3cf7d3f2d195ba7e6e5ea4e4bb..526bd82354f1472d2ffdd1387ef2e26e5b91ad9e 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -90,7 +90,7 @@ asp_tags = Off
 precision    =  14
 
 ; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-y2k_compliance = Off
+y2k_compliance = On
 
 ; Output buffering allows you to send header lines (including cookies) even
 ; after you send body content, at the price of slowing PHP's output layer a
@@ -833,7 +833,8 @@ session.entropy_file =
 
 ;session.entropy_file = /dev/urandom
 
-; Set to {nocache,private,public} to determine HTTP caching aspects.
+; Set to {nocache,private,public,} to determine HTTP caching aspects.
+; or leave this empty to avoid sending anti-caching headers.
 session.cache_limiter = nocache
 
 ; Document expires after n minutes.