Author: adamg Date: Fri Feb 26 08:54:36 2010 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- updated to 5.2.13
---- Files affected:
packages/php:
suhosin.patch (1.2 -> 1.2.2.1)
---- Diffs:
================================================================
Index: packages/php/suhosin.patch
diff -u packages/php/suhosin.patch:1.2 packages/php/suhosin.patch:1.2.2.1
--- packages/php/suhosin.patch:1.2 Tue May 19 18:28:27 2009
+++ packages/php/suhosin.patch Fri Feb 26 09:54:30 2010
@@ -2582,15 +2582,15 @@
}
+#if SUHOSIN_PATCH
+#if ZEND_DEBUG
-+ php_printf("PHP %s with
Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP
Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__,
__TIME__, get_zend_version());
++ php_printf("PHP %s with
Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2010 The PHP
Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__,
__TIME__, get_zend_version());
+#else
-+ php_printf("PHP %s with
Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP
Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__,
__TIME__, get_zend_version());
++ php_printf("PHP %s with
Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2010 The PHP
Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__,
__TIME__, get_zend_version());
+#endif
+#else
#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built:
%s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built:
%s %s) (DEBUG)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
- php_printf("PHP %s (%s) (built:
%s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built:
%s %s)\nCopyright (c) 1997-2010 The PHP Group\n%s", PHP_VERSION,
sapi_module.name, __DATE__, __TIME__, get_zend_version());
#endif
+#endif
php_request_shutdown((void *)
0);
@@ -2603,13 +2603,13 @@
}
request_started = 1;
-- php_printf("PHP %s (%s) (built: %s %s)
%s\nCopyright (c) 1997-2009 The PHP Group\n%s",
+- php_printf("PHP %s (%s) (built: %s %s)
%s\nCopyright (c) 1997-2010 The PHP Group\n%s",
- PHP_VERSION, sapi_module.name,
__DATE__, __TIME__,
+#if SUHOSIN_PATCH
-+ php_printf("PHP %s with Suhosin-Patch %s (%s)
(built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
++ php_printf("PHP %s with Suhosin-Patch %s (%s)
(built: %s %s) %s\nCopyright (c) 1997-2010 The PHP Group\n%s",
+ PHP_VERSION, SUHOSIN_PATCH_VERSION,
+#else
-+ php_printf("PHP %s (%s) (built: %s %s)
%s\nCopyright (c) 1997-2009 The PHP Group\n%s",
++ php_printf("PHP %s (%s) (built: %s %s)
%s\nCopyright (c) 1997-2010 The PHP Group\n%s",
+ PHP_VERSION,
+#endif
+ sapi_module.name, __DATE__, __TIME__,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/suhosin.patch?r1=1.2&r2=1.2.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
