nlopess         Sun Oct  7 13:57:10 2007 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/ext/pcre/tests     bug42737.phpt 

  Modified files:              
    /php-src    NEWS 
    /php-src/ext/pcre   php_pcre.c 
  Log:
  Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.24&r2=1.2027.2.547.2.965.2.25&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.24 
php-src/NEWS:1.2027.2.547.2.965.2.25
--- php-src/NEWS:1.2027.2.547.2.965.2.24        Sun Oct  7 11:51:35 2007
+++ php-src/NEWS        Sun Oct  7 13:57:09 2007
@@ -43,6 +43,7 @@
   class). (Dmitry)
 - Fixed bug #42798 (__autoload() not triggered for classes used in method
   signature). (Dmitry)
+- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines). 
(Nuno)
 - Fixed bug #42657 (ini_get() returns incorrect value when default is NULL).
   (Jani)
 - Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.5&r2=1.168.2.9.2.21.2.6&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.21.2.5 
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.6
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.5      Sun Oct  7 12:20:11 2007
+++ php-src/ext/pcre/php_pcre.c Sun Oct  7 13:57:10 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.5 2007/10/07 12:20:11 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.6 2007/10/07 13:57:10 nlopess 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;
                                                }
                                        }

http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug42737.phpt?view=markup&rev=1.1
Index: php-src/ext/pcre/tests/bug42737.phpt
+++ php-src/ext/pcre/tests/bug42737.phpt

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to