From: Stefan Fritsch <sf@apache.org>
Date: Sat, 23 Oct 2010 18:35:06 +0000 (+0000)
Subject: more temp pool usage and remove some useless apr_pstrdup()s
X-Git-Tag: 2.3.9~233
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00f70ddc9aaf4a089b5befdbe96b552473e1b1a7;p=apache

more temp pool usage and remove some useless apr_pstrdup()s


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026660 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
index 2e20aad197..ae7537847f 100644
--- a/modules/aaa/mod_auth_basic.c
+++ b/modules/aaa/mod_auth_basic.c
@@ -56,7 +56,7 @@ static const char *add_authn_provider(cmd_parms *cmd, void *config,
     authn_provider_list *newp;
 
     newp = apr_pcalloc(cmd->pool, sizeof(authn_provider_list));
-    newp->provider_name = apr_pstrdup(cmd->pool, arg);
+    newp->provider_name = arg;
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 5b86929c83..ba7f10b073 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -506,7 +506,7 @@ static const char *add_authn_provider(cmd_parms *cmd, void *config,
     authn_provider_list *newp;
 
     newp = apr_pcalloc(cmd->pool, sizeof(authn_provider_list));
-    newp->provider_name = apr_pstrdup(cmd->pool, arg);
+    newp->provider_name = arg;
 
     /* lookup and cache the actual provider now */
     newp->provider = ap_lookup_provider(AUTHN_PROVIDER_GROUP,
diff --git a/modules/aaa/mod_authn_core.c b/modules/aaa/mod_authn_core.c
index 4c6df1074f..f8b41654ef 100644
--- a/modules/aaa/mod_authn_core.c
+++ b/modules/aaa/mod_authn_core.c
@@ -215,7 +215,7 @@ static const char *authaliassection(cmd_parms *cmd, void *mconfig, const char *a
                            "> directive missing closing '>'", NULL);
     }
 
-    args = apr_pstrndup(cmd->pool, arg, endp - arg);
+    args = apr_pstrndup(cmd->temp_pool, arg, endp - arg);
 
     if (!args[0]) {
         return apr_pstrcat(cmd->pool, cmd->cmd->name,
diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index a2fd878855..7ca38e7a29 100644
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -233,7 +233,7 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
                            "> directive missing closing '>'", NULL);
     }
 
-    args = apr_pstrndup(cmd->pool, args, endp - args);
+    args = apr_pstrndup(cmd->temp_pool, args, endp - args);
 
     if (!args[0]) {
         return apr_pstrcat(cmd->pool, cmd->cmd->name,
@@ -428,7 +428,7 @@ static const char *add_authz_section(cmd_parms *cmd, void *mconfig,
                            "> directive missing closing '>'", NULL);
     }
 
-    args = apr_pstrndup(cmd->pool, args, endp - args);
+    args = apr_pstrndup(cmd->temp_pool, args, endp - args);
 
     if (args[0]) {
         return apr_pstrcat(cmd->pool, cmd->cmd->name,
diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 92d07d4f11..b6f7e0cb54 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -99,7 +99,7 @@ static const char *header_name_set(cmd_parms *cmd, void *dummy,
 {
     remoteip_config_t *config = ap_get_module_config(cmd->server->module_config,
                                                      &remoteip_module);
-    config->header_name = apr_pstrdup(cmd->pool, arg);
+    config->header_name = arg;
     return NULL;
 }
 
@@ -108,7 +108,7 @@ static const char *proxies_header_name_set(cmd_parms *cmd, void *dummy,
 {
     remoteip_config_t *config = ap_get_module_config(cmd->server->module_config,
                                                      &remoteip_module);
-    config->proxies_header_name = apr_pstrdup(cmd->pool, arg);
+    config->proxies_header_name = arg;
     return NULL;
 }
 
diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index c626587c57..d7aab217a6 100644
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -81,8 +81,8 @@ typedef enum {
 typedef struct {
     int enabled;
     cookie_type_e style;
-    char *cookie_name;
-    char *cookie_domain;
+    const char *cookie_name;
+    const char *cookie_domain;
     char *regexp_string;  /* used to compile regexp; save for debugging */
     ap_regex_t *regexp;  /* used to find usertrack cookie in cookie header */
 } cookie_dir_rec;
@@ -352,7 +352,7 @@ static const char *set_cookie_name(cmd_parms *cmd, void *mconfig,
 {
     cookie_dir_rec *dcfg = (cookie_dir_rec *) mconfig;
 
-    dcfg->cookie_name = apr_pstrdup(cmd->pool, name);
+    dcfg->cookie_name = name;
 
     set_and_comp_regexp(dcfg, cmd->pool, name);
 
@@ -390,7 +390,7 @@ static const char *set_cookie_domain(cmd_parms *cmd, void *mconfig,
         return "CookieDomain values must contain at least one embedded dot";
     }
 
-    dcfg->cookie_domain = apr_pstrdup(cmd->pool, name);
+    dcfg->cookie_domain = name;
     return NULL;
 }