From: Jani Taskinen <jani@php.net>
Date: Wed, 20 Aug 2008 00:52:13 +0000 (+0000)
Subject: MFH: Fix for bug #42737 (and #45850)
X-Git-Tag: php-5.2.7RC1~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81d5bba9365dc1ff6b790bc16ba00211139f09e8;p=php

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

diff --git a/NEWS b/NEWS
index 471b3a3ce4..45bfef2111 100644
--- 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 bbb67ab693..3accfdd59c 100644
--- 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;
 						}
 					}