Update to 5.2.0 release.

3 files changed, 0 insertions, 74 deletions

diff --git a/lang/php53/files/patch-ext_standard_dir.c b/lang/php53/files/patch-ext_standard_dir.c
deleted file mode 100644
index 58a6bccb9cfe..000000000000
--- a/lang/php53/files/patch-ext_standard_dir.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ext/standard/dir.c.orig	Mon Oct 16 07:08:36 2006
-+++ ext/standard/dir.c	Mon Oct 16 07:08:40 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: dir.c,v 1.147.2.3 2006/02/26 10:49:50 helly Exp $ */
-+/* $Id: dir.c,v 1.147.2.3.2.1 2006/10/04 23:19:25 iliaa Exp $ */
- 
- /* {{{ includes/startup/misc */
- 
-@@ -286,7 +286,7 @@
- 		RETURN_FALSE;
- 	}
- 
--	if (PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) {
-+	if ((PG(safe_mode) && !php_checkuid(str, NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir(str TSRMLS_CC)) {
- 		RETURN_FALSE;
- 	}
- 	ret = VCWD_CHDIR(str);
diff --git a/lang/php53/files/patch-main_main.c b/lang/php53/files/patch-main_main.c
deleted file mode 100644
index fdab9447de1d..000000000000
--- a/lang/php53/files/patch-main_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/main.c.orig	Sat Dec 10 09:36:39 2005
-+++ main/main.c	Sat Dec 10 09:37:37 2005
-@@ -311,7 +311,7 @@
- 	PHP_INI_ENTRY("smtp_port",					"25",		PHP_INI_ALL,		NULL)
- 	PHP_INI_ENTRY("browscap",					NULL,		PHP_INI_SYSTEM,		NULL)
- #if MEMORY_LIMIT
--	PHP_INI_ENTRY("memory_limit",				"8M",		PHP_INI_ALL,		OnChangeMemoryLimit)
-+	PHP_INI_ENTRY("memory_limit",				"12M",		PHP_INI_ALL,		OnChangeMemoryLimit)
- #endif
- 	PHP_INI_ENTRY("precision",					"14",		PHP_INI_ALL,		OnSetPrecision)
- 	PHP_INI_ENTRY("sendmail_from",				NULL,		PHP_INI_ALL,		NULL)
diff --git a/lang/php53/files/patch-main_php_open_temporary_file.c b/lang/php53/files/patch-main_php_open_temporary_file.c
deleted file mode 100644
index 85f7c51ab47d..000000000000
--- a/lang/php53/files/patch-main_php_open_temporary_file.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- main/php_open_temporary_file.c.orig	Mon Oct 16 07:21:14 2006
-+++ main/php_open_temporary_file.c	Mon Oct 16 07:22:00 2006
-@@ -16,7 +16,7 @@
-    +----------------------------------------------------------------------+
-  */
- 
--/* $Id: php_open_temporary_file.c,v 1.34.2.2 2006/05/23 23:22:26 iliaa Exp $ */
-+/* $Id: php_open_temporary_file.c,v 1.34.2.1.2.4 2006/10/13 01:11:30 iliaa Exp $ */
- 
- #include "php.h"
- 
-@@ -206,6 +206,7 @@
- PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC)
- {
- 	int fd;
-+	const char *temp_dir;
- 
- 	if (!pfx) {
- 		pfx = "tmp.";
-@@ -214,11 +215,22 @@
- 		*opened_path_p = NULL;
- 	}
- 
-+	if (!dir || *dir == '\0') {
-+def_tmp:
-+		temp_dir = php_get_temporary_directory();
-+
-+		if (temp_dir && *temp_dir != '\0' && !php_check_open_basedir(temp_dir TSRMLS_CC)) {
-+			return php_do_open_temporary_file(temp_dir, pfx, opened_path_p TSRMLS_CC);
-+		} else {
-+			return -1;
-+		}
-+	}
-+
- 	/* Try the directory given as parameter. */
- 	fd = php_do_open_temporary_file(dir, pfx, opened_path_p TSRMLS_CC);
- 	if (fd == -1) {
- 		/* Use default temporary directory. */
--		fd = php_do_open_temporary_file(php_get_temporary_directory(), pfx, opened_path_p TSRMLS_CC);
-+		goto def_tmp;
- 	}
- 	return fd;
- }