From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 4 Nov 2016 20:47:00 +0000 (+0000)
Subject: Stupid CodeWarrior compiler cant take vars with struct inits.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c8a80882f996537086856e55870315cc0efab72;p=thirdparty%2Fapache%2Fhttpd.git

Stupid CodeWarrior compiler cant take vars with struct inits.
Ensure that is_v6literal is always initialized

Backports: r1428145, r1436457
Submitted by: fuankg, rpluem



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict@1768090 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index c2dd0ce092d..aa95829a22d 100644
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -709,8 +709,9 @@ static int check_header(void *arg, const char *name, const char *val)
 static APR_INLINE int check_headers(request_rec *r)
 {
     const char *loc;
-    struct check_header_ctx ctx = { r, 0 };
+    struct check_header_ctx ctx = { 0, 0 };
 
+    ctx.r = r;
     apr_table_do(check_header, &ctx, r->headers_out, NULL);
     if (ctx.error)
         return 0; /* problem has been logged by check_header() */
diff --git a/server/vhost.c b/server/vhost.c
index 227081c473d..393e7ab4a81 100644
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -1145,7 +1145,8 @@ AP_DECLARE(void) ap_update_vhost_from_headers(request_rec *r)
 {
     core_server_config *conf = ap_get_core_module_config(r->server->module_config);
     const char *host_header = apr_table_get(r->headers_in, "Host");
-    int is_v6literal, have_hostname_from_url = 0;
+    int is_v6literal = 0;
+    int have_hostname_from_url = 0;
 
     if (r->hostname) {
         /*