Commit bd6a3d15 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

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
parent c8e1f5ae

modules/http/http_filters.c

+2 −1
Original line number Diff line number Diff line
@@ -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() */

server/vhost.c

+2 −1
Original line number Diff line number Diff line
@@ -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) {

        /*