github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3270 from Marcool04/v2/master

Browse Source 
make rootpath and incpath consts for apr_filepath_root
This commit is contained in:
Marc Stern 2024-10-04 16:30:29 +02:00 committed by GitHub
commit d7f2be60ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
standalone/config.c
View File

@ -1028,7 +1028,8 @@ const char *process_command_config(server_rec *s,
ap_directive_t *newdir;
int optional;
char *err = NULL;
char *rootpath, *incpath;
const char *rootpath, *incpath;
char *configfilepath;
int li;
errmsg = populate_include_files(p, ptemp, ari, filename, 0);
@ -1108,13 +1109,13 @@ ProcessInclude:
/* we allow APR_SUCCESS and APR_EINCOMPLETE */
if (APR_ERELATIVE == status) {
rootpath = apr_pstrdup(ptemp, parms->config_file->name);
li = strlen(rootpath) - 1;
configfilepath = apr_pstrdup(ptemp, parms->config_file->name);
li = strlen(configfilepath) - 1;
while(li >= 0 && rootpath[li] != '/' && rootpath[li] != '\\')
rootpath[li--] = 0;
while(li >= 0 && configfilepath[li] != '/' && configfilepath[li] != '\\')
configfilepath[li--] = 0;
w = apr_pstrcat(p, rootpath, w, NULL);
w = apr_pstrcat(p, configfilepath, w, NULL);
}
else if (APR_EBADPATH == status) {
ap_cfg_closefile(parms->config_file);