Created
March 18, 2013 10:58
-
-
Save nasieti/5186433 to your computer and use it in GitHub Desktop.
this just solves conflicts in the patch caused by year-numbering changes in footers of the php code.the original php 5.3.9 patch then applies cleanly onto vanilla 5.3.28 http://www.hardened-php.net/suhosin/
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- suhosin-patch-5.3.9-0.9.10.patch 2012-01-11 22:05:08.000000000 +0100 | |
| +++ suhosin-patch-5.3.22-0.9.10.patch 2013-03-08 20:20:46.000000000 +0100 | |
| @@ -5701,21 +5701,21 @@ | |
| diff -Nura php-5.3.9/sapi/cgi/cgi_main.c suhosin-patch-5.3.9-0.9.10/sapi/cgi/cgi_main.c | |
| --- php-5.3.9/sapi/cgi/cgi_main.c 2012-01-01 14:15:04.000000000 +0100 | |
| +++ suhosin-patch-5.3.9-0.9.10/sapi/cgi/cgi_main.c 2012-01-11 19:36:52.000000000 +0100 | |
| -@@ -1932,11 +1932,19 @@ | |
| +@@ -1955,11 +1955,19 @@ | |
| SG(headers_sent) = 1; | |
| SG(request_info).no_headers = 1; | |
| } | |
| +#if SUHOSIN_PATCH | |
| +#if ZEND_DEBUG | |
| -+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| +#else | |
| -+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_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-2012 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-2013 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-2012 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-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| #endif | |
| +#endif | |
| php_request_shutdown((void *) 0); | |
| @@ -5728,12 +5728,12 @@ | |
| } | |
| request_started = 1; | |
| -- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s", | |
| +- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s", | |
| + php_printf("PHP %s " | |
| +#if SUHOSIN_PATCH | |
| + "with Suhosin-Patch " | |
| +#endif | |
| -+ "(%s) (built: %s %s) %s\nCopyright (c) 1997-2012 The PHP Group\n%s", | |
| ++ "(%s) (built: %s %s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s", | |
| PHP_VERSION, sapi_module.name, __DATE__, __TIME__, | |
| #if ZEND_DEBUG && defined(HAVE_GCOV) | |
| "(DEBUG GCOV)", | |
| @@ -5746,15 +5746,15 @@ | |
| if (php_request_startup(TSRMLS_C) != FAILURE) { | |
| +#if SUHOSIN_PATCH | |
| + #if ZEND_DEBUG | |
| -+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| + #else | |
| -+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2011 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_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-2004 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-2013 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-2004 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-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| #endif | |
| +#endif | |
| #ifdef PHP_OUTPUT_NEWAPI | |
| @@ -5768,9 +5768,9 @@ | |
| SG(headers_sent) = 1; | |
| SG(request_info).no_headers = 1; | |
| +#if SUHOSIN_PATCH | |
| -+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2012 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| ++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2013 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-2012 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-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); | |
| +#endif | |
| php_end_ob_buffers(1 TSRMLS_CC); | |
| exit(1); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment