diff options
Diffstat (limited to 'ext/mbstring/mbstring.h')
| -rw-r--r-- | ext/mbstring/mbstring.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h index 29fe1e97e2..5a713e5496 100644 --- a/ext/mbstring/mbstring.h +++ b/ext/mbstring/mbstring.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2018 The PHP Group | + | Copyright (c) The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -78,6 +78,7 @@ PHP_FUNCTION(mb_substitute_character); PHP_FUNCTION(mb_preferred_mime_name); PHP_FUNCTION(mb_parse_str); PHP_FUNCTION(mb_output_handler); +PHP_FUNCTION(mb_str_split); PHP_FUNCTION(mb_strlen); PHP_FUNCTION(mb_strpos); PHP_FUNCTION(mb_strrpos); @@ -123,17 +124,12 @@ MBSTRING_API char * php_mb_convert_encoding(const char *input, size_t length, const char *_from_encodings, size_t *output_len); -MBSTRING_API int php_mb_check_encoding_list(const char *encoding_list); - MBSTRING_API size_t php_mb_mbchar_bytes_ex(const char *s, const mbfl_encoding *enc); MBSTRING_API size_t php_mb_mbchar_bytes(const char *s); -MBSTRING_API size_t php_mb_stripos(int mode, const char *old_haystack, size_t old_haystack_len, const char *old_needle, size_t old_needle_len, zend_long offset, const char *from_encoding); +MBSTRING_API size_t php_mb_stripos(int mode, const char *old_haystack, size_t old_haystack_len, const char *old_needle, size_t old_needle_len, zend_long offset, zend_string *from_encoding); MBSTRING_API int php_mb_check_encoding(const char *input, size_t length, const char *enc); -/* internal use only */ -int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, size_t new_value_length); - ZEND_BEGIN_MODULE_GLOBALS(mbstring) char *internal_encoding_name; const mbfl_encoding *internal_encoding; @@ -168,8 +164,12 @@ ZEND_BEGIN_MODULE_GLOBALS(mbstring) struct _zend_mb_regex_globals *mb_regex_globals; zend_long regex_stack_limit; #endif - char *last_used_encoding_name; + zend_string *last_used_encoding_name; const mbfl_encoding *last_used_encoding; + /* Whether an explicit internal_encoding / http_output / http_input encoding was set. */ + zend_bool internal_encoding_set; + zend_bool http_output_set; + zend_bool http_input_set; ZEND_END_MODULE_GLOBALS(mbstring) #define MB_OVERLOAD_MAIL 1 @@ -198,10 +198,3 @@ ZEND_TSRMLS_CACHE_EXTERN() #define phpext_mbstring_ptr mbstring_module_ptr #endif /* _MBSTRING_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - */ |