Commit 4769abc4 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r485311 from trunk: 

Stop mod_dbd emitting bogus error messages when it's loaded
but not configured.

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@486157 13f79535-47bb-0310-9956-ffa450edef68
parent 97a735b0

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
  [ start all new proposals below, under PATCHES PROPOSED. ]





   * mod_dbd: Don't try to set up a connection pool (and emit bogus

              error messages) when DBD isn't configured.

     http://svn.apache.org/viewvc?view=rev&revision=485311

     +1: niq, rpluem, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:



    * mpm_winnt: Fix return values from wait_for_many_objects.

modules/database/mod_dbd.c

+21 −0
Changes for modules/database/mod_dbd.c: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -361,6 +361,15 @@ static apr_status_t dbd_setup_init(apr_pool_t *pool, server_rec *s) 
    svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);

    apr_status_t rv;



    /* dbd_setup in 2.2.3 and under was causing spurious error messages

     * when dbd isn't configured.  We can stop that with a quick check here

     * together with a similar check in ap_dbd_open (where being

     * unconfigured is a genuine error that must be reported).

     */

    if (svr->name == no_dbdriver) {

        return APR_SUCCESS;

    }



    if (!svr->persist) {

        return APR_SUCCESS;

    }
@@ -442,6 +451,12 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s) 
    apr_status_t rv = APR_SUCCESS;

    const char *errmsg;



    /* If nothing is configured, we shouldn't be here */

    if (svr->name == no_dbdriver) {

        ap_log_perror(APLOG_MARK, APLOG_ERR, 0, pool, "DBD: not configured");

        return NULL;

    }



    if (!svr->persist) {

        /* Return a once-only connection */

        rv = dbd_construct(&rec, svr, s->process->pool);
@@ -480,6 +495,12 @@ DBD_DECLARE_NONSTD(ap_dbd_t*) ap_dbd_open(apr_pool_t *pool, server_rec *s) 
    void *rec = NULL;

    svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);



    /* If nothing is configured, we shouldn't be here */

    if (svr->name == no_dbdriver) {

        ap_log_perror(APLOG_MARK, APLOG_ERR, 0, pool, "DBD: not configured");

        return NULL;

    }



    if (!svr->persist) {

        /* Return a once-only connection */

        rv = dbd_construct(&rec, svr, s->process->pool);