diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-09-01 12:51:48 -0700 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-09-03 01:52:12 +0200 |
| commit | a4c64d152cee3f71fd931b18ef4b8a540337ee72 (patch) | |
| tree | fd9ab117d5d1bc677e4e56f8db320f260c3536a9 /ext/pcre/php_pcre.c | |
| parent | 8b218b5aa88770e5829296fb8875248cd8f11016 (diff) | |
| download | php-git-a4c64d152cee3f71fd931b18ef4b8a540337ee72.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
More fixes for bug #70219
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 36d913d4df..554693d175 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -577,7 +577,7 @@ static void php_do_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) /* {{{ * } pce->refcount++; - php_pcre_match_impl(pce, subject, subject_len, return_value, subpats, + php_pcre_match_impl(pce, subject, subject_len, return_value, subpats, global, ZEND_NUM_ARGS() >= 4, flags, start_offset TSRMLS_CC); pce->refcount--; } |