From: William A. Rowe Jr Date: Mon, 22 Oct 2001 04:36:46 +0000 (+0000) Subject: Fix two typos in the last patch... compiles/tests clean... Greg, please X-Git-Tag: 2.0.27~50 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=429f7ef0d565fe900487e3ea07ae42b94e809f7f;p=apache Fix two typos in the last patch... compiles/tests clean... Greg, please run this against Apache.org until the first core and post the results. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91625 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/core.c b/server/core.c index c906fd6f48..d62f8c38ef 100644 --- a/server/core.c +++ b/server/core.c @@ -228,7 +228,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) if (conf->response_code_strings == NULL) { conf->response_code_strings = new->response_code_strings; } - else (new->response_code_strings != NULL) { + else if (new->response_code_strings != NULL) { /* If we merge, the merge-result must have it's own array */ conf->response_code_strings = apr_palloc(a, @@ -286,7 +286,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) if (!conf->sec_file) { conf->sec_file = new->sec_file; } - else if (new->sec_file) + else if (new->sec_file) { /* If we merge, the merge-result must have it's own array */ conf->sec_file = apr_array_append(a, base->sec_file, new->sec_file);