| @@ -1,6 +1,6 @@
-diff -Nura php-5.2.9/TSRM/TSRM.h suhosin-patch-5.2.9-0.9.7/TSRM/TSRM.h
---- php-5.2.9/TSRM/TSRM.h 2008-12-31 12:17:31.000000000 +0100
-+++ suhosin-patch-5.2.9-0.9.7/TSRM/TSRM.h 2009-03-05 21:11:35.000000000 +0100
+diff -Nura php-5.2.10/TSRM/TSRM.h suhosin-patch-5.2.10-0.9.7/TSRM/TSRM.h
+--- php-5.2.10/TSRM/TSRM.h 2008-12-31 12:17:31.000000000 +0100
++++ suhosin-patch-5.2.10-0.9.7/TSRM/TSRM.h 2009-06-23 22:36:11.000000000 +0200
@@ -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.9/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.c
---- php-5.2.9/TSRM/tsrm_virtual_cwd.c 2008-12-31 12:17:31.000000000 +0100
-+++ suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.c 2009-03-05 21:37:36.000000000 +0100
+diff -Nura php-5.2.10/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.c
+--- php-5.2.10/TSRM/tsrm_virtual_cwd.c 2008-12-31 12:17:31.000000000 +0100
++++ suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.c 2009-06-23 22:36:11.000000000 +0200
@@ -273,6 +273,191 @@
}
/* }}} */
@@ -218,9 +218,9 @@
CWD_API void virtual_cwd_startup(void) /* {{{ */
{
char cwd[MAXPATHLEN];
-diff -Nura php-5.2.9/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.h
---- php-5.2.9/TSRM/tsrm_virtual_cwd.h 2008-12-31 12:17:32.000000000 +0100
-+++ suhosin-patch-5.2.9-0.9.7/TSRM/tsrm_virtual_cwd.h 2009-03-05 21:11:35.000000000 +0100
+diff -Nura php-5.2.10/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.h
+--- php-5.2.10/TSRM/tsrm_virtual_cwd.h 2008-12-31 12:17:32.000000000 +0100
++++ suhosin-patch-5.2.10-0.9.7/TSRM/tsrm_virtual_cwd.h 2009-06-23 22:36:11.000000000 +0200
@@ -139,6 +139,22 @@
typedef int (*verify_path_func)(const cwd_state *);
@@ -244,9 +244,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.9/Zend/Makefile.am suhosin-patch-5.2.9-0.9.7/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.7/Zend/Makefile.am 2009-03-05 21:11:35.000000000 +0100
+diff -Nura php-5.2.10/Zend/Makefile.am suhosin-patch-5.2.10-0.9.7/Zend/Makefile.am
+--- php-5.2.10/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100
++++ suhosin-patch-5.2.10-0.9.7/Zend/Makefile.am 2009-06-23 22:36:11.000000000 +0200
@@ -17,7 +17,7 @@
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
@@ -256,9 +256,9 @@
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-diff -Nura php-5.2.9/Zend/Zend.dsp suhosin-patch-5.2.9-0.9.7/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.7/Zend/Zend.dsp 2009-03-05 21:15:17.000000000 +0100
+diff -Nura php-5.2.10/Zend/Zend.dsp suhosin-patch-5.2.10-0.9.7/Zend/Zend.dsp
+--- php-5.2.10/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100
++++ suhosin-patch-5.2.10-0.9.7/Zend/Zend.dsp 2009-06-23 22:36:11.000000000 +0200
@@ -239,6 +239,10 @@
# End Source File
# Begin Source File
@@ -270,9 +270,9 @@
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-diff -Nura php-5.2.9/Zend/ZendTS.dsp suhosin-patch-5.2.9-0.9.7/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.7/Zend/ZendTS.dsp 2009-03-05 21:15:17.000000000 +0100
+diff -Nura php-5.2.10/Zend/ZendTS.dsp suhosin-patch-5.2.10-0.9.7/Zend/ZendTS.dsp
+--- php-5.2.10/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100
++++ suhosin-patch-5.2.10-0.9.7/Zend/ZendTS.dsp 2009-06-23 22:36:11.000000000 +0200
@@ -273,6 +273,10 @@
# End Source File
# Begin Source File
@@ -284,9 +284,9 @@
SOURCE=.\zend_ts_hash.c
# End Source File
# Begin Source File
-diff -Nura php-5.2.9/Zend/zend.c suhosin-patch-5.2.9-0.9.7/Zend/zend.c
---- php-5.2.9/Zend/zend.c 2008-12-31 12:17:32.000000000 +0100
-+++ suhosin-patch-5.2.9-0.9.7/Zend/zend.c 2009-03-05 21:11:35.000000000 +0100
+diff -Nura php-5.2.10/Zend/zend.c suhosin-patch-5.2.10-0.9.7/Zend/zend.c
+--- php-5.2.10/Zend/zend.c 2009-06-16 18:09:04.000000000 +0200
++++ suhosin-patch-5.2.10-0.9.7/Zend/zend.c 2009-06-23 22:36:11.000000000 +0200
@@ -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);
@@ -387,10 +387,10 @@
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.9/Zend/zend.h suhosin-patch-5.2.9-0.9.7/Zend/zend.h
---- php-5.2.9/Zend/zend.h 2008-12-31 12:17:32.000000000 +0100
-+++ suhosin-patch-5.2.9-0.9.7/Zend/zend.h 2009-03-05 21:11:35.000000000 +0100
-@@ -532,6 +532,9 @@
+diff -Nura php-5.2.10/Zend/zend.h suhosin-patch-5.2.10-0.9.7/Zend/zend.h
+--- php-5.2.10/Zend/zend.h 2009-06-17 10:57:04.000000000 +0200
++++ suhosin-patch-5.2.10-0.9.7/Zend/zend.h 2009-06-23 22:36:11.000000000 +0200
+@@ -550,6 +550,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);
extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
@@ -400,7 +400,7 @@
ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-@@ -663,6 +666,13 @@
+@@ -681,6 +684,13 @@
#include "zend_operators.h"
#include "zend_variables.h"
@@ -414,10 +414,10 @@
#endif /* ZEND_H */
/*
-diff -Nura php-5.2.9/Zend/zend_alloc.c suhosin-patch-5.2.9-0.9.7/Zend/zend_alloc.c
---- php-5.2.9/Zend/zend_alloc.c 2009-01-25 15:04:09.000000000 +0100
-+++ suhosin-patch-5.2.9-0.9.7/Zend/zend_alloc.c 2009-03-05 21:11:35.000000000 +0100
-@@ -311,13 +311,26 @@
+diff -Nura php-5.2.10/Zend/zend_alloc.c suhosin-patch-5.2.10-0.9.7/Zend/zend_alloc.c
+--- php-5.2.10/Zend/zend_alloc.c 2009-05-30 18:42:24.000000000 +0200
++++ suhosin-patch-5.2.10-0.9.7/Zend/zend_alloc.c 2009-06-23 22:36:11.000000000 +0200
+@@ -316,13 +316,26 @@
#define MEM_BLOCK_GUARD 0x2A8FCC84
#define MEM_BLOCK_LEAK 0x6C5E8F2D
@@ -446,7 +446,7 @@
} zend_mm_block_info;
#if ZEND_DEBUG
-@@ -423,6 +436,9 @@
+@@ -428,6 +441,9 @@
int miss;
} cache_stat[ZEND_MM_NUM_BUCKETS+1];
#endif
@@ -456,7 +456,7 @@
};
#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -512,15 +528,15 @@
+@@ -517,15 +533,15 @@
#define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
#define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
#define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
@@ -475,7 +475,7 @@
#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
-@@ -582,6 +598,48 @@
+@@ -587,6 +603,48 @@
#endif
@@ -524,7 +524,7 @@
#if ZEND_MM_HEAP_PROTECTION
-@@ -790,6 +848,12 @@
+@@ -795,6 +853,12 @@
if (EXPECTED(prev == mm_block)) {
zend_mm_free_block **rp, **cp;
@@ -537,7 +537,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(next != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -828,6 +892,12 @@
+@@ -833,6 +897,12 @@
}
} else {
@@ -550,7 +550,7 @@
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -875,6 +945,11 @@
+@@ -880,6 +950,11 @@
heap->large_free_buckets[i] = NULL;
}
heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
@@ -562,7 +562,7 @@
}
static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -1779,6 +1854,11 @@
+@@ -1784,6 +1859,11 @@
best_fit = heap->cache[index];
heap->cache[index] = best_fit->prev_free_block;
heap->cached -= true_size;
@@ -574,7 +574,7 @@
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
return ZEND_MM_DATA_OF(best_fit);
-@@ -1918,6 +1998,12 @@
+@@ -1923,6 +2003,12 @@
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
@@ -587,7 +587,7 @@
|
