diff options
| author | Christian Stocker <chregu@php.net> | 2004-08-19 12:29:43 +0000 |
|---|---|---|
| committer | Christian Stocker <chregu@php.net> | 2004-08-19 12:29:43 +0000 |
| commit | 259f662488d174e843c42da50173be3e7ea17245 (patch) | |
| tree | 9b29edc3131cfecd8cecbc6af7e66d0955d59d09 /ext/xml/xml.c | |
| parent | d349734059ab396ae43ab13ddaf11837ff433530 (diff) | |
| download | php-git-259f662488d174e843c42da50173be3e7ea17245.tar.gz | |
MFH
- Fixed bug #29657 (xml_* functions throw non descriptive error).
(Christian, Rob)
- Fixed bug #29711 (Changed ext/xml to default to UTF-8 output). (Rob)
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); |