--- suhosin-patch-5.2.7-0.9.6.3.patch 2009-03-01 18:38:51.166265009 +0200 +++ suhosin-patch-5.2.9-0.9.6.3.patch 2009-03-01 17:35:08.733017001 +0200 @@ -1,6 +1,6 @@ -diff -Nura php-5.2.7/TSRM/TSRM.h suhosin-patch-5.2.7-0.9.6.3/TSRM/TSRM.h ---- php-5.2.7/TSRM/TSRM.h 2007-12-31 08:20:02.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/TSRM/TSRM.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/TSRM/TSRM.h suhosin-patch-5.2.9-0.9.6.3/TSRM/TSRM.h +--- php-5.2.9/TSRM/TSRM.h 2007-12-31 08:20:02.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/TSRM/TSRM.h 2008-12-04 08:17:55.000000000 +0100 @@ -38,6 +38,13 @@ typedef unsigned long tsrm_uintptr_t; #endif @@ -23,9 +23,9 @@ #ifdef __cplusplus extern "C" { #endif -diff -Nura php-5.2.7/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.7-0.9.6.3/TSRM/tsrm_virtual_cwd.c ---- php-5.2.7/TSRM/tsrm_virtual_cwd.c 2008-05-20 09:41:23.000000000 +0200 -+++ suhosin-patch-5.2.7-0.9.6.3/TSRM/tsrm_virtual_cwd.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.9-0.9.6.3/TSRM/tsrm_virtual_cwd.c +--- php-5.2.9/TSRM/tsrm_virtual_cwd.c 2008-05-20 09:41:23.000000000 +0200 ++++ suhosin-patch-5.2.9-0.9.6.3/TSRM/tsrm_virtual_cwd.c 2008-12-04 08:17:55.000000000 +0100 @@ -273,6 +273,178 @@ } /* }}} */ @@ -205,9 +205,9 @@ CWD_API void virtual_cwd_startup(void) /* {{{ */ { char cwd[MAXPATHLEN]; -diff -Nura php-5.2.7/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.7-0.9.6.3/TSRM/tsrm_virtual_cwd.h ---- php-5.2.7/TSRM/tsrm_virtual_cwd.h 2007-12-31 08:20:02.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/TSRM/tsrm_virtual_cwd.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.9-0.9.6.3/TSRM/tsrm_virtual_cwd.h +--- php-5.2.9/TSRM/tsrm_virtual_cwd.h 2007-12-31 08:20:02.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/TSRM/tsrm_virtual_cwd.h 2008-12-04 08:17:55.000000000 +0100 @@ -139,6 +139,22 @@ typedef int (*verify_path_func)(const cwd_state *); @@ -231,9 +231,9 @@ CWD_API void virtual_cwd_startup(void); CWD_API void virtual_cwd_shutdown(void); CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC); -diff -Nura php-5.2.7/Zend/Makefile.am suhosin-patch-5.2.7-0.9.6.3/Zend/Makefile.am ---- php-5.2.7/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/Makefile.am 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/Makefile.am suhosin-patch-5.2.9-0.9.6.3/Zend/Makefile.am +--- php-5.2.9/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/Makefile.am 2008-12-04 08:17:55.000000000 +0100 @@ -17,7 +17,7 @@ zend_objects_API.c zend_ts_hash.c zend_stream.c \ zend_default_classes.c \ @@ -243,9 +243,9 @@ libZend_la_LDFLAGS = libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ -diff -Nura php-5.2.7/Zend/Zend.dsp suhosin-patch-5.2.7-0.9.6.3/Zend/Zend.dsp ---- php-5.2.7/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/Zend.dsp 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/Zend.dsp suhosin-patch-5.2.9-0.9.6.3/Zend/Zend.dsp +--- php-5.2.9/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/Zend.dsp 2008-12-04 08:17:55.000000000 +0100 @@ -239,6 +239,10 @@ # End Source File # Begin Source File @@ -257,9 +257,9 @@ SOURCE=.\zend_ts_hash.c # End Source File # Begin Source File -diff -Nura php-5.2.7/Zend/ZendTS.dsp suhosin-patch-5.2.7-0.9.6.3/Zend/ZendTS.dsp ---- php-5.2.7/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/ZendTS.dsp 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/ZendTS.dsp suhosin-patch-5.2.9-0.9.6.3/Zend/ZendTS.dsp +--- php-5.2.9/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/ZendTS.dsp 2008-12-04 08:17:55.000000000 +0100 @@ -273,6 +273,10 @@ # End Source File # Begin Source File @@ -271,9 +271,9 @@ SOURCE=.\zend_ts_hash.c # End Source File # Begin Source File -diff -Nura php-5.2.7/Zend/zend.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend.c ---- php-5.2.7/Zend/zend.c 2007-12-31 08:20:02.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend.c suhosin-patch-5.2.9-0.9.6.3/Zend/zend.c +--- php-5.2.9/Zend/zend.c 2007-12-31 08:20:02.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend.c 2008-12-04 08:17:55.000000000 +0100 @@ -57,7 +57,9 @@ ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args); int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); @@ -374,9 +374,9 @@ STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals) #ifdef ZEND_MULTIBYTE STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals) -diff -Nura php-5.2.7/Zend/zend.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend.h ---- php-5.2.7/Zend/zend.h 2008-02-15 08:44:45.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend.h suhosin-patch-5.2.9-0.9.6.3/Zend/zend.h +--- php-5.2.9/Zend/zend.h 2008-02-15 08:44:45.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend.h 2008-12-04 08:17:55.000000000 +0100 @@ -532,6 +532,9 @@ extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC); extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); @@ -401,9 +401,9 @@ #endif /* ZEND_H */ /* -diff -Nura php-5.2.7/Zend/zend_alloc.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_alloc.c ---- php-5.2.7/Zend/zend_alloc.c 2008-10-30 09:55:09.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_alloc.c 2008-12-04 08:23:52.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_alloc.c suhosin-patch-5.2.9-0.9.6.3/Zend/zend_alloc.c +--- php-5.2.9/Zend/zend_alloc.c 2008-10-30 09:55:09.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_alloc.c 2008-12-04 08:23:52.000000000 +0100 @@ -311,13 +311,26 @@ #define MEM_BLOCK_GUARD 0x2A8FCC84 #define MEM_BLOCK_LEAK 0x6C5E8F2D @@ -677,9 +677,9 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) { char *tmp; -diff -Nura php-5.2.7/Zend/zend_alloc.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend_alloc.h ---- php-5.2.7/Zend/zend_alloc.h 2008-10-27 15:59:14.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_alloc.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_alloc.h suhosin-patch-5.2.9-0.9.6.3/Zend/zend_alloc.h +--- php-5.2.9/Zend/zend_alloc.h 2008-10-27 15:59:14.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_alloc.h 2008-12-04 08:17:55.000000000 +0100 @@ -129,6 +129,9 @@ ZEND_API void start_memory_manager(TSRMLS_D); @@ -690,9 +690,9 @@ ZEND_API int is_zend_mm(TSRMLS_D); #if ZEND_DEBUG -diff -Nura php-5.2.7/Zend/zend_canary.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_canary.c ---- php-5.2.7/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_canary.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_canary.c suhosin-patch-5.2.9-0.9.6.3/Zend/zend_canary.c +--- php-5.2.9/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_canary.c 2008-12-04 08:17:55.000000000 +0100 @@ -0,0 +1,64 @@ +/* + +----------------------------------------------------------------------+ @@ -758,9 +758,9 @@ + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ -diff -Nura php-5.2.7/Zend/zend_compile.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_compile.c ---- php-5.2.7/Zend/zend_compile.c 2008-11-23 21:36:31.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_compile.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_compile.c suhosin-patch-5.2.9-0.9.6.3/Zend/zend_compile.c +--- php-5.2.9/Zend/zend_compile.c 2008-11-23 21:36:31.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_compile.c 2008-12-04 08:17:55.000000000 +0100 @@ -54,7 +54,6 @@ property_info->name = zend_strndup(property_info->name, property_info->name_length); } @@ -780,9 +780,9 @@ static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC) { -diff -Nura php-5.2.7/Zend/zend_compile.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend_compile.h ---- php-5.2.7/Zend/zend_compile.h 2008-07-24 13:47:12.000000000 +0200 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_compile.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_compile.h suhosin-patch-5.2.9-0.9.6.3/Zend/zend_compile.h +--- php-5.2.9/Zend/zend_compile.h 2008-07-24 13:47:12.000000000 +0200 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_compile.h 2008-12-04 08:17:55.000000000 +0100 @@ -564,6 +564,11 @@ int zendlex(znode *zendlval TSRMLS_DC); @@ -803,9 +803,9 @@ END_EXTERN_C() #define ZEND_CLONE_FUNC_NAME "__clone" -diff -Nura php-5.2.7/Zend/zend_constants.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_constants.c ---- php-5.2.7/Zend/zend_constants.c 2008-02-19 13:00:36.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_constants.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_constants.c suhosin-patch-5.2.9-0.9.6.3/Zend/zend_constants.c +--- php-5.2.9/Zend/zend_constants.c 2008-02-19 13:00:36.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_constants.c 2008-12-04 08:17:55.000000000 +0100 @@ -110,6 +110,75 @@ REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS); @@ -882,9 +882,9 @@ /* true/false constants */ { -diff -Nura php-5.2.7/Zend/zend_errors.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend_errors.h ---- php-5.2.7/Zend/zend_errors.h 2007-12-31 08:20:02.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_errors.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_errors.h suhosin-patch-5.2.9-0.9.6.3/Zend/zend_errors.h +--- php-5.2.9/Zend/zend_errors.h 2007-12-31 08:20:02.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_errors.h 2008-12-04 08:17:55.000000000 +0100 @@ -39,6 +39,20 @@ #define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR) #define E_CORE (E_CORE_ERROR | E_CORE_WARNING) @@ -906,9 +906,9 @@ #endif /* ZEND_ERRORS_H */ /* -diff -Nura php-5.2.7/Zend/zend_hash.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_hash.c ---- php-5.2.7/Zend/zend_hash.c 2007-12-31 08:20:02.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_hash.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_hash.c suhosin-patch-5.2.9-0.9.6.3/Zend/zend_hash.c +--- php-5.2.9/Zend/zend_hash.c 2007-12-31 08:20:02.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_hash.c 2008-12-04 08:17:55.000000000 +0100 @@ -20,6 +20,7 @@ /* $Id: zend_hash.c,v 1.121.2.4.2.9 2007/12/31 07:20:02 sebastian Exp $ */ @@ -1174,9 +1174,9 @@ if (ht->pDestructor) { ht->pDestructor(p->pData); } -diff -Nura php-5.2.7/Zend/zend_llist.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_llist.c ---- php-5.2.7/Zend/zend_llist.c 2007-12-31 08:20:03.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/Zend/zend_llist.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/Zend/zend_llist.c suhosin-patch-5.2.9-0.9.6.3/Zend/zend_llist.c +--- php-5.2.9/Zend/zend_llist.c 2007-12-31 08:20:03.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/Zend/zend_llist.c 2008-12-04 08:17:55.000000000 +0100 @@ -23,6 +23,184 @@ #include "zend_llist.h" #include "zend_qsort.h" @@ -1394,9 +1394,9 @@ if ((old_tail = l->tail)) { if (old_tail->prev) { old_tail->prev->next = NULL; -diff -Nura php-5.2.7/configure suhosin-patch-5.2.7-0.9.6.3/configure ---- php-5.2.7/configure 2008-12-03 17:07:36.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/configure 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/configure suhosin-patch-5.2.9-0.9.6.3/configure +--- php-5.2.9/configure 2008-12-03 17:07:36.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/configure 2008-12-04 08:17:55.000000000 +0100 @@ -18575,6 +18575,9 @@ fi @@ -1425,9 +1425,9 @@ IFS=. set $ac_src -diff -Nura php-5.2.7/configure.in suhosin-patch-5.2.7-0.9.6.3/configure.in ---- php-5.2.7/configure.in 2008-12-03 16:54:02.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/configure.in 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/configure.in suhosin-patch-5.2.9-0.9.6.3/configure.in +--- php-5.2.9/configure.in 2008-12-03 16:54:02.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/configure.in 2008-12-04 08:17:55.000000000 +0100 @@ -257,6 +257,7 @@ sinclude(TSRM/threads.m4) sinclude(TSRM/tsrm.m4) @@ -1454,9 +1454,9 @@ if test -r "$abs_srcdir/Zend/zend_objects.c"; then PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c) -diff -Nura php-5.2.7/ext/standard/basic_functions.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/basic_functions.c ---- php-5.2.7/ext/standard/basic_functions.c 2008-11-29 00:27:46.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/ext/standard/basic_functions.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/ext/standard/basic_functions.c suhosin-patch-5.2.9-0.9.6.3/ext/standard/basic_functions.c +--- php-5.2.9/ext/standard/basic_functions.c 2008-11-29 00:27:46.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/ext/standard/basic_functions.c 2008-12-04 08:17:55.000000000 +0100 @@ -3575,7 +3575,9 @@ PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data) @@ -1468,9 +1468,9 @@ #endif #ifdef HAVE_FNMATCH -diff -Nura php-5.2.7/ext/standard/dl.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/dl.c ---- php-5.2.7/ext/standard/dl.c 2007-12-31 08:20:12.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/ext/standard/dl.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/ext/standard/dl.c suhosin-patch-5.2.9-0.9.6.3/ext/standard/dl.c +--- php-5.2.9/ext/standard/dl.c 2007-12-31 08:20:12.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/ext/standard/dl.c 2008-12-04 08:17:55.000000000 +0100 @@ -246,6 +246,19 @@ RETURN_FALSE; } @@ -1491,9 +1491,9 @@ RETURN_TRUE; } /* }}} */ -diff -Nura php-5.2.7/ext/standard/file.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/file.c ---- php-5.2.7/ext/standard/file.c 2008-11-26 05:20:41.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/ext/standard/file.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/ext/standard/file.c suhosin-patch-5.2.9-0.9.6.3/ext/standard/file.c +--- php-5.2.9/ext/standard/file.c 2008-11-26 05:20:41.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/ext/standard/file.c 2008-12-04 08:17:55.000000000 +0100 @@ -2387,7 +2387,7 @@ #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS) /* {{{ proto string realpath(string path) @@ -1503,9 +1503,9 @@ { zval **path; char resolved_path_buff[MAXPATHLEN]; -diff -Nura php-5.2.7/ext/standard/file.h suhosin-patch-5.2.7-0.9.6.3/ext/standard/file.h ---- php-5.2.7/ext/standard/file.h 2007-12-31 08:20:12.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/ext/standard/file.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/ext/standard/file.h suhosin-patch-5.2.9-0.9.6.3/ext/standard/file.h +--- php-5.2.9/ext/standard/file.h 2007-12-31 08:20:12.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/ext/standard/file.h 2008-12-04 08:17:55.000000000 +0100 @@ -61,7 +61,7 @@ PHP_FUNCTION(fd_set); PHP_FUNCTION(fd_isset); @@ -1515,9 +1515,9 @@ #endif #ifdef HAVE_FNMATCH PHP_FUNCTION(fnmatch); -diff -Nura php-5.2.7/ext/standard/info.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/info.c ---- php-5.2.7/ext/standard/info.c 2008-08-13 03:01:28.000000000 +0200 -+++ suhosin-patch-5.2.7-0.9.6.3/ext/standard/info.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/ext/standard/info.c suhosin-patch-5.2.9-0.9.6.3/ext/standard/info.c +--- php-5.2.9/ext/standard/info.c 2008-08-13 03:01:28.000000000 +0200 ++++ suhosin-patch-5.2.9-0.9.6.3/ext/standard/info.c 2008-12-04 08:17:55.000000000 +0100 @@ -648,6 +648,31 @@ php_info_print_table_end(); @@ -1550,9 +1550,9 @@ /* Zend Engine */ php_info_print_box_start(0); if (expose_php && !sapi_module.phpinfo_as_text) { -diff -Nura php-5.2.7/ext/standard/syslog.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/syslog.c ---- php-5.2.7/ext/standard/syslog.c 2008-02-20 16:28:37.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/ext/standard/syslog.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/ext/standard/syslog.c suhosin-patch-5.2.9-0.9.6.3/ext/standard/syslog.c +--- php-5.2.9/ext/standard/syslog.c 2008-02-20 16:28:37.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/ext/standard/syslog.c 2008-12-04 08:17:55.000000000 +0100 @@ -42,6 +42,7 @@ */ PHP_MINIT_FUNCTION(syslog) @@ -1569,9 +1569,9 @@ BG(syslog_device)=NULL; return SUCCESS; -diff -Nura php-5.2.7/main/fopen_wrappers.c suhosin-patch-5.2.7-0.9.6.3/main/fopen_wrappers.c ---- php-5.2.7/main/fopen_wrappers.c 2008-08-11 17:33:14.000000000 +0200 -+++ suhosin-patch-5.2.7-0.9.6.3/main/fopen_wrappers.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/fopen_wrappers.c suhosin-patch-5.2.9-0.9.6.3/main/fopen_wrappers.c +--- php-5.2.9/main/fopen_wrappers.c 2008-08-11 17:33:14.000000000 +0200 ++++ suhosin-patch-5.2.9-0.9.6.3/main/fopen_wrappers.c 2008-12-04 08:17:55.000000000 +0100 @@ -110,7 +110,7 @@ /* normalize and expand path */ @@ -1649,9 +1649,9 @@ ptr = end; } -diff -Nura php-5.2.7/main/main.c suhosin-patch-5.2.7-0.9.6.3/main/main.c ---- php-5.2.7/main/main.c 2008-11-02 15:12:15.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/main.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/main.c suhosin-patch-5.2.9-0.9.6.3/main/main.c +--- php-5.2.9/main/main.c 2008-11-02 15:12:15.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/main.c 2008-12-04 08:17:55.000000000 +0100 @@ -89,6 +89,9 @@ #include "SAPI.h" @@ -1733,9 +1733,9 @@ core_globals_dtor(&core_globals TSRMLS_CC); #else zend_ini_global_shutdown(TSRMLS_C); -diff -Nura php-5.2.7/main/php.h suhosin-patch-5.2.7-0.9.6.3/main/php.h ---- php-5.2.7/main/php.h 2007-12-31 08:20:15.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/php.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/php.h suhosin-patch-5.2.9-0.9.6.3/main/php.h +--- php-5.2.9/main/php.h 2007-12-31 08:20:15.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/php.h 2008-12-04 08:17:55.000000000 +0100 @@ -40,6 +40,13 @@ #undef sprintf #define sprintf php_sprintf @@ -1761,9 +1761,9 @@ #endif /* -diff -Nura php-5.2.7/main/php_config.h.in suhosin-patch-5.2.7-0.9.6.3/main/php_config.h.in ---- php-5.2.7/main/php_config.h.in 2008-12-03 17:07:40.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/php_config.h.in 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/php_config.h.in suhosin-patch-5.2.9-0.9.6.3/main/php_config.h.in +--- php-5.2.9/main/php_config.h.in 2008-12-03 17:07:40.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/php_config.h.in 2008-12-04 08:17:55.000000000 +0100 @@ -806,6 +806,9 @@ /* Define if the target system has /dev/urandom device */ #undef HAVE_DEV_URANDOM @@ -1774,9 +1774,9 @@ /* Whether you have AOLserver */ #undef HAVE_AOLSERVER -diff -Nura php-5.2.7/main/php_logos.c suhosin-patch-5.2.7-0.9.6.3/main/php_logos.c ---- php-5.2.7/main/php_logos.c 2007-12-31 08:20:15.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/php_logos.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/php_logos.c suhosin-patch-5.2.9-0.9.6.3/main/php_logos.c +--- php-5.2.9/main/php_logos.c 2007-12-31 08:20:15.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/php_logos.c 2008-12-04 08:17:55.000000000 +0100 @@ -50,6 +50,10 @@ return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string)); } @@ -1798,9 +1798,9 @@ return SUCCESS; } -diff -Nura php-5.2.7/main/snprintf.c suhosin-patch-5.2.7-0.9.6.3/main/snprintf.c ---- php-5.2.7/main/snprintf.c 2008-09-15 13:47:03.000000000 +0200 -+++ suhosin-patch-5.2.7-0.9.6.3/main/snprintf.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/snprintf.c suhosin-patch-5.2.9-0.9.6.3/main/snprintf.c +--- php-5.2.9/main/snprintf.c 2008-09-15 13:47:03.000000000 +0200 ++++ suhosin-patch-5.2.9-0.9.6.3/main/snprintf.c 2008-12-04 08:17:55.000000000 +0100 @@ -1077,7 +1077,11 @@ @@ -1813,9 +1813,9 @@ goto skip_output; /* -diff -Nura php-5.2.7/main/spprintf.c suhosin-patch-5.2.7-0.9.6.3/main/spprintf.c ---- php-5.2.7/main/spprintf.c 2007-12-31 08:20:15.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/spprintf.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/spprintf.c suhosin-patch-5.2.9-0.9.6.3/main/spprintf.c +--- php-5.2.9/main/spprintf.c 2007-12-31 08:20:15.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/spprintf.c 2008-12-04 08:17:55.000000000 +0100 @@ -673,7 +673,11 @@ @@ -1828,9 +1828,9 @@ goto skip_output; /* -diff -Nura php-5.2.7/main/suhosin_globals.h suhosin-patch-5.2.7-0.9.6.3/main/suhosin_globals.h ---- php-5.2.7/main/suhosin_globals.h 1970-01-01 01:00:00.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/suhosin_globals.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/suhosin_globals.h suhosin-patch-5.2.9-0.9.6.3/main/suhosin_globals.h +--- php-5.2.9/main/suhosin_globals.h 1970-01-01 01:00:00.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/suhosin_globals.h 2008-12-04 08:17:55.000000000 +0100 @@ -0,0 +1,61 @@ +/* + +----------------------------------------------------------------------+ @@ -1893,9 +1893,9 @@ + * c-basic-offset: 4 + * End: + */ -diff -Nura php-5.2.7/main/suhosin_logo.h suhosin-patch-5.2.7-0.9.6.3/main/suhosin_logo.h ---- php-5.2.7/main/suhosin_logo.h 1970-01-01 01:00:00.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/suhosin_logo.h 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/suhosin_logo.h suhosin-patch-5.2.9-0.9.6.3/main/suhosin_logo.h +--- php-5.2.9/main/suhosin_logo.h 1970-01-01 01:00:00.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/suhosin_logo.h 2008-12-04 08:17:55.000000000 +0100 @@ -0,0 +1,178 @@ +static unsigned char suhosin_logo[] = + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48" @@ -2075,9 +2075,9 @@ + "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1" + "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9" + ; -diff -Nura php-5.2.7/main/suhosin_patch.c suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.c ---- php-5.2.7/main/suhosin_patch.c 1970-01-01 01:00:00.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.c 2008-12-04 08:17:55.000000000 +0100 +diff -Nura php-5.2.9/main/suhosin_patch.c suhosin-patch-5.2.9-0.9.6.3/main/suhosin_patch.c +--- php-5.2.9/main/suhosin_patch.c 1970-01-01 01:00:00.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/suhosin_patch.c 2008-12-04 08:17:55.000000000 +0100 @@ -0,0 +1,380 @@ +/* + +----------------------------------------------------------------------+ @@ -2459,9 +2459,9 @@ + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 + */ -diff -Nura php-5.2.7/main/suhosin_patch.h suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.h ---- php-5.2.7/main/suhosin_patch.h 1970-01-01 01:00:00.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.h 2008-12-04 08:20:50.000000000 +0100 +diff -Nura php-5.2.9/main/suhosin_patch.h suhosin-patch-5.2.9-0.9.6.3/main/suhosin_patch.h +--- php-5.2.9/main/suhosin_patch.h 1970-01-01 01:00:00.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/suhosin_patch.h 2008-12-04 08:20:50.000000000 +0100 @@ -0,0 +1,40 @@ +/* + +----------------------------------------------------------------------+ @@ -2503,9 +2503,9 @@ + * c-basic-offset: 4 + * End: + */ -diff -Nura php-5.2.7/main/suhosin_patch.m4 suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.m4 ---- php-5.2.7/main/suhosin_patch.m4 1970-01-01 01:00:00.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.m4 2008-12-04 08:17:56.000000000 +0100 +diff -Nura php-5.2.9/main/suhosin_patch.m4 suhosin-patch-5.2.9-0.9.6.3/main/suhosin_patch.m4 +--- php-5.2.9/main/suhosin_patch.m4 1970-01-01 01:00:00.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/main/suhosin_patch.m4 2008-12-04 08:17:56.000000000 +0100 @@ -0,0 +1,8 @@ +dnl +dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $ @@ -2515,9 +2515,9 @@ + +AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch]) + -diff -Nura php-5.2.7/sapi/apache/mod_php5.c suhosin-patch-5.2.7-0.9.6.3/sapi/apache/mod_php5.c ---- php-5.2.7/sapi/apache/mod_php5.c 2008-11-29 00:22:39.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/sapi/apache/mod_php5.c 2008-12-04 08:17:56.000000000 +0100 +diff -Nura php-5.2.9/sapi/apache/mod_php5.c suhosin-patch-5.2.9-0.9.6.3/sapi/apache/mod_php5.c +--- php-5.2.9/sapi/apache/mod_php5.c 2008-11-29 00:22:39.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/sapi/apache/mod_php5.c 2008-12-04 08:17:56.000000000 +0100 @@ -951,7 +951,11 @@ { TSRMLS_FETCH(); @@ -2530,9 +2530,9 @@ } } #endif -diff -Nura php-5.2.7/sapi/apache2filter/sapi_apache2.c suhosin-patch-5.2.7-0.9.6.3/sapi/apache2filter/sapi_apache2.c ---- php-5.2.7/sapi/apache2filter/sapi_apache2.c 2007-12-31 08:20:15.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/sapi/apache2filter/sapi_apache2.c 2008-12-04 08:17:56.000000000 +0100 +diff -Nura php-5.2.9/sapi/apache2filter/sapi_apache2.c suhosin-patch-5.2.9-0.9.6.3/sapi/apache2filter/sapi_apache2.c +--- php-5.2.9/sapi/apache2filter/sapi_apache2.c 2007-12-31 08:20:15.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/sapi/apache2filter/sapi_apache2.c 2008-12-04 08:17:56.000000000 +0100 @@ -562,7 +562,11 @@ { TSRMLS_FETCH(); @@ -2545,9 +2545,9 @@ } } -diff -Nura php-5.2.7/sapi/apache2handler/sapi_apache2.c suhosin-patch-5.2.7-0.9.6.3/sapi/apache2handler/sapi_apache2.c ---- php-5.2.7/sapi/apache2handler/sapi_apache2.c 2008-01-16 16:50:37.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/sapi/apache2handler/sapi_apache2.c 2008-12-04 08:17:56.000000000 +0100 +diff -Nura php-5.2.9/sapi/apache2handler/sapi_apache2.c suhosin-patch-5.2.9-0.9.6.3/sapi/apache2handler/sapi_apache2.c +--- php-5.2.9/sapi/apache2handler/sapi_apache2.c 2008-01-16 16:50:37.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/sapi/apache2handler/sapi_apache2.c 2008-12-04 08:17:56.000000000 +0100 @@ -370,7 +370,11 @@ { TSRMLS_FETCH(); @@ -2560,9 +2560,9 @@ } } -diff -Nura php-5.2.7/sapi/cgi/cgi_main.c suhosin-patch-5.2.7-0.9.6.3/sapi/cgi/cgi_main.c ---- php-5.2.7/sapi/cgi/cgi_main.c 2008-11-28 12:56:50.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/sapi/cgi/cgi_main.c 2008-12-04 08:17:56.000000000 +0100 +diff -Nura php-5.2.9/sapi/cgi/cgi_main.c suhosin-patch-5.2.9-0.9.6.3/sapi/cgi/cgi_main.c +--- php-5.2.9/sapi/cgi/cgi_main.c 2008-11-28 12:56:50.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/sapi/cgi/cgi_main.c 2008-12-04 08:17:56.000000000 +0100 @@ -1796,11 +1796,19 @@ SG(headers_sent) = 1; SG(request_info).no_headers = 1; @@ -2575,37 +2575,37 @@ +#endif +#else #if ZEND_DEBUG - php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2008 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-2009 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-2008 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-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #endif +#endif php_request_shutdown((void *) 0); exit_status = 0; goto out; -diff -Nura php-5.2.7/sapi/cli/php_cli.c suhosin-patch-5.2.7-0.9.6.3/sapi/cli/php_cli.c ---- php-5.2.7/sapi/cli/php_cli.c 2008-11-25 04:53:00.000000000 +0100 -+++ suhosin-patch-5.2.7-0.9.6.3/sapi/cli/php_cli.c 2008-12-04 08:17:56.000000000 +0100 +diff -Nura php-5.2.9/sapi/cli/php_cli.c suhosin-patch-5.2.9-0.9.6.3/sapi/cli/php_cli.c +--- php-5.2.9/sapi/cli/php_cli.c 2008-11-25 04:53:00.000000000 +0100 ++++ suhosin-patch-5.2.9-0.9.6.3/sapi/cli/php_cli.c 2008-12-04 08:17:56.000000000 +0100 @@ -772,8 +772,14 @@ } request_started = 1; -- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s", +- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 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-2008 The PHP Group\n%s", ++ php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s", + PHP_VERSION, SUHOSIN_PATCH_VERSION, +#else -+ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2008 The PHP Group\n%s", ++ php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s", + PHP_VERSION, +#endif + sapi_module.name, __DATE__, __TIME__, #if ZEND_DEBUG && defined(HAVE_GCOV) "(DEBUG GCOV)", #elif ZEND_DEBUG -diff -Nura php-5.2.7/win32/build/config.w32 suhosin-patch-5.2.7-0.9.6.3/win32/build/config.w32 ---- php-5.2.7/win32/build/config.w32 2008-10-11 01:38:14.000000000 +0200 -+++ suhosin-patch-5.2.7-0.9.6.3/win32/build/config.w32 2008-12-04 08:17:56.000000000 +0100 +diff -Nura php-5.2.9/win32/build/config.w32 suhosin-patch-5.2.9-0.9.6.3/win32/build/config.w32 +--- php-5.2.9/win32/build/config.w32 2008-10-11 01:38:14.000000000 +0200 ++++ suhosin-patch-5.2.9-0.9.6.3/win32/build/config.w32 2008-12-04 08:17:56.000000000 +0100 @@ -305,7 +305,7 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \