Commit 5d60ca50 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1741570 from trunk: 

* Silence compiler warning
Submitted by: rpluem
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1775825 13f79535-47bb-0310-9956-ffa450edef68
parent 948e372d

STATUS

+1 −7
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Release history: 
          while x.{even}.z versions are Stable/GA releases.]



    2.4.26  : In development.

    2.4.25  : Tagged on December 16, 2016.

    2.4.25  : Tagged on December 16, 2016. Released on December 21, 2016.

    2.4.24  : Tagged on December 16, 2016, not released.

    2.4.23  : Tagged on June 30, 2016. Released on July 05, 2016.

    2.4.22  : Tagged on June 20, 2016, not released.
@@ -119,12 +119,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_proxy_express.c: Silence compiler warning

     "111: warning: 'backend' may be used uninitialized in this function"

     trunk patch: http://svn.apache.org/r1741570

     2.4.x patch: trunk works

     +1: rjung, jim, ylavic



  *) mod_ssl: Silence compiler warning

     "686: warning: 'ok' may be used uninitialized in

     this function"

modules/proxy/mod_proxy_express.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int xlate_name(request_rec *r) 
{

    int i;

    const char *name;

    char *backend;

    char *backend = NULL;

    apr_dbm_t *db;

    apr_status_t rv;

    apr_datum_t key, val;