From: Andrei Zmievski <andrei@php.net>
Date: Thu, 24 Feb 2000 15:41:34 +0000 (+0000)
Subject: Revert the y2k ini patches.
X-Git-Tag: PHP-4.0-RC1~432
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a22bb09d7a499109bae621188941f2510bb6037;p=php

Revert the y2k ini patches.

# Adam's right, it shouldn't be here
---

diff --git a/main/main.c b/main/main.c
index 8732d01a1b..3ff2e98d6d 100644
--- a/main/main.c
+++ b/main/main.c
@@ -204,7 +204,7 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("auto_prepend_file",	NULL,			PHP_INI_ALL,		OnUpdateString,	auto_prepend_file,	php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("auto_append_file",	NULL,			PHP_INI_ALL,		OnUpdateString,	auto_append_file,	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_BOOLEAN("y2k_compliance",		"0",			PHP_INI_ALL,		OnUpdateBool,		y2k_compliance,		php_core_globals,	core_globals)
 
 	STD_PHP_INI_ENTRY("doc_root",			NULL,			PHP_INI_SYSTEM,		OnUpdateStringUnempty,	doc_root,		php_core_globals,	core_globals)
 	STD_PHP_INI_ENTRY("user_dir",			NULL,			PHP_INI_SYSTEM,		OnUpdateStringUnempty,	user_dir,		php_core_globals,	core_globals)
diff --git a/php.ini-dist b/php.ini-dist
index 22480e9c67..6ae1e5bd75 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -49,7 +49,7 @@ engine			=	On	; Enable the PHP scripting language engine under Apache
 short_open_tag	=	On	; allow the <? tag.  otherwise, only <?php and <script> tags are recognized.
 asp_tags		=	Off ; allow ASP-style <% %> tags
 precision		=	14	; number of significant digits displayed in floating point numbers
-y2k_compliance	=	On	; now on by default, as we do have y2k...
+y2k_compliance	=	Off	; whether to be year 2000 compliant (will cause problems with non y2k compliant browsers)
 output_buffering	= Off	; Output buffering allows you to send header lines (including cookies)
 							; even after you send body content, in the price of slowing PHP's
 							; output layer a bit.