httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1002156 - in /httpd/httpd/trunk: modules/filters/mod_reqtimeout.c modules/lua/mod_lua.c modules/mappers/mod_dir.c modules/mappers/mod_rewrite.c modules/metadata/mod_headers.c modules/ssl/ssl_engine_config.c server/core.c
Date Tue, 28 Sep 2010 13:19:33 GMT
Author: sf
Date: Tue Sep 28 13:19:33 2010
New Revision: 1002156

URL: http://svn.apache.org/viewvc?rev=1002156&view=rev
Log:
save some memory by using cmd->temp_pool instead of cmd->pool in some places

Modified:
    httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
    httpd/httpd/trunk/modules/lua/mod_lua.c
    httpd/httpd/trunk/modules/mappers/mod_dir.c
    httpd/httpd/trunk/modules/mappers/mod_rewrite.c
    httpd/httpd/trunk/modules/metadata/mod_headers.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=1002156&r1=1002155&r2=1002156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Tue Sep 28 13:19:33 2010
@@ -487,7 +487,7 @@ static const char *set_reqtimeouts(cmd_p
         char *word, *val;
         const char *err;
         
-        word = ap_getword_conf(cmd->pool, &arg);
+        word = ap_getword_conf(cmd->temp_pool, &arg);
         val = strchr(word, '=');
         if (!val) {
             return "Invalid RequestReadTimeout parameter. Parameter must be "

Modified: httpd/httpd/trunk/modules/lua/mod_lua.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/mod_lua.c?rev=1002156&r1=1002155&r2=1002156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/mod_lua.c (original)
+++ httpd/httpd/trunk/modules/lua/mod_lua.c Tue Sep 28 13:19:33 2010
@@ -446,7 +446,7 @@ static const char *register_named_block_
     else {
         const char *word;
         apr_size_t wordlen;
-        word = ap_getword_conf(cmd->pool, &line);
+        word = ap_getword_conf(cmd->temp_pool, &line);
         wordlen = strlen(word);
         if (wordlen == 0 || word[wordlen - 1] != '>') {
             return apr_pstrcat(cmd->pool, cmd->directive->directive,

Modified: httpd/httpd/trunk/modules/mappers/mod_dir.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_dir.c?rev=1002156&r1=1002155&r2=1002156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_dir.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_dir.c Tue Sep 28 13:19:33 2010
@@ -60,7 +60,7 @@ static const char *add_index(cmd_parms *
         if (count == 0 && !strcasecmp(w, "disabled")) {
             /* peek to see if "disabled" is first in a series of arguments */
             const char *tt = t;
-            const char *ww = ap_getword_conf(cmd->pool, &tt);
+            const char *ww = ap_getword_conf(cmd->temp_pool, &tt);
             if (ww == NULL || !ww[0]) {
                /* "disabled" is first, and alone */
                break;

Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=1002156&r1=1002155&r2=1002156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Tue Sep 28 13:19:33 2010
@@ -2823,10 +2823,9 @@ static const char *cmd_rewriteoptions(cm
                                       void *in_dconf, const char *option)
 {
     int options = 0;
-    char *w;
 
     while (*option) {
-        w = ap_getword_conf(cmd->pool, &option);
+        char *w = ap_getword_conf(cmd->temp_pool, &option);
 
         if (!strcasecmp(w, "inherit")) {
             options |= OPTION_INHERIT;

Modified: httpd/httpd/trunk/modules/metadata/mod_headers.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_headers.c?rev=1002156&r1=1002155&r2=1002156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_headers.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_headers.c Tue Sep 28 13:19:33 2010
@@ -520,14 +520,14 @@ static const char *header_cmd(cmd_parms 
     const char *envclause;
     const char *subs;
 
-    action = ap_getword_conf(cmd->pool, &args);
+    action = ap_getword_conf(cmd->temp_pool, &args);
     if (cmd->info == &hdr_out) {
         if (!strcasecmp(action, "always")) {
             cmd->info = &hdr_err;
-            action = ap_getword_conf(cmd->pool, &args);
+            action = ap_getword_conf(cmd->temp_pool, &args);
         }
         else if (!strcasecmp(action, "onsuccess")) {
-            action = ap_getword_conf(cmd->pool, &args);
+            action = ap_getword_conf(cmd->temp_pool, &args);
         }
     }
     hdr = ap_getword_conf(cmd->pool, &args);

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=1002156&r1=1002155&r2=1002156&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Tue Sep 28 13:19:33 2010
@@ -1081,7 +1081,7 @@ const char *ssl_cmd_SSLOptions(cmd_parms
     char action, *w;
 
     while (*arg) {
-        w = ap_getword_conf(cmd->pool, &arg);
+        w = ap_getword_conf(cmd->temp_pool, &arg);
         action = NUL;
 
         if ((*w == '+') || (*w == '-')) {

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1002156&r1=1002155&r2=1002156&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Tue Sep 28 13:19:33 2010
@@ -1331,7 +1331,7 @@ static const char *set_override(cmd_parm
 
     d->override = OR_NONE;
     while (l[0]) {
-        w = ap_getword_conf(cmd->pool, &l);
+        w = ap_getword_conf(cmd->temp_pool, &l);
 
         k = w;
         v = strchr(k, '=');
@@ -1382,7 +1382,7 @@ static const char *set_options(cmd_parms
     char action;
 
     while (l[0]) {
-        char *w = ap_getword_conf(cmd->pool, &l);
+        char *w = ap_getword_conf(cmd->temp_pool, &l);
         action = '\0';
 
         if (*w == '+' || *w == '-') {
@@ -1487,7 +1487,7 @@ static const char *set_etag_bits(cmd_par
         action = '*';
         bit = ETAG_UNSET;
         valid = 1;
-        token = ap_getword_conf(cmd->pool, &args);
+        token = ap_getword_conf(cmd->temp_pool, &args);
         if ((*token == '+') || (*token == '-')) {
             action = *token;
             token++;



Mime
View raw message