diff options
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | ext/standard/datetime.c | 21 | ||||
| -rw-r--r-- | main/main.c | 1 | ||||
| -rw-r--r-- | main/php_globals.h | 2 | ||||
| -rw-r--r-- | php.ini-development | 4 | ||||
| -rw-r--r-- | php.ini-production | 4 |
6 files changed, 11 insertions, 29 deletions
@@ -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) diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index 3e21b9a279..55262b57a5 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -64,21 +64,12 @@ PHPAPI char *php_std_date(time_t t TSRMLS_DC) 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); diff --git a/main/main.c b/main/main.c index 92630c8a80..8015476b93 100644 --- a/main/main.c +++ b/main/main.c @@ -471,7 +471,6 @@ 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", "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) diff --git a/main/php_globals.h b/main/php_globals.h index b698acb6d2..f12073abc3 100644 --- a/main/php_globals.h +++ b/main/php_globals.h @@ -127,8 +127,6 @@ struct _php_core_globals { zend_bool register_argc_argv; zend_bool auto_globals_jit; - zend_bool y2k_compliance; - char *docref_root; char *docref_ext; diff --git a/php.ini-development b/php.ini-development index d718b2815a..8f73bfb24f 100644 --- a/php.ini-development +++ b/php.ini-development @@ -233,10 +233,6 @@ asp_tags = Off ; 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 diff --git a/php.ini-production b/php.ini-production index c92690c7fe..f0b7e82bba 100644 --- a/php.ini-production +++ b/php.ini-production @@ -233,10 +233,6 @@ asp_tags = Off ; 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 |