[Pkg-php-commits] [php/debian-sid] Remove patches merged upstream or otherwise deprecated.

Ondřej Surý ondrej at sury.org
Thu Feb 24 15:28:26 UTC 2011


---
 debian/patches/114-php_gd_segfault.patch           |   22 --
 debian/patches/581911_pdo_mysql_segfaults.patch    |   76 -------
 debian/patches/check_ini_on_modify_status.patch    |   26 ---
 .../fix-crash-if-aa-steps-are-invalid.patch        |   14 --
 .../gentoo/117-4_digit_year_big_endian.patch       |   11 -
 .../patches/install-programs_parallel_FTBFS.patch  |   16 --
 debian/patches/libedit_is_editline.patch           |   25 --
 debian/patches/manpage_spelling.patch              |   29 ---
 debian/patches/max_file_uploads.patch              |   33 ---
 debian/patches/php.ini-compatibility.patch         |   28 ---
 .../reject-filenames-with-null-r305507.patch       |  231 --------------------
 debian/patches/series                              |    1 -
 12 files changed, 0 insertions(+), 512 deletions(-)
 delete mode 100644 debian/patches/114-php_gd_segfault.patch
 delete mode 100644 debian/patches/581911_pdo_mysql_segfaults.patch
 delete mode 100644 debian/patches/check_ini_on_modify_status.patch
 delete mode 100644 debian/patches/fix-crash-if-aa-steps-are-invalid.patch
 delete mode 100644 debian/patches/gentoo/117-4_digit_year_big_endian.patch
 delete mode 100644 debian/patches/install-programs_parallel_FTBFS.patch
 delete mode 100644 debian/patches/libedit_is_editline.patch
 delete mode 100644 debian/patches/manpage_spelling.patch
 delete mode 100644 debian/patches/max_file_uploads.patch
 delete mode 100644 debian/patches/php.ini-compatibility.patch
 delete mode 100644 debian/patches/reject-filenames-with-null-r305507.patch

diff --git a/debian/patches/114-php_gd_segfault.patch b/debian/patches/114-php_gd_segfault.patch
deleted file mode 100644
index 5198dc7..0000000
--- a/debian/patches/114-php_gd_segfault.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pkg-php.orig/ext/gd/libgd/gd_compat.c
-+++ pkg-php/ext/gd/libgd/gd_compat.c
-@@ -14,7 +14,7 @@ int gdJpegGetVersionInt()
- 	return JPEG_LIB_VERSION;
- }
- 
--int gdJpegGetVersionString()
-+const char * gdJpegGetVersionString()
- {
- 	switch(JPEG_LIB_VERSION) {
- 		case 62:
---- pkg-php.orig/ext/gd/libgd/gd_compat.h
-+++ pkg-php/ext/gd/libgd/gd_compat.h
-@@ -8,7 +8,7 @@
- #endif
- 
- const char * gdPngGetVersionString();
--int gdJpegGetVersionString();
-+const char * gdJpegGetVersionString();
- int gdJpegGetVersionInt();
- int overflow2(int a, int b);
- 
diff --git a/debian/patches/581911_pdo_mysql_segfaults.patch b/debian/patches/581911_pdo_mysql_segfaults.patch
deleted file mode 100644
index c71078b..0000000
--- a/debian/patches/581911_pdo_mysql_segfaults.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581911
-Origin: http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3/ext/pdo_mysql/pdo_mysql.c?r1=294269&r2=294274&view=patch
---- php.orig/ext/pdo_mysql/pdo_mysql.c
-+++ php/ext/pdo_mysql/pdo_mysql.c
-@@ -115,12 +115,11 @@ static PHP_MINFO_FUNCTION(pdo_mysql)
- /* }}} */
- 
- 
--#if PDO_USE_MYSQLND
-+#if PDO_USE_MYSQLND && PDO_DBG_ENABLED
- /* {{{ PHP_RINIT_FUNCTION
-  */
- static PHP_RINIT_FUNCTION(pdo_mysql)
- {	
--#if PDO_DBG_ENABLED
- 	if (PDO_MYSQL_G(debug)) {
- 		MYSQLND_DEBUG *dbg = mysqlnd_debug_init(mysqlnd_debug_std_no_trace_funcs TSRMLS_CC);
- 		if (!dbg) {
-@@ -129,18 +128,15 @@ static PHP_RINIT_FUNCTION(pdo_mysql)
- 		dbg->m->set_mode(dbg, PDO_MYSQL_G(debug));
- 		PDO_MYSQL_G(dbg) = dbg;
- 	}
--#endif
- 	
- 	return SUCCESS;
- }
- /* }}} */
- 
--
- /* {{{ PHP_RSHUTDOWN_FUNCTION
-  */
- static PHP_RSHUTDOWN_FUNCTION(pdo_mysql)
- {
--#if PDO_DBG_ENABLED
- 	MYSQLND_DEBUG *dbg = PDO_MYSQL_G(dbg);
- 	PDO_DBG_ENTER("RSHUTDOWN");
- 	if (dbg) {
-@@ -148,11 +144,11 @@ static PHP_RSHUTDOWN_FUNCTION(pdo_mysql)
- 		dbg->m->free_handle(dbg);
- 		PDO_MYSQL_G(dbg) = NULL;
- 	}
--#endif
-+
- 	return SUCCESS;
- }
- /* }}} */
--
-+#endif
- 
- /* {{{ PHP_GINIT_FUNCTION
-  */
-@@ -167,8 +163,6 @@ static PHP_GINIT_FUNCTION(pdo_mysql)
- #endif
- }
- /* }}} */
--#endif
--
- 
- /* {{{ pdo_mysql_functions[] */
- const zend_function_entry pdo_mysql_functions[] = {
-@@ -205,15 +199,11 @@ zend_module_entry pdo_mysql_module_entry
- #endif
- 	PHP_MINFO(pdo_mysql),
- 	"1.0.2",
--#if PDO_USE_MYSQLND
- 	PHP_MODULE_GLOBALS(pdo_mysql),
- 	PHP_GINIT(pdo_mysql),
- 	NULL,
- 	NULL,
- 	STANDARD_MODULE_PROPERTIES_EX
--#else
--	STANDARD_MODULE_PROPERTIES
--#endif
- };
- /* }}} */
- 
diff --git a/debian/patches/check_ini_on_modify_status.patch b/debian/patches/check_ini_on_modify_status.patch
deleted file mode 100644
index e433317..0000000
--- a/debian/patches/check_ini_on_modify_status.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: php/Zend/zend_ini.c
-===================================================================
---- php.orig/Zend/zend_ini.c
-+++ php/Zend/zend_ini.c
-@@ -46,15 +46,20 @@ static int zend_remove_ini_entries(zend_
- 
- static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage TSRMLS_DC) /* {{{ */
- {
-+	int result = FAILURE;
- 	if (ini_entry->modified) {
- 		if (ini_entry->on_modify) {
- 			zend_try {
- 			/* even if on_modify bails out, we have to continue on with restoring,
- 				since there can be allocated variables that would be freed on MM shutdown
- 				and would lead to memory corruption later ini entry is modified again */
--				ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
-+				result = ini_entry->on_modify(ini_entry, ini_entry->orig_value, ini_entry->orig_value_length, ini_entry->mh_arg1, ini_entry->mh_arg2, ini_entry->mh_arg3, stage TSRMLS_CC);
- 			} zend_end_try();
- 		}
-+		if(stage == ZEND_INI_STAGE_RUNTIME && result == FAILURE) {
-+			/* runtime failure is OK */
-+			return 1;
-+		}
- 		if (ini_entry->value != ini_entry->orig_value) {
- 			efree(ini_entry->value);
- 		}
diff --git a/debian/patches/fix-crash-if-aa-steps-are-invalid.patch b/debian/patches/fix-crash-if-aa-steps-are-invalid.patch
deleted file mode 100644
index 0c36adf..0000000
--- a/debian/patches/fix-crash-if-aa-steps-are-invalid.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/ext/gd/gd.c
-+++ b/ext/gd/gd.c
-@@ -4233,6 +4233,11 @@ PHP_FUNCTION(imagepstext)
- 		RETURN_FALSE;
- 	}
- 
-+	if (aa_steps != 4 && aa_steps != 16) {
-+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Antialias steps must be 4 or 16");
-+		RETURN_FALSE;
-+	}
-+
- 	ZEND_FETCH_RESOURCE(bg_img, gdImagePtr, &img, -1, "Image", le_gd);
- 	ZEND_FETCH_RESOURCE(f_ind, int *, &fnt, -1, "Type 1 font", le_ps_font);
- 
diff --git a/debian/patches/gentoo/117-4_digit_year_big_endian.patch b/debian/patches/gentoo/117-4_digit_year_big_endian.patch
deleted file mode 100644
index 04049d1..0000000
--- a/debian/patches/gentoo/117-4_digit_year_big_endian.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pkg-php.orig/ext/date/php_date.c
-+++ pkg-php/ext/date/php_date.c
-@@ -803,7 +803,7 @@ static char *date_format(char *format, i
- 			/* year */
- 			case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
- 			case 'y': length = slprintf(buffer, 32, "%02d", (int) t->y % 100); break;
--			case 'Y': length = slprintf(buffer, 32, "%s%04ld", t->y < 0 ? "-" : "", llabs(t->y)); break;
-+			case 'Y': length = slprintf(buffer, 32, "%s%04lld", t->y < 0 ? "-" : "", llabs(t->y)); break;
- 
- 			/* time */
- 			case 'a': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break;
diff --git a/debian/patches/install-programs_parallel_FTBFS.patch b/debian/patches/install-programs_parallel_FTBFS.patch
deleted file mode 100644
index 4ff8e93..0000000
--- a/debian/patches/install-programs_parallel_FTBFS.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Explicitly create a directory to avoid FTBFS with parallel builds
-
-Origin: vendor
-Forwarded: yes
-Bug: http://bugs.php.net/bug.php?id=52037
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584348
---- php.orig/scripts/Makefile.frag
-+++ php/scripts/Makefile.frag
-@@ -33,6 +33,7 @@ install-build:
- 
- install-programs: $(builddir)/phpize $(builddir)/php-config
- 	@echo "Installing helper programs:       $(INSTALL_ROOT)$(bindir)/"
-+	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- 	@for prog in $(bin_SCRIPTS); do \
- 		echo "  program: $(program_prefix)$${prog}$(program_suffix)"; \
- 		$(INSTALL) -m 755 $(builddir)/$${prog} $(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \
diff --git a/debian/patches/libedit_is_editline.patch b/debian/patches/libedit_is_editline.patch
deleted file mode 100644
index 00b74a2..0000000
--- a/debian/patches/libedit_is_editline.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/ext/readline/config.m4
-+++ b/ext/readline/config.m4
-@@ -65,7 +65,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
- elif test "$PHP_LIBEDIT" != "no"; then
- 
-   for i in $PHP_LIBEDIT /usr/local /usr; do
--    test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break
-+    test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break
-   done
- 
-   if test -z "$LIBEDIT_DIR"; then
---- a/ext/readline/readline.c
-+++ b/ext/readline/readline.c
-@@ -33,8 +33,10 @@
- #define rl_completion_matches completion_matches
- #endif
- 
-+#ifdef HAVE_LIBEDIT
-+#include <editline/readline.h>
-+#else
- #include <readline/readline.h>
--#ifndef HAVE_LIBEDIT
- #include <readline/history.h>
- #endif
- 
diff --git a/debian/patches/manpage_spelling.patch b/debian/patches/manpage_spelling.patch
deleted file mode 100644
index 656c3f9..0000000
--- a/debian/patches/manpage_spelling.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- pkg-php.orig/sapi/cli/php.1.in
-+++ pkg-php/sapi/cli/php.1.in
-@@ -69,7 +69,7 @@ specified by \-F to be executed.
- You can access the input line by \fB$argn\fP. While processing the input lines
- .B $argi 
- contains the number of the actual line being processed. Further more
--the paramters \-B and \-E can be used to execute 
-+the parameters \-B and \-E can be used to execute 
- .IR code
- (see \-r) before and
- after all input lines have been processed respectively. Notice that the
-@@ -316,7 +316,7 @@ The configuration file for the CGI versi
- The configuration file for the version of PHP that apache2 uses.
- .SH EXAMPLES
- .TP 5
--\fIphp -r 'echo "Hello World\\n";'\fP
-+\fIphp \-r 'echo "Hello World\\n";'\fP
- This command simply writes the text "Hello World" to standard out.
- .TP
- \fIphp \-r 'print_r(gd_info());'\fP
-@@ -340,7 +340,7 @@ configuration information. If you then c
- Using this PHP command you can count the lines being input.
- .TP
- \fIphp \-R '@$l+=count(file($argn));' \-E 'echo "Lines:$l\\n";'\fP
--In this example PHP expects each input line beeing a file. It counts all lines 
-+In this example PHP expects each input line being a file. It counts all lines 
- of the files specified by each input line and shows the summarized result. 
- You may combine this with tools like find and change the php scriptlet.
- .TP
diff --git a/debian/patches/max_file_uploads.patch b/debian/patches/max_file_uploads.patch
deleted file mode 100644
index cc2ad16..0000000
--- a/debian/patches/max_file_uploads.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/php.ini-dist
-+++ b/php.ini-dist
-@@ -571,7 +571,7 @@ upload_max_filesize = 2M
- 
- 
- ; Maximum number of files that can be uploaded via a single request
--max_file_uploads = 20
-+max_file_uploads = 50
- 
- ;;;;;;;;;;;;;;;;;;
- ; Fopen wrappers ;
---- a/php.ini-recommended
-+++ b/php.ini-recommended
-@@ -606,7 +606,7 @@ upload_max_filesize = 2M
- 
- 
- ; Maximum number of files that can be uploaded via a single request
--max_file_uploads = 20
-+max_file_uploads = 50
- 
- ;;;;;;;;;;;;;;;;;;
- ; Fopen wrappers ;
---- a/main/main.c
-+++ b/main/main.c
-@@ -456,7 +456,7 @@ PHP_INI_BEGIN()
- 	PHP_INI_ENTRY("mail.force_extra_parameters",NULL,		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnChangeMailForceExtra)
- 	PHP_INI_ENTRY("disable_functions",			"",			PHP_INI_SYSTEM,		NULL)
- 	PHP_INI_ENTRY("disable_classes",			"",			PHP_INI_SYSTEM,		NULL)
--	PHP_INI_ENTRY("max_file_uploads",			"20",			PHP_INI_SYSTEM,		NULL)
-+	PHP_INI_ENTRY("max_file_uploads",			"50",			PHP_INI_SYSTEM,		NULL)
- 
- 	STD_PHP_INI_BOOLEAN("allow_url_fopen",		"1",		PHP_INI_SYSTEM,		OnUpdateBool,		allow_url_fopen,		php_core_globals,	core_globals)
- 	STD_PHP_INI_BOOLEAN("allow_url_include",	"0",		PHP_INI_SYSTEM,		OnUpdateBool,		allow_url_include,		php_core_globals,	core_globals)
diff --git a/debian/patches/php.ini-compatibility.patch b/debian/patches/php.ini-compatibility.patch
deleted file mode 100644
index bb838f2..0000000
--- a/debian/patches/php.ini-compatibility.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Change the default php.ini settings to be more compatible
- with older releases.
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2010-01-19
-
-Index: php/php.ini-production
-===================================================================
---- php.orig/php.ini-production
-+++ php/php.ini-production
-@@ -223,7 +223,7 @@ engine = On
- ; Development Value: Off
- ; Production Value: Off
- ; http://php.net/short-open-tag
--short_open_tag = Off
-+short_open_tag = On
- 
- ; Allow ASP-style <% %> tags.
- ; http://php.net/asp-tags
-@@ -679,7 +679,7 @@ variables_order = "GPCS"
- ; Development Value: "GP"
- ; Production Value: "GP"
- ; http://php.net/request-order
--request_order = "GP"
-+request_order = "GPC"
- 
- ; Whether or not to register the EGPCS variables as global variables.  You may
- ; want to turn this off if you don't want to clutter your scripts' global scope
diff --git a/debian/patches/reject-filenames-with-null-r305507.patch b/debian/patches/reject-filenames-with-null-r305507.patch
deleted file mode 100644
index 1e25b84..0000000
--- a/debian/patches/reject-filenames-with-null-r305507.patch
+++ /dev/null
@@ -1,231 +0,0 @@
---- a/ext/standard/dir.c
-+++ b/ext/standard/dir.c
-@@ -329,6 +329,10 @@ PHP_FUNCTION(chdir)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(str) != str_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if ((PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir(str TSRMLS_CC)) {
- 		RETURN_FALSE;
- 	}
-@@ -444,6 +448,10 @@ PHP_FUNCTION(glob)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(pattern) != pattern_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (pattern_len >= MAXPATHLEN) {
- 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Pattern exceeds the maximum allowed length of %d characters", MAXPATHLEN);
- 		RETURN_FALSE;
-@@ -566,6 +574,10 @@ PHP_FUNCTION(scandir)
- 	}
- 
- 	if (strlen(dirn) != dirn_len) {
-+		RETURN_FALSE;
-+	}
-+
-+	if (strlen(dirn) != dirn_len) {
- 		RETURN_FALSE;
- 	}
- 
---- a/ext/standard/filestat.c
-+++ b/ext/standard/filestat.c
-@@ -383,6 +383,10 @@ PHP_FUNCTION(disk_free_space)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(path) != path_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (php_disk_free_space(path, &bytesfree TSRMLS_CC) == SUCCESS) {
- 		RETURN_DOUBLE(bytesfree);
- 	}
-@@ -407,6 +411,10 @@ static void php_do_chgrp(INTERNAL_FUNCTI
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (Z_TYPE_P(group) == IS_LONG) {
- 		gid = (gid_t)Z_LVAL_P(group);
- 	} else if (Z_TYPE_P(group) == IS_STRING) {
-@@ -512,6 +520,10 @@ static void php_do_chown(INTERNAL_FUNCTI
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (Z_TYPE_P(user) == IS_LONG) {
- 		uid = (uid_t)Z_LVAL_P(user);
- 	} else if (Z_TYPE_P(user) == IS_STRING) {
-@@ -623,6 +635,10 @@ PHP_FUNCTION(chmod)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	/* Check the basedir */
- 	if (php_check_open_basedir(filename TSRMLS_CC)) {
- 		RETURN_FALSE;
-@@ -680,6 +696,10 @@ PHP_FUNCTION(touch)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	switch (argc) {
- 		case 1:
- #ifdef HAVE_UTIME_NULL
-@@ -798,6 +818,10 @@ PHPAPI void php_stat(const char *filenam
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_length) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (strlen(filename) != filename_length) {
- 		RETURN_FALSE;
- 	}
---- a/ext/posix/posix.c
-+++ b/ext/posix/posix.c
-@@ -846,6 +846,10 @@ PHP_FUNCTION(posix_mkfifo)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(path) != path_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) ||
- 			(PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_DIR)))) {
- 		RETURN_FALSE;
-@@ -885,6 +889,10 @@ PHP_FUNCTION(posix_mknod)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(path) != path_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (php_check_open_basedir_ex(path, 0 TSRMLS_CC) ||
- 			(PG(safe_mode) && (!php_checkuid(path, NULL, CHECKUID_ALLOW_ONLY_DIR)))) {
- 		RETURN_FALSE;
-@@ -965,6 +973,10 @@ PHP_FUNCTION(posix_access)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (strlen(filename) != filename_len) {
- 		RETURN_FALSE;
- 	}
---- a/ext/enchant/enchant.c
-+++ b/ext/enchant/enchant.c
-@@ -599,6 +599,10 @@ PHP_FUNCTION(enchant_broker_request_pwl_
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(pwl) != pwllen) {
-+		RETURN_FALSE;
-+	}
-+
- #if PHP_API_VERSION < 20100412
- 	if ((PG(safe_mode) && (!php_checkuid(pwl, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(pwl TSRMLS_CC)) {
- #else
---- a/ext/oci8/oci8_interface.c
-+++ b/ext/oci8/oci8_interface.c
-@@ -276,6 +276,10 @@ PHP_FUNCTION(oci_lob_load)
- 			return;
- 		}	
- 	}
-+
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
- 	
- 	if (zend_hash_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"), (void **)&tmp) == FAILURE) {
- 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
-@@ -700,7 +704,7 @@ PHP_FUNCTION(oci_lob_flush)
- 			return;
- 		}
- 	}
--	
-+
- 	if (zend_hash_find(Z_OBJPROP_P(z_descriptor), "descriptor", sizeof("descriptor"), (void **)&tmp) == FAILURE) {
- 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to find descriptor property");
- 		RETURN_FALSE;
-@@ -923,6 +927,10 @@ PHP_FUNCTION(oci_lob_export)
- 	if (length == -1) {
- 		length = lob_length - descriptor->lob_current_position;
- 	}
-+
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
- 	
- 	if (length == 0) {
- 		/* nothing to write, fail silently */
---- a/ext/zip/php_zip.c
-+++ b/ext/zip/php_zip.c
-@@ -1155,6 +1155,10 @@ static PHP_NAMED_FUNCTION(zif_zip_open)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (ZIP_OPENBASEDIR_CHECKPATH(filename)) {
- 		RETURN_FALSE;
- 	}
-@@ -1448,6 +1452,10 @@ static ZIPARCHIVE_METHOD(open)
- 		RETURN_FALSE;
- 	}
- 
-+	if (strlen(filename) != filename_len) {
-+		RETURN_FALSE;
-+	}
-+
- 	if (ZIP_OPENBASEDIR_CHECKPATH(filename)) {
- 		RETURN_FALSE;
- 	}
-@@ -2465,6 +2473,9 @@ static void php_zip_get_from(INTERNAL_FU
- 			return;
- 		}
- 		if (strlen(filename) != filename_len) {
-+			return;
-+		}
-+		if (strlen(filename) != filename_len) {
- 			return;
- 		}
- 		PHP_ZIP_STAT_PATH(intern, filename, filename_len, flags, sb);
---- a/main/fopen_wrappers.c
-+++ b/main/fopen_wrappers.c
-@@ -540,6 +540,10 @@ PHPAPI char *php_resolve_path(const char
- 		return NULL;
- 	}
- 
-+	if (strlen(filename) != filename_length) {
-+		return NULL;
-+	}
-+
- 	/* Don't resolve paths which contain protocol (except of file://) */
- 	for (p = filename; isalnum((int)*p) || *p == '+' || *p == '-' || *p == '.'; p++);
- 	if ((*p == ':') && (p - filename > 1) && (p[1] == '/') && (p[2] == '/')) {
diff --git a/debian/patches/series b/debian/patches/series
index 09fe69b..3441053 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,7 +47,6 @@ php_crypt_revamped.patch
 use_system_crypt_fixes.patch
 session_save_path.patch
 #install-programs_parallel_FTBFS.patch
-#581911_pdo_mysql_segfaults.patch
 php-fpm-man-section-and-cleanup.patch
 fpm-config.patch
 fix_crash_in__php_mssql_get_column_content_without_type.patch
-- 
1.7.1





More information about the Pkg-php-commits mailing list