diff options
| author | Yann Ylavic <ylavic@apache.org> | 2023-04-23 22:44:21 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2023-04-23 22:44:21 +0200 |
| commit | 2f09e388bf1178d1b5f9d62ec93580e5320d5bbc (patch) | |
| tree | 8f623f40f5476b9c9d92f694bc3e0fcdd689f9be /server | |
| parent | core: Restore original regex value when nesting Location, (diff) | |
| download | apache2-2f09e388bf1178d1b5f9d62ec93580e5320d5bbc.tar.xz apache2-2f09e388bf1178d1b5f9d62ec93580e5320d5bbc.zip | |
Follow up to r1909356: c89/style fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909368 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/core.c b/server/core.c index 7c9b250b7f..ef7868107d 100644 --- a/server/core.c +++ b/server/core.c @@ -2552,9 +2552,9 @@ static const char *dirsection(cmd_parms *cmd, void *mconfig, const char *arg) return "Regex could not be compiled"; } } - else if (strcmp(cmd->path, "/") != 0) - { + else if (strcmp(cmd->path, "/") != 0) { int run_mode = ap_state_query(AP_SQ_RUN_MODE); + apr_status_t rv; char *newpath; cmd->regex = NULL; @@ -2562,8 +2562,8 @@ static const char *dirsection(cmd_parms *cmd, void *mconfig, const char *arg) /* * Ensure that the pathname is canonical, and append the trailing / */ - apr_status_t rv = apr_filepath_merge(&newpath, NULL, cmd->path, - APR_FILEPATH_TRUENAME, cmd->pool); + rv = apr_filepath_merge(&newpath, NULL, cmd->path, + APR_FILEPATH_TRUENAME, cmd->pool); if (rv != APR_SUCCESS && rv != APR_EPATHWILD) { return apr_pstrcat(cmd->pool, "<Directory \"", cmd->path, "\"> path is invalid.", NULL); |