jani Wed Aug 20 00:52:13 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/pcre php_pcre.c
Log:
MFH: Fix for bug #42737 (and #45850)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1201&r2=1.2027.2.547.2.1202&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1201 php-src/NEWS:1.2027.2.547.2.1202
--- php-src/NEWS:1.2027.2.547.2.1201 Mon Aug 18 14:32:58 2008
+++ php-src/NEWS Wed Aug 20 00:52:12 2008
@@ -5,7 +5,7 @@
(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 @@
(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)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.26&r2=1.168.2.9.2.27&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.26
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.27
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.26 Fri Aug 8 09:34:08 2008
+++ php-src/ext/pcre/php_pcre.c Wed Aug 20 00:52:13 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.26 2008/08/08 09:34:08 lbarnaud Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.27 2008/08/20 00:52:13 jani Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1528,7 +1528,7 @@
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;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
