diff options
author | Christophe Jaillet <jailletc36@apache.org> | 2016-05-21 20:39:59 +0000 |
---|---|---|
committer | Christophe Jaillet <jailletc36@apache.org> | 2016-05-21 20:39:59 +0000 |
commit | a023efd4b1228c05e6fc91c8542fe24395a501e6 (patch) | |
tree | 1c4ccf25291bce6a0a5b133e68a4560e29fc8084 /server/config.c | |
parent | 458fb36436e490962b0c341940d07c57c453cded (diff) | |
download | httpd-a023efd4b1228c05e6fc91c8542fe24395a501e6.tar.gz |
Save a few bytes in the conf pool.
The directive's names don't need to be duplicated in this pool when parsing the configuration file.
Either they match a known directive name and we can use it directly if needed. Otherwise, it is still possible to make a copy afterwards.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1744980 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
-rw-r--r-- | server/config.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/server/config.c b/server/config.c index 3264d0a550..ac81e94c4f 100644 --- a/server/config.c +++ b/server/config.c @@ -1122,7 +1122,11 @@ static const char *ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool, args = ap_resolve_env(temp_pool, l); #endif - cmd_name = ap_getword_conf(p, &args); + /* The first word is the name of a directive. We can safely use the + * 'temp_pool' for it. If it matches the name of a known directive, we + * can reference the string within the module if needed. Otherwise, we + * can still make a copy in the 'p' pool. */ + cmd_name = ap_getword_conf(temp_pool, &args); if (*cmd_name == '\0') { /* Note: this branch should not occur. An empty line should have * triggered the exit further above. @@ -1143,10 +1147,11 @@ static const char *ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool, newdir = apr_pcalloc(p, sizeof(ap_directive_t)); newdir->filename = parms->config_file->name; newdir->line_num = parms->config_file->line_number; - newdir->directive = cmd_name; newdir->args = apr_pstrdup(p, args); if ((cmd = ap_find_command_in_modules(cmd_name, &mod)) != NULL) { + newdir->directive = cmd->name; + if (cmd->req_override & EXEC_ON_READ) { ap_directive_t *sub_tree = NULL; @@ -1180,6 +1185,11 @@ static const char *ap_build_config_sub(apr_pool_t *p, apr_pool_t *temp_pool, return retval; } } + else { + /* No known directive found? Make a copy of what we have parsed. */ + newdir->directive = apr_pstrdup(p, cmd_name); + } + if (cmd_name[0] == '<') { if (cmd_name[1] != '/') { |