From 32d8246bda4ef6f75c69740f968c23e31e4a49db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 17 Jan 2006 15:05:40 +0000 Subject: [PATCH] - leave searching for ini file from insecure and unexpected locations to WINDOWS OS Changed files: php-ini-search-path.patch -> 1.1 --- php-ini-search-path.patch | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 php-ini-search-path.patch diff --git a/php-ini-search-path.patch b/php-ini-search-path.patch new file mode 100644 index 0000000..b06054d --- /dev/null +++ b/php-ini-search-path.patch @@ -0,0 +1,36 @@ +see also http://bugs.php.net/bug.php?id=34793 +--- php-5.1.2/main/php_ini.c~ 2006-01-12 23:46:12.000000000 +0200 ++++ php-5.1.2/main/php_ini.c 2006-01-17 17:01:16.000000000 +0200 +@@ -330,6 +330,7 @@ + strcat(php_ini_search_path, env_location); + } + ++#ifdef PHP_WIN32 + /* Add cwd (only with CLI) */ + if (strcmp(sapi_module.name, "cli") == 0) { + if (*php_ini_search_path) { +@@ -339,7 +340,6 @@ + } + + /* Add binary directory */ +-#ifdef PHP_WIN32 + binary_location = (char *) emalloc(MAXPATHLEN); + if (GetModuleFileName(0, binary_location, MAXPATHLEN) == 0) { + efree(binary_location); +@@ -356,6 +356,8 @@ + binary_location = NULL; + } + #endif ++ ++#ifdef PHP_WIN32 + if (binary_location) { + char *separator_location = strrchr(binary_location, DEFAULT_SLASH); + +@@ -370,7 +372,6 @@ + } + + /* Add default location */ +-#ifdef PHP_WIN32 + default_location = (char *) emalloc(MAXPATHLEN + 1); + + if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) { -- 2.44.0