Skip to content

Commit bd85651

Browse files
committed
hard-coded PREG_SPLIT_DELIM_CAPTURE is now removed
1 parent a3c40c1 commit bd85651

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

dql_tokenizer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static void _dql_clause_explode_non_quoted(zval *this_ptr, zval *return_value, c
108108
MAKE_STD_ZVAL(pattern); ZVAL_STRING(pattern, regexp, 1);
109109
MAKE_STD_ZVAL(input); ZVAL_STRING(input, str, 1);
110110
MAKE_STD_ZVAL(limit); ZVAL_LONG(limit, -1);
111-
MAKE_STD_ZVAL(flags); ZVAL_LONG(flags, 2); /* PREG_SPLIT_DELIM_CAPTURE */
111+
MAKE_STD_ZVAL(flags); ZVAL_LONG(flags, PHP_DQL_PREG_SPLIT_DELIM_CAPTURE);
112112
MAKE_STD_ZVAL(tmp);
113113

114114
zend_function *func; PHP_DQL_FUNC4(preg_split, tmp, this_ptr, pattern, input, limit, flags);
@@ -162,7 +162,7 @@ static void _dql_quoted_string_explode(zval *this_ptr, zval *return_value, char
162162

163163
MAKE_STD_ZVAL(input); ZVAL_STRING(input, str, 1);
164164
MAKE_STD_ZVAL(limit); ZVAL_LONG(limit, -1);
165-
MAKE_STD_ZVAL(flags); ZVAL_LONG(flags, 2); /* PREG_SPLIT_DELIM_CAPTURE */
165+
MAKE_STD_ZVAL(flags); ZVAL_LONG(flags, PHP_DQL_PREG_SPLIT_DELIM_CAPTURE);
166166
MAKE_STD_ZVAL(tmp);
167167

168168
zend_function *func; PHP_DQL_FUNC4(preg_split, tmp, this_ptr, pattern, input, limit, flags);

php_dql_tokenizer.h

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
extern zend_module_entry dql_tokenizer_module_entry;
3131
#define phpext_dql_tokenizer_ptr &dql_tokenizer_module_entry
3232

33+
/* See ext/pcre/php_pcre.c */
34+
#define PHP_DQL_PREG_SPLIT_DELIM_CAPTURE (1<<1)
35+
3336
/*
3437
For keeping compatible with PHP 5.2
3538
*/

0 commit comments

Comments
 (0)