Attachment #183581 for bug #260576

Lines 1-6 Link Here

(-)suhosin-patch-5.2.7-0.9.6.3.patch (-1 lines)
1	diff -Nura php-5.2.7/TSRM/TSRM.h suhosin-patch-5.2.7-0.9.6.3/TSRM/TSRM.h

Lines 23-31 Link Here

(-)- php-5.2.7/TSRM/TSRM.h (-1 lines)
23	#ifdef __cplusplus	23	#ifdef __cplusplus
24	extern "C" {	24	extern "C" {
25	#endif	25	#endif
26	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

Lines 205-213 Link Here

(-)- php-5.2.7/TSRM/tsrm_virtual_cwd.c (-1 lines)
205	CWD_API void virtual_cwd_startup(void) /* {{{ */	205	CWD_API void virtual_cwd_startup(void) /* {{{ */
206	{	206	{
207	char cwd[MAXPATHLEN];	207	char cwd[MAXPATHLEN];
208	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

Lines 231-239 Link Here

(-)- php-5.2.7/TSRM/tsrm_virtual_cwd.h (-1 lines)
231	CWD_API void virtual_cwd_startup(void);	231	CWD_API void virtual_cwd_startup(void);
232	CWD_API void virtual_cwd_shutdown(void);	232	CWD_API void virtual_cwd_shutdown(void);
233	CWD_API char virtual_getcwd_ex(size_t length TSRMLS_DC);	233	CWD_API char virtual_getcwd_ex(size_t length TSRMLS_DC);
234	diff -Nura php-5.2.7/Zend/Makefile.am suhosin-patch-5.2.7-0.9.6.3/Zend/Makefile.am

Lines 243-251 Link Here

(-)- php-5.2.7/Zend/Makefile.am (-1 lines)
243		243
244	libZend_la_LDFLAGS =	244	libZend_la_LDFLAGS =
245	libZend_la_LIBADD = @ZEND_EXTRA_LIBS@	245	libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
246	diff -Nura php-5.2.7/Zend/Zend.dsp suhosin-patch-5.2.7-0.9.6.3/Zend/Zend.dsp

Lines 257-265 Link Here

(-)- php-5.2.7/Zend/Zend.dsp (-1 lines)
257	SOURCE=.\zend_ts_hash.c	257	SOURCE=.\zend_ts_hash.c
258	# End Source File	258	# End Source File
259	# Begin Source File	259	# Begin Source File
260	diff -Nura php-5.2.7/Zend/ZendTS.dsp suhosin-patch-5.2.7-0.9.6.3/Zend/ZendTS.dsp

Lines 271-279 Link Here

(-)- php-5.2.7/Zend/ZendTS.dsp (-1 lines)
271	SOURCE=.\zend_ts_hash.c	271	SOURCE=.\zend_ts_hash.c
272	# End Source File	272	# End Source File
273	# Begin Source File	273	# Begin Source File
274	diff -Nura php-5.2.7/Zend/zend.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend.c

Lines 374-382 Link Here

(-)- php-5.2.7/Zend/zend.c (-1 lines)
374	STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals)	374	STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals)
375	#ifdef ZEND_MULTIBYTE	375	#ifdef ZEND_MULTIBYTE
376	STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)	376	STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
377	diff -Nura php-5.2.7/Zend/zend.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend.h

Lines 401-409 Link Here

(-)- php-5.2.7/Zend/zend.h (-1 lines)
401	#endif /* ZEND_H */	401	#endif /* ZEND_H */
402		402
403	/*	403	/*
404	diff -Nura php-5.2.7/Zend/zend_alloc.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_alloc.c

Lines 677-685 Link Here

(-)- php-5.2.7/Zend/zend_alloc.c (-1 lines)
677	static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)	677	static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
678	{	678	{
679	char *tmp;	679	char *tmp;
680	diff -Nura php-5.2.7/Zend/zend_alloc.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend_alloc.h

Lines 690-698 Link Here

(-)- php-5.2.7/Zend/zend_alloc.h (-1 lines)
690	ZEND_API int is_zend_mm(TSRMLS_D);	690	ZEND_API int is_zend_mm(TSRMLS_D);
691		691
692	#if ZEND_DEBUG	692	#if ZEND_DEBUG
693	diff -Nura php-5.2.7/Zend/zend_canary.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_canary.c

Lines 758-766 Link Here

(-)- php-5.2.7/Zend/zend_canary.c (-1 lines)
758	+ * vim600: sw=4 ts=4 fdm=marker	758	+ * vim600: sw=4 ts=4 fdm=marker
759	+ * vim<600: sw=4 ts=4	759	+ * vim<600: sw=4 ts=4
760	+ */	760	+ */
761	diff -Nura php-5.2.7/Zend/zend_compile.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_compile.c

Lines 780-788 Link Here

(-)- php-5.2.7/Zend/zend_compile.c (-1 lines)
780		780
781	static void build_runtime_defined_function_key(zval result, char name, int name_length TSRMLS_DC)	781	static void build_runtime_defined_function_key(zval result, char name, int name_length TSRMLS_DC)
782	{	782	{
783	diff -Nura php-5.2.7/Zend/zend_compile.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend_compile.h

Lines 803-811 Link Here

(-)- php-5.2.7/Zend/zend_compile.h (-1 lines)
803	END_EXTERN_C()	803	END_EXTERN_C()
804		804
805	#define ZEND_CLONE_FUNC_NAME "__clone"	805	#define ZEND_CLONE_FUNC_NAME "__clone"
806	diff -Nura php-5.2.7/Zend/zend_constants.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_constants.c

Lines 882-890 Link Here

(-)- php-5.2.7/Zend/zend_constants.c (-1 lines)
882		882
883	/* true/false constants */	883	/* true/false constants */
884	{	884	{
885	diff -Nura php-5.2.7/Zend/zend_errors.h suhosin-patch-5.2.7-0.9.6.3/Zend/zend_errors.h

Lines 906-914 Link Here

(-)- php-5.2.7/Zend/zend_errors.h (-1 lines)
906	#endif /* ZEND_ERRORS_H */	906	#endif /* ZEND_ERRORS_H */
907		907
908	/*	908	/*
909	diff -Nura php-5.2.7/Zend/zend_hash.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_hash.c

Lines 1174-1182 Link Here

(-)- php-5.2.7/Zend/zend_hash.c (-1 lines)
1174	if (ht->pDestructor) {	1174	if (ht->pDestructor) {
1175	ht->pDestructor(p->pData);	1175	ht->pDestructor(p->pData);
1176	}	1176	}
1177	diff -Nura php-5.2.7/Zend/zend_llist.c suhosin-patch-5.2.7-0.9.6.3/Zend/zend_llist.c

Lines 1394-1402 Link Here

(-)- php-5.2.7/Zend/zend_llist.c (-1 lines)
1394	if ((old_tail = l->tail)) {	1394	if ((old_tail = l->tail)) {
1395	if (old_tail->prev) {	1395	if (old_tail->prev) {
1396	old_tail->prev->next = NULL;	1396	old_tail->prev->next = NULL;
1397	diff -Nura php-5.2.7/configure suhosin-patch-5.2.7-0.9.6.3/configure

Lines 1425-1433 Link Here

(-)- php-5.2.7/configure (-1 lines)
1425		1425
1426	IFS=.	1426	IFS=.
1427	set $ac_src	1427	set $ac_src
1428	diff -Nura php-5.2.7/configure.in suhosin-patch-5.2.7-0.9.6.3/configure.in

Lines 1454-1462 Link Here

(-)- php-5.2.7/configure.in (-1 lines)
1454		1454
1455	if test -r "$abs_srcdir/Zend/zend_objects.c"; then	1455	if test -r "$abs_srcdir/Zend/zend_objects.c"; then
1456	PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)	1456	PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
1457	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

Lines 1468-1476 Link Here

(-)- php-5.2.7/ext/standard/basic_functions.c (-1 lines)
1468	#endif	1468	#endif
1469		1469
1470	#ifdef HAVE_FNMATCH	1470	#ifdef HAVE_FNMATCH
1471	diff -Nura php-5.2.7/ext/standard/dl.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/dl.c

Lines 1491-1499 Link Here

(-)- php-5.2.7/ext/standard/dl.c (-1 lines)
1491	RETURN_TRUE;	1491	RETURN_TRUE;
1492	}	1492	}
1493	/* }}} */	1493	/* }}} */
1494	diff -Nura php-5.2.7/ext/standard/file.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/file.c

Lines 1503-1511 Link Here

(-)- php-5.2.7/ext/standard/file.c (-1 lines)
1503	{	1503	{
1504	zval **path;	1504	zval **path;
1505	char resolved_path_buff[MAXPATHLEN];	1505	char resolved_path_buff[MAXPATHLEN];
1506	diff -Nura php-5.2.7/ext/standard/file.h suhosin-patch-5.2.7-0.9.6.3/ext/standard/file.h

Lines 1515-1523 Link Here

(-)- php-5.2.7/ext/standard/file.h (-1 lines)
1515	#endif	1515	#endif
1516	#ifdef HAVE_FNMATCH	1516	#ifdef HAVE_FNMATCH
1517	PHP_FUNCTION(fnmatch);	1517	PHP_FUNCTION(fnmatch);
1518	diff -Nura php-5.2.7/ext/standard/info.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/info.c

Lines 1550-1558 Link Here

(-)- php-5.2.7/ext/standard/info.c (-1 lines)
1550	/* Zend Engine */	1550	/* Zend Engine */
1551	php_info_print_box_start(0);	1551	php_info_print_box_start(0);
1552	if (expose_php && !sapi_module.phpinfo_as_text) {	1552	if (expose_php && !sapi_module.phpinfo_as_text) {
1553	diff -Nura php-5.2.7/ext/standard/syslog.c suhosin-patch-5.2.7-0.9.6.3/ext/standard/syslog.c

Lines 1569-1577 Link Here

(-)- php-5.2.7/ext/standard/syslog.c (-1 lines)
1569	BG(syslog_device)=NULL;	1569	BG(syslog_device)=NULL;
1570		1570
1571	return SUCCESS;	1571	return SUCCESS;
1572	diff -Nura php-5.2.7/main/fopen_wrappers.c suhosin-patch-5.2.7-0.9.6.3/main/fopen_wrappers.c

Lines 1649-1657 Link Here

(-)- php-5.2.7/main/fopen_wrappers.c (-1 lines)
1649		1649
1650	ptr = end;	1650	ptr = end;
1651	}	1651	}
1652	diff -Nura php-5.2.7/main/main.c suhosin-patch-5.2.7-0.9.6.3/main/main.c

Lines 1733-1741 Link Here

(-)- php-5.2.7/main/main.c (-1 lines)
1733	core_globals_dtor(&core_globals TSRMLS_CC);	1733	core_globals_dtor(&core_globals TSRMLS_CC);
1734	#else	1734	#else
1735	zend_ini_global_shutdown(TSRMLS_C);	1735	zend_ini_global_shutdown(TSRMLS_C);
1736	diff -Nura php-5.2.7/main/php.h suhosin-patch-5.2.7-0.9.6.3/main/php.h

Lines 1761-1769 Link Here

(-)- php-5.2.7/main/php.h (-1 lines)
1761	#endif	1761	#endif
1762		1762
1763	/*	1763	/*
1764	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

Lines 1774-1782 Link Here

(-)- php-5.2.7/main/php_config.h.in (-1 lines)
1774	/* Whether you have AOLserver */	1774	/* Whether you have AOLserver */
1775	#undef HAVE_AOLSERVER	1775	#undef HAVE_AOLSERVER
1776		1776
1777	diff -Nura php-5.2.7/main/php_logos.c suhosin-patch-5.2.7-0.9.6.3/main/php_logos.c

Lines 1798-1806 Link Here

(-)- php-5.2.7/main/php_logos.c (-1 lines)
1798		1798
1799	return SUCCESS;	1799	return SUCCESS;
1800	}	1800	}
1801	diff -Nura php-5.2.7/main/snprintf.c suhosin-patch-5.2.7-0.9.6.3/main/snprintf.c

Lines 1813-1821 Link Here

(-)- php-5.2.7/main/snprintf.c (-1 lines)
1813	goto skip_output;	1813	goto skip_output;
1814		1814
1815	/*	1815	/*
1816	diff -Nura php-5.2.7/main/spprintf.c suhosin-patch-5.2.7-0.9.6.3/main/spprintf.c

Lines 1828-1836 Link Here

(-)- php-5.2.7/main/spprintf.c (-1 lines)
1828	goto skip_output;	1828	goto skip_output;
1829		1829
1830	/*	1830	/*
1831	diff -Nura php-5.2.7/main/suhosin_globals.h suhosin-patch-5.2.7-0.9.6.3/main/suhosin_globals.h

Lines 1893-1901 Link Here

(-)- php-5.2.7/main/suhosin_globals.h (-1 lines)
1893	+ * c-basic-offset: 4	1893	+ * c-basic-offset: 4
1894	+ * End:	1894	+ * End:
1895	+ */	1895	+ */
1896	diff -Nura php-5.2.7/main/suhosin_logo.h suhosin-patch-5.2.7-0.9.6.3/main/suhosin_logo.h

Lines 2075-2083 Link Here

(-)- php-5.2.7/main/suhosin_logo.h (-1 lines)
2075	+ "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"	2075	+ "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"
2076	+ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"	2076	+ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
2077	+ ;	2077	+ ;
2078	diff -Nura php-5.2.7/main/suhosin_patch.c suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.c

Lines 2459-2467 Link Here

(-)- php-5.2.7/main/suhosin_patch.c (-1 lines)
2459	+ * vim600: sw=4 ts=4 fdm=marker	2459	+ * vim600: sw=4 ts=4 fdm=marker
2460	+ * vim<600: sw=4 ts=4	2460	+ * vim<600: sw=4 ts=4
2461	+ */	2461	+ */
2462	diff -Nura php-5.2.7/main/suhosin_patch.h suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.h

Lines 2503-2511 Link Here

(-)- php-5.2.7/main/suhosin_patch.h (-1 lines)
2503	+ * c-basic-offset: 4	2503	+ * c-basic-offset: 4
2504	+ * End:	2504	+ * End:
2505	+ */	2505	+ */
2506	diff -Nura php-5.2.7/main/suhosin_patch.m4 suhosin-patch-5.2.7-0.9.6.3/main/suhosin_patch.m4

Lines 2515-2523 Link Here

(-)- php-5.2.7/main/suhosin_patch.m4 (-1 lines)
2515	+	2515	+
2516	+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])	2516	+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
2517	+	2517	+
2518	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

Lines 2530-2538 Link Here

(-)- php-5.2.7/sapi/apache/mod_php5.c (-1 lines)
2530	}	2530	}
2531	}	2531	}
2532	#endif	2532	#endif
2533	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

Lines 2545-2553 Link Here

(-)- php-5.2.7/sapi/apache2filter/sapi_apache2.c (-1 lines)
2545	}	2545	}
2546	}	2546	}
2547		2547
2548	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

Lines 2560-2568 Link Here

(-)- php-5.2.7/sapi/apache2handler/sapi_apache2.c (-1 lines)
2560	}	2560	}
2561	}	2561	}
2562		2562
2563	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




+#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());
 #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());
 #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

Return to bug 260576

Lines 2575-2611 Link Here

(-)- php-5.2.7/sapi/cgi/cgi_main.c (-3 / +2 lines)
2575	+#endif	2575	+#endif
2576	+#else	2576	+#else
2577	#if ZEND_DEBUG	2577	#if ZEND_DEBUG
2578	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());	2578	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());
2579	#else	2579	#else
2580	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());	2580	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());
2581	#endif	2581	#endif
2582	+#endif	2582	+#endif
2583	php_request_shutdown((void *) 0);	2583	php_request_shutdown((void *) 0);
2584	exit_status = 0;	2584	exit_status = 0;
2585	goto out;	2585	goto out;
2586	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