Commit e3448227 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1775173 from trunk: 

Silence compiler warning:
"686: warning: 'ok' may be used uninitialized in
this function"
This is a false positive, because the value of "ok"
will only be used if stapling_get_cached_response()
sets "rsp" to non-NULL in which case it will always
have set "ok".

Submitted by: rjung
Reviewed/backported by: jim


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

STATUS

+0 −11
Original line number Diff line number Diff line
@@ -119,17 +119,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

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



  *) mod_ssl: Silence compiler warning

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

     this function"

     This is a false positive, because the value of "ok"

     will only be used if stapling_get_cached_response()

     sets "rsp" to non-NULL in which case it will always

     have set "ok".

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

     2.4.x patch: trunk works

     +1: rjung, jim, ylavic



  *) core: remove isascci check before narrower checks in vhost checking

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

                  http://svn.apache.org/r1775664

modules/ssl/ssl_util_stapling.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static int get_and_check_cached_response(server_rec *s, modssl_ctx_t *mctx, 
                                         OCSP_RESPONSE **rsp, BOOL *pok,

                                         certinfo *cinf, apr_pool_t *p)

{

    BOOL ok;

    BOOL ok = FALSE;

    int rv;



    AP_DEBUG_ASSERT(*rsp == NULL);