diff options
| author | Christian Stocker <chregu@php.net> | 2004-08-19 12:18:25 +0000 |
|---|---|---|
| committer | Christian Stocker <chregu@php.net> | 2004-08-19 12:18:25 +0000 |
| commit | 5950725144f9314109eae739030b9519b656b46a (patch) | |
| tree | 09c07ae7d5243d87125abded681f7e5cdc1cc88b /ext/xml/xml.c | |
| parent | ba75dd7877c69306799fa0501e8845c4cce8a718 (diff) | |
| download | php-git-5950725144f9314109eae739030b9519b656b46a.tar.gz | |
fix for bug #29657 xml_* functions throw non descriptive error, compared to php4
fix for bug #29711 libxml and non iso-8859-1.
If no encoding specified, it defaults to UTF-8 now
Diffstat (limited to 'ext/xml/xml.c')
| -rw-r--r-- | ext/xml/xml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/xml/xml.c b/ext/xml/xml.c index f17601f8eb..fba42e2e71 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -176,7 +176,7 @@ static int le_xml_parser; #ifdef ZTS static void php_xml_init_globals(php_xml_globals *xml_globals_p TSRMLS_DC) { - XML(default_encoding) = "ISO-8859-1"; + XML(default_encoding) = "UTF-8"; } #endif @@ -204,7 +204,7 @@ PHP_MINIT_FUNCTION(xml) #ifdef ZTS ts_allocate_id(&xml_globals_id, sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); #else - XML(default_encoding) = "ISO-8859-1"; + XML(default_encoding) = "UTF-8"; #endif REGISTER_LONG_CONSTANT("XML_ERROR_NONE", XML_ERROR_NONE, CONST_CS|CONST_PERSISTENT); |