diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-03-31 13:35:50 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-03-31 13:35:50 +0200 |
| commit | 2733420f82a1ec5a6c8f1c1721efb0d5e186c0e9 (patch) | |
| tree | d94975602150944a5e829bb559130acc2f58118e /ext/pcre/php_pcre.c | |
| parent | 2c78b80e1e7656fd5bbed3a35ca8c3d8be213f15 (diff) | |
| parent | d8b7728b0e1306ccdfc346beaee8091abd930c03 (diff) | |
| download | php-git-2733420f82a1ec5a6c8f1c1721efb0d5e186c0e9.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77827: preg_match does not ignore \r in regex flags
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index a132e7f611..55864206c8 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -731,6 +731,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) case ' ': case '\n': + case '\r': break; default: |