nlopess Wed Jan 28 22:39:33 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pcre/tests bug47229.phpt
Modified files:
/php-src/ext/pcre php_pcre.c
/php-src/ext/pcre/tests preg_quote_basic.phpt
Log:
fix bug #47229: preg_quote should escape '-'
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.21.2.29&r2=1.168.2.9.2.21.2.30&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.29
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.30
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.21.2.29 Wed Dec 31 11:15:40 2008
+++ php-src/ext/pcre/php_pcre.c Wed Jan 28 22:39:30 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.29 2008/12/31 11:15:40 sebastian Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.21.2.30 2009/01/28 22:39:30 nlopess Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1661,6 +1661,7 @@
case '<':
case '|':
case ':':
+ case '-':
*q++ = '\\';
*q++ = c;
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_basic.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/pcre/tests/preg_quote_basic.phpt
diff -u php-src/ext/pcre/tests/preg_quote_basic.phpt:1.1.4.2
php-src/ext/pcre/tests/preg_quote_basic.phpt:1.1.4.3
--- php-src/ext/pcre/tests/preg_quote_basic.phpt:1.1.4.2 Wed Nov 21
18:22:01 2007
+++ php-src/ext/pcre/tests/preg_quote_basic.phpt Wed Jan 28 22:39:33 2009
@@ -17,7 +17,7 @@
--EXPECT--
$string_before looks like: /this *-has \ metacharacters^ in $
-$string_after looks like: \/this \*-has \\ metacharacters\^ in \$, with
metacharacters and / (set as delimiter) escaped
+$string_after looks like: \/this \*\-has \\ metacharacters\^ in \$, with
metacharacters and / (set as delimiter) escaped
int(1)
array(1) {
[0]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug47229.phpt?view=markup&rev=1.1
Index: php-src/ext/pcre/tests/bug47229.phpt
+++ php-src/ext/pcre/tests/bug47229.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
