diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-26 09:57:36 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-26 09:57:36 -0700 |
| commit | a3b0fa0d04cad5712f64e08463d0026f9890a37c (patch) | |
| tree | 1317a8a47c0e4bd1193c8fbf705d91ae75140f78 /ext/mbstring/mbstring.c | |
| parent | c175617b800536c08b593cf080f8120623cc009e (diff) | |
| parent | 0d7a6388663b76ebed6585ac92dfca5ef65fa7af (diff) | |
| download | php-git-a3b0fa0d04cad5712f64e08463d0026f9890a37c.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Adam Harvey (2) and others
# Via Adam Harvey (2) and others
* 'master' of https://git.php.net/repository/php-src:
Implement variadic function syntax
Added function opcache_compile_file() to load PHP scripts into cache without execution.
Fixed issue #135 (segfault in interned strings if initial memory is too low)
Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
Make message and format arguments const char * to avoid build warning about invalid cast.
Copy dba_*() keys before converting to string.
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 4e430b6ea2..168b133c64 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -402,10 +402,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_kana, 0, 0, 1) ZEND_ARG_INFO(0, encoding) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_variables, 1, 0, 3) +ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_convert_variables, 0, 0, 3) ZEND_ARG_INFO(0, to) ZEND_ARG_INFO(0, from) - ZEND_ARG_INFO(1, ...) + ZEND_ARG_VARIADIC_INFO(1, vars) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_encode_numericentity, 0, 0, 2) |