kalle                                    Mon, 12 Apr 2010 07:34:30 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=297864

Log:
Removed y2k_compliance ini option, making it "always" enabled internally
 - The only reference to y2k_compliance was in php_std_date(). Browsers thats 
not compatable have a marketshare of 0.01% if they even are in use today

Changed paths:
    U   php/php-src/trunk/NEWS
    U   php/php-src/trunk/ext/standard/datetime.c
    U   php/php-src/trunk/main/main.c
    U   php/php-src/trunk/main/php_globals.h
    U   php/php-src/trunk/php.ini-development
    U   php/php-src/trunk/php.ini-production

Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS      2010-04-12 07:01:46 UTC (rev 297863)
+++ php/php-src/trunk/NEWS      2010-04-12 07:34:30 UTC (rev 297864)
@@ -13,11 +13,13 @@
 - Added command line option --rz to CLI. (Johannes)

 - default_charset if not specified is now UTF-8 instead of ISO-8859-1. (Rasmus)
-- default session.entropy_file is now /dev/urandom or /dev/arandom if either
+
+- Changed session.entropy_file to default to /dev/urandom or /dev/arandom if 
either
   is present at compile time. (Rasmus)

-- Removed legacy features:
-  . define_syslog_variables ini option and its associated function. (Kalle)
+- Removed legacy features: (Kalle)
+  . define_syslog_variables ini option and its associated function.
+  . y2k_compliance ini option.

 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled PCRE to version 8.01. (Ilia)

Modified: php/php-src/trunk/ext/standard/datetime.c
===================================================================
--- php/php-src/trunk/ext/standard/datetime.c   2010-04-12 07:01:46 UTC (rev 
297863)
+++ php/php-src/trunk/ext/standard/datetime.c   2010-04-12 07:34:30 UTC (rev 
297864)
@@ -64,21 +64,12 @@
                return str;
        }

-       if (PG(y2k_compliance)) {
-               snprintf(str, 80, "%s, %02d %s %04d %02d:%02d:%02d GMT",
-                               day_short_names[tm1->tm_wday],
-                               tm1->tm_mday,
-                               mon_short_names[tm1->tm_mon],
-                               tm1->tm_year + 1900,
-                               tm1->tm_hour, tm1->tm_min, tm1->tm_sec);
-       } else {
-               snprintf(str, 80, "%s, %02d-%s-%02d %02d:%02d:%02d GMT",
-                               day_full_names[tm1->tm_wday],
-                               tm1->tm_mday,
-                               mon_short_names[tm1->tm_mon],
-                               ((tm1->tm_year) % 100),
-                               tm1->tm_hour, tm1->tm_min, tm1->tm_sec);
-       }
+       snprintf(str, 80, "%s, %02d %s %04d %02d:%02d:%02d GMT",
+                       day_short_names[tm1->tm_wday],
+                       tm1->tm_mday,
+                       mon_short_names[tm1->tm_mon],
+                       tm1->tm_year + 1900,
+                       tm1->tm_hour, tm1->tm_min, tm1->tm_sec);

        str[79] = 0;
        return (str);

Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c       2010-04-12 07:01:46 UTC (rev 297863)
+++ php/php-src/trunk/main/main.c       2010-04-12 07:34:30 UTC (rev 297864)
@@ -471,7 +471,6 @@
        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",           "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("serialize_precision",        "100",  PHP_INI_ALL,    
        OnUpdateLongGEZero,                     serialize_precision,    
php_core_globals,       core_globals)

Modified: php/php-src/trunk/main/php_globals.h
===================================================================
--- php/php-src/trunk/main/php_globals.h        2010-04-12 07:01:46 UTC (rev 
297863)
+++ php/php-src/trunk/main/php_globals.h        2010-04-12 07:34:30 UTC (rev 
297864)
@@ -127,8 +127,6 @@
        zend_bool register_argc_argv;
        zend_bool auto_globals_jit;

-       zend_bool y2k_compliance;
-
        char *docref_root;
        char *docref_ext;


Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development       2010-04-12 07:01:46 UTC (rev 
297863)
+++ php/php-src/trunk/php.ini-development       2010-04-12 07:34:30 UTC (rev 
297864)
@@ -233,10 +233,6 @@
 ; http://php.net/precision
 precision = 14

-; Enforce year 2000 compliance (will cause problems with non-compliant 
browsers)
-; http://php.net/y2k-compliance
-y2k_compliance = On
-
 ; Output buffering is a mechanism for controlling how much output data
 ; (excluding headers and cookies) PHP should keep internally before pushing 
that
 ; data to the client. If your application's output exceeds this setting, PHP

Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production        2010-04-12 07:01:46 UTC (rev 
297863)
+++ php/php-src/trunk/php.ini-production        2010-04-12 07:34:30 UTC (rev 
297864)
@@ -233,10 +233,6 @@
 ; http://php.net/precision
 precision = 14

-; Enforce year 2000 compliance (will cause problems with non-compliant 
browsers)
-; http://php.net/y2k-compliance
-y2k_compliance = On
-
 ; Output buffering is a mechanism for controlling how much output data
 ; (excluding headers and cookies) PHP should keep internally before pushing 
that
 ; data to the client. If your application's output exceeds this setting, PHP

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to