[Secure-testing-commits] r5720 - data/patches/MOPB

[Sean Finney]

Author: seanius
Date: 2007-04-23 21:18:27 +0000 (Mon, 23 Apr 2007)
New Revision: 5720

Modified:
   data/patches/MOPB/MOPB-45-php5.diff
Log:
fixed version for mopb 45

Modified: data/patches/MOPB/MOPB-45-php5.diff
===================================================================
--- data/patches/MOPB/MOPB-45-php5.diff	2007-04-23 20:05:36 UTC (rev 5719)
+++ data/patches/MOPB/MOPB-45-php5.diff	2007-04-23 21:18:27 UTC (rev 5720)
@@ -1,12 +1,13 @@
-diff -uNrp php5-5.2.1/ext/filter/logical_filters.c php5-5.2.1-kees/ext/filter/logical_filters.c
---- php5-5.2.1/ext/filter/logical_filters.c	2007-01-01 01:36:00.000000000 -0800
-+++ php5-5.2.1-kees/ext/filter/logical_filters.c	2007-04-18 17:27:58.000000000 -0700
-@@ -473,7 +473,7 @@ void php_filter_validate_email(PHP_INPUT
+Index: php5-5.2.0/ext/filter/logical_filters.c
+===================================================================
+--- php5-5.2.0.orig/ext/filter/logical_filters.c	2006-10-17 17:26:14.000000000 +0200
++++ php5-5.2.0/ext/filter/logical_filters.c	2007-04-23 23:10:52.000000000 +0200
+@@ -500,7 +500,7 @@
+ void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
+ {
+ 	/* From http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
+-	const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\v\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/";
++	const char regexp[] = "/^((\\\"[^\\\"\\f\\n\\r\\t\\v\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/D";
  
  	pcre       *re = NULL;
  	pcre_extra *pcre_extra = NULL;
--	int preg_options = 0;
-+	int preg_options = PCRE_DOLLAR_ENDONLY;
- 	int         ovector[150]; /* Needs to be a multiple of 3 */
- 	int         matches;
-