diff options
| author | Remi Collet <remi@php.net> | 2017-05-29 09:54:29 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-05-29 09:54:29 +0200 |
| commit | 7bb6b6b6d248908e22af72fe40ed888a4ddb295e (patch) | |
| tree | 196df79308b8daf40a40ced7a662b25a102e9cb3 /ext/pcre/php_pcre.c | |
| parent | 286ee990888cf13deda43ecef7bb50e2537696d1 (diff) | |
| parent | 2a64f548daebfefe5fe5acd99a00ead3d526454c (diff) | |
| download | php-git-7bb6b6b6d248908e22af72fe40ed888a4ddb295e.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (150 commits)
Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
Fixed typo
fix typo
fix resetting cursor data if dba_firstkey failed
fix wrong define
fix c/p issue
enable ext/dba on AppVeyor
implement support for LMDB in ext/dba
fix identiation
Bugfix #74556 stream_socket_get_name() returns empty string
Fix abstract name handling to be binary safe
Added more EXIF MAKERNOTE formats: - AGFA, - Kyocera - Ricoh - Epson
Replace slow generic sha3 implementation by https://github.com/gvanas/KeccakCodePackage
Bugfix #74598 ftp:// ignores context
Improve conditions and visibility
[ci skip] update NEWS
Fix test
Fixed bug #72885 flatfile: dba_fetch() fails to read replaced entry
Update NEWS
...
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 0890e5247e..324a4acbfb 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -677,7 +677,7 @@ static void php_do_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) /* {{{ * Z_PARAM_STR(regex) Z_PARAM_STR(subject) Z_PARAM_OPTIONAL - Z_PARAM_ZVAL_EX(subpats, 0, 1) + Z_PARAM_ZVAL_DEREF(subpats) Z_PARAM_LONG(flags) Z_PARAM_LONG(start_offset) ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); @@ -1613,7 +1613,7 @@ static PHP_FUNCTION(preg_replace) Z_PARAM_ZVAL(subject) Z_PARAM_OPTIONAL Z_PARAM_LONG(limit) - Z_PARAM_ZVAL_EX(zcount, 0, 1) + Z_PARAM_ZVAL_DEREF(zcount) ZEND_PARSE_PARAMETERS_END(); if (Z_TYPE_P(replace) == IS_ARRAY && Z_TYPE_P(regex) != IS_ARRAY) { @@ -1645,7 +1645,7 @@ static PHP_FUNCTION(preg_replace_callback) Z_PARAM_ZVAL(subject) Z_PARAM_OPTIONAL Z_PARAM_LONG(limit) - Z_PARAM_ZVAL_EX(zcount, 0, 1) + Z_PARAM_ZVAL_DEREF(zcount) ZEND_PARSE_PARAMETERS_END(); if (!zend_is_callable(replace, 0, &callback_name)) { @@ -1680,7 +1680,7 @@ static PHP_FUNCTION(preg_replace_callback_array) Z_PARAM_ZVAL(subject) Z_PARAM_OPTIONAL Z_PARAM_LONG(limit) - Z_PARAM_ZVAL_EX(zcount, 0, 1) + Z_PARAM_ZVAL_DEREF(zcount) ZEND_PARSE_PARAMETERS_END(); ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(pattern), str_idx, replace) { @@ -1741,7 +1741,7 @@ static PHP_FUNCTION(preg_filter) Z_PARAM_ZVAL(subject) Z_PARAM_OPTIONAL Z_PARAM_LONG(limit) - Z_PARAM_ZVAL_EX(zcount, 0, 1) + Z_PARAM_ZVAL_DEREF(zcount) ZEND_PARSE_PARAMETERS_END(); if (Z_TYPE_P(replace) == IS_ARRAY && Z_TYPE_P(regex) != IS_ARRAY) { |