php4-ini-search-path.patch

   1 see also http://bugs.php.net/bug.php?id=34793
   2 --- php-4.4.2/main/php_ini.c~   2006-01-17 19:02:09.000000000 +0200
   3 +++ php-4.4.2/main/php_ini.c    2006-01-17 19:26:46.000000000 +0200
   4 @@ -19,7 +19,7 @@
   5  /* $Id$ */
   6
   7  /* Check CWD for php.ini */
   8 -#define INI_CHECK_CWD
   9 +#undef INI_CHECK_CWD
  10
  11  #include "php.h"
  12  #include "ext/standard/info.h"
  13 @@ -328,13 +327,13 @@
  14                         efree(binary_location);
  15                         binary_location = NULL;
  16                 }
  17 -#else
  18 +
  19                 if (sapi_module.executable_location) {
  20                         binary_location = estrdup(sapi_module.executable_location);
  21                 } else {
  22                         binary_location = NULL;
  23                 }
  24 -#endif
  25 +
  26                 if (binary_location) {
  27                         char *separator_location = strrchr(binary_location, DEFAULT_SLASH);
  28
  29 @@ -349,7 +348,6 @@
  30                 }
  31
  32                 /* Add default location */
  33 -#ifdef PHP_WIN32
  34                 default_location = (char *) emalloc(MAXPATHLEN + 1);
  35
  36                 if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) {