1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87

Index: ext/standard/datetime.c
===================================================================
--- ext/standard/datetime.c	(revision 297854)
+++ ext/standard/datetime.c	(working copy)
@@ -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);
Index: main/main.c
===================================================================
--- main/main.c	(revision 297854)
+++ main/main.c	(working copy)
@@ -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)
Index: main/php_globals.h
===================================================================
--- main/php_globals.h	(revision 297854)
+++ main/php_globals.h	(working copy)
@@ -127,8 +127,6 @@
 	zend_bool register_argc_argv;
 	zend_bool auto_globals_jit;

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

Index: php.ini-development
===================================================================
--- php.ini-development	(revision 297854)
+++ php.ini-development	(working copy)
@@ -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
Index: php.ini-production
===================================================================
--- php.ini-production	(revision 297854)
+++ php.ini-production	(working copy)
@@ -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