diff options
| author | Andrei Zmievski <andrei@php.net> | 2000-06-12 19:55:58 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2000-06-12 19:55:58 +0000 |
| commit | 7ef638aa30a08fa63027402777b5e4f79339b264 (patch) | |
| tree | 59781ddba6b283c88e037c2399cfa5b69bac9604 /ext/pcre/php_pcre.c | |
| parent | 318a59d3020007f4fa9cf1af447062337d171e99 (diff) | |
| download | php-git-7ef638aa30a08fa63027402777b5e4f79339b264.tar.gz | |
@- Upgraded PCRE to version 3.2 and fixed a bug when anchored pattern
@ matched an empty string. (Andrei)
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 2ab781221c..62271ef142 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -476,7 +476,7 @@ static void php_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) This turns out to be rather cunning. First we set PCRE_NOTEMPTY and try the match again at the same point. If this fails (picked up above) we advance to the next character. */ - g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY : 0; + g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY | PCRE_ANCHORED : 0; /* Advance to the position right after the last full match */ start_offset = offsets[1]; @@ -748,7 +748,7 @@ char *php_pcre_replace(char *regex, int regex_len, This turns out to be rather cunning. First we set PCRE_NOTEMPTY and try the match again at the same point. If this fails (picked up above) we advance to the next character. */ - g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY : 0; + g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY | PCRE_ANCHORED : 0; /* Advance to the next piece */ start_offset = offsets[1]; @@ -769,7 +769,7 @@ static char *php_replace_in_subject(zval *regex, zval *replace, zval **subject, *subject_value, *result; int subject_len, - replace_len; + replace_len = 0; /* Make sure we're dealing with strings. */ convert_to_string_ex(subject); @@ -1016,7 +1016,7 @@ PHP_FUNCTION(preg_split) This turns out to be rather cunning. First we set PCRE_NOTEMPTY and try the match again at the same point. If this fails (picked up above) we advance to the next character. */ - g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY : 0; + g_notempty = (offsets[1] == offsets[0])? PCRE_NOTEMPTY | PCRE_ANCHORED : 0; /* Advance to the position right after the last full match */ start_offset = offsets[1]; @@ -1104,7 +1104,7 @@ PHP_FUNCTION(preg_quote) break; default: - if (c == delim_char && quote_delim) + if (quote_delim && c == delim_char) *q++ = '\\'; *q++ = c; break; |