MFH: Fix for bug #42737 (and #45850)

diff --git a/NEWS b/NEWS
index 471b3a3ce4b955fa8f9d6a47cc620d867eebee97..45bfef2111019aa9da8b97960cdf9d426dca2476 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,7 @@ PHP                                                                        NEWS
   (Felipe)
 
 - Added "PHP_INI_SCAN_DIR" environment variable which can be used to either
-  disable or change the compile time ini scan directory (FR 45114). (Jani)
+  disable or change the compile time ini scan directory (FR #45114). (Jani)
 
 - Fixed security issues detailed in CVE-2008-2665 and CVE-2008-2666.
   (Christian Hoffmann)
@@ -80,6 +80,8 @@ PHP                                                                        NEWS
   (Jani)
 - Fixed bug #43993 (mb_substr_count() behaves differently to substr_count() with
   overlapping needles). (Moriyoshi)
+- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
+  (Nuno)
 - Fixed bug #42604 ("make test" fails with --with-config-file-scan-dir=path).
   (Jani)
 - Fixed bug #41348 (OCI8: allow compilation with Oracle 8.1). (Chris Jones)

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index bbb67ab69393b689d0193f9de53d8362c7e412bc..3accfdd59ca1328eb5d0852c553eb715316ec204 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1528,7 +1528,7 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, char *subject, int subjec
                                        if (re_bump == NULL) {
                                                int dummy;
 
-                                               if ((re_bump = pcre_get_compiled_regex("/./u", &extra_bump, &dummy TSRMLS_CC)) == NULL) {
+                                               if ((re_bump = pcre_get_compiled_regex("/./us", &extra_bump, &dummy TSRMLS_CC)) == NULL) {
                                                        RETURN_FALSE;
                                                }
                                        }