httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r819429 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/database/mod_dbd.c
Date Mon, 28 Sep 2009 00:24:57 GMT
Author: fuankg
Date: Mon Sep 28 00:24:56 2009
New Revision: 819429

URL: http://svn.apache.org/viewvc?rev=819429&view=rev
Log:
mod_dbd: Backport of r708820 from trunk to avoid compiler warnings
with strict compilers like Sun Studio. Reported on the list by Jie Gao.

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=819429&r1=819428&r2=819429&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Sep 28 00:24:56 2009
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.15
 
+  *) mod_dbd: Backport of r708820 from trunk to avoid compiler warnings with
+     strict compilers like Sun Studio. Reported on the list by Jie Gao.
+     [Guenter Knauf]
+
   *) mod_mime: Detect invalid use of MultiviewsMatch inside Location and
      LocationMatch sections.  PR47754. [Dan Poirier]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=819429&r1=819428&r2=819429&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Sep 28 00:24:56 2009
@@ -87,12 +87,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_dbd: Backport r708820 from trunk to avoid compiler warnings with
-   strict compilers like Sun Studio.  Mentioned on the list by Jie Gao.
-   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=708820
-   2.2.x Patch: trunk patch works with offset -6 / -9 lines.
-   +1: fuankg, trawick, rpluem
-
  * mod_ssl: Backport of r819373 from trunk; fix wrong 3rd parameter passed
    to to apr_brigade_split_line().  Mentioned on the list by Jie Gao.
    Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=819373

Modified: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c?rev=819429&r1=819428&r2=819429&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c (original)
+++ httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c Mon Sep 28 00:24:56 2009
@@ -641,6 +641,15 @@
     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 @@
 {
     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);



Mime
View raw message