com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/iconv/iconv.c ext/mbs tring/mbstring.c ext/standard/html.c
main/SAPI.h ma in/main.c main/php.h main/php_globals.h sapi/cli/ tests/upload_2G.phpt

Commit: b923de2a8f6d35ee7d9dd675c2fd2456c105cd25 Author: Anatol Belski <ab@php.net> Thu, 13 Feb 2014 09:22:58 +0100 Parents: 8cda1af604710eaf1b1cbfda3247fe441af1e0d5 9a5cb51ebcb778b0cac39928fb6fcd5c604fe6cd Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b923de2a8f6d35ee7d9dd675c2fd2456c105cd25 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: ext/standard/html.c Changed paths: MM ext/iconv/iconv.c MM ext/mbstring/mbstring.c MM ext/standard/html.c MM main/SAPI.h MM main/main.c MM main/php.h MM main/php_globals.h MM sapi/cli/tests/upload_2G.phpt Diff: diff --cc ext/standard/html.c index 21e67c6,075a4d2..be7cd1d --- a/ext/standard/html.c +++ b/ext/standard/html.c @@@ -1432,10 -1432,10 +1432,10 @@@ encode_amp */ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all) { - char *str, *hint_charset = NULL; - php_size_t str_len, hint_charset_len = 0; + char *str, *hint_charset = PHP_DEFAULT_CHARSET; - int str_len, hint_charset_len = sizeof(PHP_DEFAULT_CHARSET)-1; ++ php_size_t str_len, hint_charset_len = sizeof(PHP_DEFAULT_CHARSET)-1; size_t new_len; - long flags = ENT_COMPAT; + php_int_t flags = ENT_COMPAT; char *replaced; zend_bool double_encode = 1; @@@ -1504,13 -1504,13 +1504,13 @@@ PHP_FUNCTION(htmlspecialchars_decode Convert all HTML entities to their applicable characters */ PHP_FUNCTION(html_entity_decode) { - char *str, *hint_charset = NULL; - php_size_t str_len, hint_charset_len = 0; + char *str, *hint_charset = PHP_DEFAULT_CHARSET; - int str_len, hint_charset_len = sizeof(PHP_DEFAULT_CHARSET)-1; - size_t new_len = 0; - long quote_style = ENT_COMPAT; ++ php_size_t str_len, hint_charset_len = sizeof(PHP_DEFAULT_CHARSET)-1; + php_size_t new_len = 0; + php_int_t quote_style = ENT_COMPAT; char *replaced; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls", &str, &str_len, + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|iS", &str, &str_len, &quote_style, &hint_charset, &hint_charset_len) == FAILURE) { return; }