We are about to enter 2003, sending two-digit years does not make too

much sense anymore.  According to an article from '98, only Netscape 3.x was
affected anyway.

diff --git a/NEWS b/NEWS
index 843ef57e1845c1c87038024d5b5c2729af8e0763..c34b51f783da79e9eb1f2065cba2d5f96b61807e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ? ? ??? 2002, Version 4.3.0
+- Changed y2k_compliance to default to 1 now. (Sascha)
 - Added platform independent socket error constants for better error handling.
 - Fixed include() and require() to work with remote files under win32. (Wez)
 - Added php.ini option "auto_detect_line_endings" which enables PHP to detect

diff --git a/main/main.c b/main/main.c
index aae6cdd523b8eed12eb426186aace7501bc5d9a7..ffa11520917a7aa8733fce703f23107c9804a47b 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -275,7 +275,7 @@ PHP_INI_BEGIN()
        STD_PHP_INI_BOOLEAN("short_open_tag",DEFAULT_SHORT_OPEN_TAG,    PHP_INI_SYSTEM|PHP_INI_PERDIR,          OnUpdateBool,                   short_tags,                             zend_compiler_globals,  compiler_globals)
        STD_PHP_INI_BOOLEAN("sql.safe_mode",            "0",            PHP_INI_SYSTEM,         OnUpdateBool,                   sql_safe_mode,                  php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("track_errors",                     "0",            PHP_INI_ALL,            OnUpdateBool,                   track_errors,                   php_core_globals,       core_globals)
-       STD_PHP_INI_BOOLEAN("y2k_compliance",           "0",            PHP_INI_ALL,            OnUpdateBool,                   y2k_compliance,                 php_core_globals,       core_globals)
+       STD_PHP_INI_BOOLEAN("y2k_compliance",           "1",            PHP_INI_ALL,            OnUpdateBool,                   y2k_compliance,                 php_core_globals,       core_globals)
 
        STD_PHP_INI_ENTRY("unserialize_callback_func",  NULL,           PHP_INI_ALL,            OnUpdateString, unserialize_callback_func,      php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("arg_separator.output",       "&",            PHP_INI_ALL,            OnUpdateStringUnempty,  arg_separator.output,   php_core_globals,       core_globals)

diff --git a/php.ini-dist b/php.ini-dist
index 59ad4f200ea988ee30253dce35e0943507f8ae1e..58b3267f2bd5705aa26d939dda06099ea0010d22 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -77,7 +77,7 @@ asp_tags = Off
 precision    =  12
 
 ; 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
@@ -819,7 +819,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.