From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 20 Mar 2000 08:19:51 +0000 (+0000)
Subject: As it turns out, there are some browsers that can't handle default
X-Git-Tag: PHP-4.0-RC1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c32e09f791d3c02f234d8d5fad0e9146f5836e79;p=php

As it turns out, there are some browsers that can't handle default
charsets.  I think forcing this on is going to cause us a lot of headache,
so turn it off by default.
@ Don't default to iso-8859-1 since this confuses some browsers
---

diff --git a/main/SAPI.h b/main/SAPI.h
index ea3e8f5911..d2352ed525 100644
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -197,7 +197,7 @@ struct _sapi_post_entry {
 #define SAPI_HEADER_SEND_FAILED			3
 
 #define SAPI_DEFAULT_MIMETYPE		"text/html"
-#define SAPI_DEFAULT_CHARSET		"iso-8859-1"
+#define SAPI_DEFAULT_CHARSET		""
 #define SAPI_PHP_VERSION_HEADER		"X-Powered-By: PHP/" PHP_VERSION
 
 #define SAPI_POST_READER_FUNC(post_reader) void post_reader(SLS_D)
diff --git a/php.ini-dist b/php.ini-dist
index d91a2824f8..d85489c356 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -193,9 +193,9 @@ auto_append_file	=
 ; As of 4.0b4, PHP always outputs a character encoding by default in
 ; the Content-type: header.  To disable sending of the charset, simply
 ; set it to be empty.
-; PHP's built-in default is text/html with the iso-8859-1 charset.
+; PHP's built-in default is text/html
 default_mimetype = "text/html"
-default_charset = "iso-8859-1"
+;default_charset = "iso-8859-1"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Paths and Directories ;