diff options
author | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:53 +0100 |
---|---|---|
committer | Stefan Fritsch <sf@sfritsch.de> | 2011-12-27 19:42:53 +0100 |
commit | db26b587c04799e75b6dd0fcd4b46aaa168f9161 (patch) | |
tree | 127af2f77fd3eddb75604ebecedeeea163325078 /modules/database | |
parent | d9f98b967bedecc0bffe82682d1ed4e06c9df687 (diff) | |
download | apache2-db26b587c04799e75b6dd0fcd4b46aaa168f9161.tar.gz |
Upstream tarball 2.2.15upstream/2.2.15
Diffstat (limited to 'modules/database')
-rw-r--r-- | modules/database/mod_dbd.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c index 9914875c..cb01193f 100644 --- a/modules/database/mod_dbd.c +++ b/modules/database/mod_dbd.c @@ -641,6 +641,15 @@ static apr_status_t dbd_setup_init(apr_pool_t *pool, server_rec *s) return rv; } +static void dbd_child_init(apr_pool_t *p, server_rec *s) +{ + apr_status_t rv = dbd_setup_init(p, s); + if (rv) { + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, + "DBD: child init failed!"); + } +} + #if APR_HAS_THREADS static apr_status_t dbd_setup_lock(server_rec *s, dbd_group_t *group) { @@ -895,7 +904,7 @@ static void dbd_hooks(apr_pool_t *pool) { ap_hook_pre_config(dbd_pre_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_post_config(dbd_post_config, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_child_init((void*)dbd_setup_init, NULL, NULL, APR_HOOK_MIDDLE); + ap_hook_child_init(dbd_child_init, NULL, NULL, APR_HOOK_MIDDLE); APR_REGISTER_OPTIONAL_FN(ap_dbd_prepare); APR_REGISTER_OPTIONAL_FN(ap_dbd_open); |