diff options
| author | Felipe Pena <felipe@php.net> | 2009-03-26 20:02:53 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-03-26 20:02:53 +0000 |
| commit | 8ecf8ede1ff9cd425cf1cfd754558ff4bd2d38f4 (patch) | |
| tree | 8d447a97971dd7d300621a52f491906cb1e7d576 /ext/soap/php_encoding.c | |
| parent | 5d8cf0217f3a45d297f63f726774fb94b7f1353d (diff) | |
| download | php-git-8ecf8ede1ff9cd425cf1cfd754558ff4bd2d38f4.tar.gz | |
- Removed:
- UG(unicode) checks
- pcre_cache_entry.unicode_mode
- Changed:
- ZEND_STR_TYPE -> IS_UNICODE
- convert_to_text -> convert_to_unicode
- convert_to_text_ex -> convert_to_unicode_ex
(Felipe, Steph)
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index d0d2e5fffd..923074674b 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -460,12 +460,7 @@ static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, xml for (zend_hash_internal_pointer_reset_ex(SOAP_GLOBAL(class_map), &pos); zend_hash_get_current_data_ex(SOAP_GLOBAL(class_map), (void **) &tmp, &pos) == SUCCESS; zend_hash_move_forward_ex(SOAP_GLOBAL(class_map), &pos)) { - if ((!UG(unicode) && - Z_TYPE_PP(tmp) == IS_STRING && - ce->name_length == Z_STRLEN_PP(tmp) && - zend_binary_strncasecmp(ce->name.s, ce->name_length, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), ce->name_length) == 0) || - (UG(unicode) && - Z_TYPE_PP(tmp) == IS_UNICODE && + if ((Z_TYPE_PP(tmp) == IS_UNICODE && ce->name_length == Z_USTRLEN_PP(tmp) && zend_u_binary_strncasecmp(ce->name.u, ce->name_length, Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp), ce->name_length) == 0)) { |