VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 23:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657692 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christophe Jaillet
2015-02-05 21:03:04 +00:00
parent be32097e6c
commit 25a2e41ea7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/filters/mod_filter.c
View File

@ -362,7 +362,7 @@ static const char *filter_protocol(cmd_parms *cmd, void *CFG, const char *fname,
}
/* Now set flags from our args */
for (arg = apr_strtok(apr_pstrdup(cmd->pool, proto), sep, &tok);
for (arg = apr_strtok(apr_pstrdup(cmd->temp_pool, proto), sep, &tok);
arg; arg = apr_strtok(NULL, sep, &tok)) {
if (!strcasecmp(arg, "change=yes")) {

4
os/unix/unixd.c
View File

@ -74,7 +74,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
return;
}
if (*(str = ap_getword_conf(cmd->pool, &arg)) != '\0') {
if (*(str = ap_getword_conf(cmd->temp_pool, &arg)) != '\0') {
if (!strcasecmp(str, "max")) {
cur = limit->rlim_max;
}
@ -88,7 +88,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
return;
}
if (arg2 && (*(str = ap_getword_conf(cmd->pool, &arg2)) != '\0')) {
if (arg2 && (*(str = ap_getword_conf(cmd->temp_pool, &arg2)) != '\0')) {
max = atol(str);
}

2
server/mpm_common.c
View File

@ -360,7 +360,7 @@ const char *ap_mpm_set_coredumpdir(cmd_parms *cmd, void *dummy,
return err;
}
fname = ap_server_root_relative(cmd->pool, arg);
fname = ap_server_root_relative(cmd->temp_pool, arg);
if (!fname) {
return apr_pstrcat(cmd->pool, "Invalid CoreDumpDirectory path ",
arg, NULL);