Commit d7f2be6

author

Marc Stern

authored

Merge pull request #3270 from Marcool04/v2/master

make rootpath and incpath consts for apr_filepath_root

2 parents 1121ef0 + 4919814 commit d7f2be6Copy full SHA for d7f2be6

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1028,7 +1028,8 @@ const char process_command_config(server_rec s,`
`1028`	`1028`	`ap_directive_t *newdir;`
`1029`	`1029`	`int optional;`
`1030`	`1030`	`char *err = NULL;`
`1031`		`- char rootpath, incpath;`
	`1031`	`+ const char rootpath, incpath;`
	`1032`	`+ char *configfilepath;`
`1032`	`1033`	`int li;`
`1033`	`1034`
`1034`	`1035`	`errmsg = populate_include_files(p, ptemp, ari, filename, 0);`
`@@ -1108,13 +1109,13 @@ const char process_command_config(server_rec s,`
`1108`	`1109`
`1109`	`1110`	`/* we allow APR_SUCCESS and APR_EINCOMPLETE */`
`1110`	`1111`	`if (APR_ERELATIVE == status) {`
`1111`		`- rootpath = apr_pstrdup(ptemp, parms->config_file->name);`
`1112`		`- li = strlen(rootpath) - 1;`
	`1112`	`+ configfilepath = apr_pstrdup(ptemp, parms->config_file->name);`
	`1113`	`+ li = strlen(configfilepath) - 1;`
`1113`	`1114`
`1114`		`- while(li >= 0 && rootpath[li] != '/' && rootpath[li] != '\\')`
`1115`		`- rootpath[li--] = 0;`
	`1115`	`+ while(li >= 0 && configfilepath[li] != '/' && configfilepath[li] != '\\')`
	`1116`	`+ configfilepath[li--] = 0;`
`1116`	`1117`
`1117`		`- w = apr_pstrcat(p, rootpath, w, NULL);`
	`1118`	`+ w = apr_pstrcat(p, configfilepath, w, NULL);`
`1118`	`1119`	`}`
`1119`	`1120`	`else if (APR_EBADPATH == status) {`
`1120`	`1121`	`ap_cfg_closefile(parms->config_file);`

Comments

(0)