Commit d88d8835 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1737014 from trunk: 

mod_proxy_express: Fix possible use of DB handle after close.
PR 59230.

Submitted by: Petr <pgajdos suse.cz>
Reviewed by: ylavic, trawick, wrowe



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

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.20



  *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.

     [Petr <pgajdos suse.cz>]

     

  *) core/util_script: relax alphanumeric filter of enviroment variable names

     on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al.

     unadulterated in 64 bit versions of Windows. PR 46751.

STATUS

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

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



  *) mod_proxy_express: Fix possible use of DB handle after close.  PR 59230.

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

     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, trawick, wrowe



  *) core: Do not read .htaccess if AllowOverride and AllowOverrideList

     are "None". PR 58528.

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

modules/proxy/mod_proxy_express.c

+4 −6
Original line number Diff line number Diff line
@@ -145,13 +145,11 @@ static int xlate_name(request_rec *r) 
    key.dsize = strlen(key.dptr);



    rv = apr_dbm_fetch(db, key, &val);

    apr_dbm_close(db);

    if (rv != APR_SUCCESS) {

        return DECLINED;

    }



    if (rv == APR_SUCCESS) {

        backend = apr_pstrmemdup(r->pool, val.dptr, val.dsize);

    if (!backend) {

    }

    apr_dbm_close(db);

    if (rv != APR_SUCCESS || !backend) {

        return DECLINED;

    }