From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 19 Oct 2018 15:57:06 +0000 (+0000)
Subject: Fix a shadow (and useless) variable.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d11a3b2eabb32d4af00943aa5acd1821e0a0f1e5;p=apache

Fix a shadow (and useless) variable.

Fix a cppcheck warning and a style issue.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1844352 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index a95e6a06d7..4c79ae165a 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1348,7 +1348,7 @@ request_rec *ap_read_request(conn_rec *conn)
     apr_bucket_brigade *tmp_bb;
     apr_socket_t *csd;
     apr_interval_time_t cur_timeout;
-    core_server_config *conf = NULL;
+    core_server_config *conf;
 
     request_rec *r = ap_create_request(conn);
 
@@ -1533,9 +1533,6 @@ request_rec *ap_read_request(conn_rec *conn)
             r->expecting_100 = 1;
         }
         else {
-            core_server_config *conf;
-
-            conf = ap_get_core_module_config(r->server->module_config);
             if (conf->http_expect_strict != AP_HTTP_EXPECT_STRICT_DISABLE) {
                 r->status = HTTP_EXPECTATION_FAILED;
                 ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r, APLOGNO(00570)
@@ -1545,7 +1542,8 @@ request_rec *ap_read_request(conn_rec *conn)
                 ap_update_child_status(conn->sbh, SERVER_BUSY_LOG, r);
                 ap_run_log_transaction(r);
                 goto traceout;
-            } else {
+            }
+            else {
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02595)
                               "client sent an unrecognized expectation value "
                               "of Expect (not fatal): %s", expect);