- killed memory leak

Changed files:
    php-sapi-ini-file.patch -> 1.5

diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index 94ec00941d6bf5409a3b0ad226bd5b22f77df688..5047b0262ce6b78650335b3dfa9e48327d940e49 100644 (file)
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -1,6 +1,6 @@
---- php-4.3.0/main/php_ini.c.orig      Tue Nov 12 21:56:47 2002
-+++ php-4.3.0/main/php_ini.c   Sat Jan  4 12:22:39 2003
-@@ -351,6 +351,22 @@
+--- php-5.0.4/main/php_ini.c.orig      2004-09-17 04:48:47.000000000 +0200
++++ php-5.0.4/main/php_ini.c   2005-04-04 23:07:48.461211584 +0200
+@@ -430,6 +430,24 @@
                                }
                        }
                }
@@ -18,22 +18,24 @@
 +                              PG(safe_mode) = 0;
 +                              PG(open_basedir) = NULL;
 +                              fh.handle.fp = NULL;
++                              efree(php_ini_opened_path);
++                              fh.filename = php_ini_opened_path = NULL;
 +                      }
 +              }
                /* Search php-%sapi-module-name%.ini file in search path */
                if (!fh.handle.fp) {
                        const char *fmt = "php-%s.ini";
-@@ -361,13 +377,6 @@
-                       if (fh.handle.fp) {
+@@ -441,13 +459,6 @@
                                fh.filename = php_ini_opened_path;
                        }
--              }
+               }
 -              /* Search php.ini file in search path */
 -              if (!fh.handle.fp) {
 -                      fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
 -                      if (fh.handle.fp) {
 -                              fh.filename = php_ini_opened_path;
 -                      }
-               }
+-              }
        }
+ 
        if (free_ini_search_path) {