[PHP-CVS] cvs: php-src(PHP_4_3) /main main.c

[Jani Taskinen]

sniper          Sun Jan  9 11:12:23 2005 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/main       main.c 
  Log:
  MFH: - Fix memleak in ZTS mode
  
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.56&r2=1.512.2.57&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.56 php-src/main/main.c:1.512.2.57
--- php-src/main/main.c:1.512.2.56      Fri Oct  1 10:27:13 2004
+++ php-src/main/main.c Sun Jan  9 11:12:23 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.512.2.56 2004/10/01 14:27:13 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.57 2005/01/09 16:12:23 sniper Exp $ */
 
 /* {{{ includes
  */
@@ -1297,6 +1297,8 @@
 #ifndef ZTS
        zend_ini_shutdown(TSRMLS_C);
        shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
+#else
+       zend_ini_global_shutdown(TSRMLS_C);
 #endif
 
        module_initialized = 0;
@@ -1777,8 +1779,7 @@
 {
        int ret = -1;
 
-       if (auth && auth[0] != '\0'
-                       && strncmp(auth, "Basic ", 6) == 0) {
+       if (auth && auth[0] != '\0' && strncmp(auth, "Basic ", 6) == 0) {
                char *pass;
                char *user;
 
@@ -1796,8 +1797,9 @@
                }
        }
 
-       if (ret == -1)
+       if (ret == -1) {
                SG(request_info).auth_user = SG(request_info).auth_password = 
NULL;
+       }
 
        return ret;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php