Get rid of a couple of bogus persist_alloc()'s, and some cleanup

diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 980a20da74bb033a64109229c1a75792f66e0d49..226e1da94ee20bdb59471ea149ef2617b67e5b27 100644 (file)
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -236,7 +236,7 @@ PHP_FUNCTION(get_browser)
        if (zend_hash_find(&browser_hash, (*agent_name)->value.str.val,(*agent_name)->value.str.len+1, (void **) &agent)==FAILURE) {
                lookup_browser_name = (*agent_name)->value.str.val;
                found_browser_entry = NULL;
-               zend_hash_apply_with_arguments(&browser_hash,(int (*)(void *, int, va_list, zend_hash_key *)) browser_reg_compare,2,lookup_browser_name,&found_browser_entry);
+               zend_hash_apply_with_arguments(&browser_hash, (apply_func_args_t) browser_reg_compare, 2, lookup_browser_name, &found_browser_entry);
                
                if (found_browser_entry) {
                        agent = &found_browser_entry;

diff --git a/main/main.c b/main/main.c
index eff65d5f88cce3eec84861fe2f0e5daf8240026a..3202b1a85b452a1ed002000cffee746e238f8bc9 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -714,13 +714,6 @@ void php_request_shutdown(void *dummy)
 }
 /* }}} */
 
-/* {{{ php_config_ini_shutdown
- */
-static void php_config_ini_shutdown(void)
-{
-       php_shutdown_config();
-}
-/* }}} */
 
 /* {{{ php_body_write_wrapper
  */
@@ -952,7 +945,7 @@ void php_module_shutdown()
        }
 
        /* close down the ini config */
-       php_config_ini_shutdown();
+       php_shutdown_config();
 
 #ifdef PHP_WIN32
        /*close winsock */

diff --git a/main/php_ini.c b/main/php_ini.c
index 460b7373ea30791098d0abb9601b00ff65a5eecc..2d14300b3cfae155ce8f26e233c62df618659724 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -273,7 +273,8 @@ int php_init_config(char *php_ini_path_override)
                tmp.value.str.val = zend_strndup(php_ini_opened_path, tmp.value.str.len);
                tmp.type = IS_STRING;
                zend_hash_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path"),(void *) &tmp,sizeof(zval), NULL);
-               persist_alloc(php_ini_opened_path);
+               efree(php_ini_opened_path);
+               php_ini_opened_path = zend_strndup(tmp.value.str.val, tmp.value.str.len);
        }
        
        return SUCCESS;
@@ -286,7 +287,7 @@ int php_shutdown_config(void)
 {
        zend_hash_destroy(&configuration_hash);
        if (php_ini_opened_path) {
-               efree(php_ini_opened_path);
+               free(php_ini_opened_path);
        }
        return SUCCESS;
 }

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index e34c504c20a6184f4f655a78a2f84c97a499a00f..c8c366b844c7fccdc82099689935ae483a34b303 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -304,7 +304,7 @@ static void init_request_info(TSRMLS_D)
           php_destroy_request_info()! */
 #if DISCARD_PATH
        if (script_filename) {
-               SG(request_info).path_translated = estrdup(script_filename);
+               SG(request_info).path_translated = strdup(script_filename);
        } else {
                SG(request_info).path_translated = NULL;
        }
@@ -538,7 +538,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
                                                break;
 
                                case 'f': /* parse file */
-                                               script_file = estrdup(ap_php_optarg);
+                                               script_file = strdup(ap_php_optarg);
                                                no_headers = 1;
                                                break;
 
@@ -687,7 +687,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 
                if (!cgi) {
                        if (!SG(request_info).path_translated && argc > ap_php_optind) {
-                               SG(request_info).path_translated = estrdup(argv[ap_php_optind]);
+                               SG(request_info).path_translated = strdup(argv[ap_php_optind]);
                        }
                } else {
                /* If for some reason the CGI interface is not setting the
@@ -703,7 +703,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
                        env_path_translated = getenv("PATH_TRANSLATED");
 #endif
                        if(env_path_translated) {
-                               SG(request_info).path_translated = estrdup(env_path_translated);
+                               SG(request_info).path_translated = strdup(env_path_translated);
                        }
                }
                if (cgi || SG(request_info).path_translated) {
@@ -768,15 +768,12 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
 #endif
                }
 
-
-               if (SG(request_info).path_translated) {
-                       persist_alloc(SG(request_info).path_translated);
-               }
-
                php_request_shutdown((void *) 0);
                php_module_shutdown();
 
-               STR_FREE(SG(request_info).path_translated);
+               if (SG(request_info).path_translated) {
+                       free(SG(request_info).path_translated);
+               }
 
                if (cgi_sapi_module.php_ini_path_override) {
                        free(cgi_sapi_module.php_ini_path_override);