Index: trunk/server/common/patches/php-cve-2012-1823.patch
===================================================================
--- trunk/server/common/patches/php-cve-2012-1823.patch	(revision 2200)
+++ 	(revision )
@@ -1,20 +1,0 @@
---- sapi/cgi/cgi_main.c.orig	2012-05-03 14:33:04.243763906 -0400
-+++ sapi/cgi/cgi_main.c	2012-05-03 14:34:03.294241200 -0400
-@@ -1552,7 +1552,7 @@
- 		}
- 	}
- 
--	while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
-+	if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) {
- 		switch (c) {
- 			case 'c':
- 				if (cgi_sapi_module.php_ini_path_override) {
-@@ -1801,7 +1801,7 @@
- 	}
- 
- 	zend_first_try {
--		while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) {
-+		if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) {
- 			switch (c) {
- 				case 'T':
- 					benchmark = 1;