mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
# Sometimes i hate CVS and have no idea what it is doing
This commit is contained in:
parent
bec72dba2a
commit
b85fbd19ea
@ -1443,13 +1443,8 @@ SPL_METHOD(RegexIterator, accept)
|
||||
}
|
||||
zval_ptr_dtor(&intern->current.data);
|
||||
MAKE_STD_ZVAL(intern->current.data);
|
||||
<<<<<<< spl_iterators.c
|
||||
php_pcre_match_impl(intern->u.regex.pce, subject, subject_len, &zcount,
|
||||
intern->current.data, intern->u.regex.mode == REGIT_MODE_ALL_MATCHES, intern->u.regex.use_flags, intern->u.regex.preg_flags, 0 TSRMLS_CC);
|
||||
=======
|
||||
php_pcre_match(regex, extra, subject, subject_len, &zcount,
|
||||
intern->current.data, intern->u.regex.mode == REGIT_MODE_ALL_MATCHES, 0, 0, 0, 0 TSRMLS_CC);
|
||||
>>>>>>> 1.141
|
||||
count = zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
|
||||
RETVAL_BOOL(count > 0);
|
||||
break;
|
||||
@ -1461,11 +1456,7 @@ SPL_METHOD(RegexIterator, accept)
|
||||
}
|
||||
zval_ptr_dtor(&intern->current.data);
|
||||
MAKE_STD_ZVAL(intern->current.data);
|
||||
<<<<<<< spl_iterators.c
|
||||
php_pcre_split_impl(intern->u.regex.pce, subject, subject_len, intern->current.data, -1, intern->u.regex.preg_flags TSRMLS_CC);
|
||||
=======
|
||||
php_pcre_split(regex, extra, subject, subject_len, intern->current.data, 0, -1, 0, 0, 0 TSRMLS_CC);
|
||||
>>>>>>> 1.141
|
||||
count = zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
|
||||
RETVAL_BOOL(count > 1);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user