From: Chris Darroch <chrisd@apache.org>
Date: Tue, 25 Mar 2008 23:21:11 +0000 (+0000)
Subject: Propose PR 43210 and r468042 fixes from trunk mod_authn_dbd for backport.
X-Git-Tag: 2.2.9~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08b70a3d54586dd5f6b5d64d59a3f12b4bbbee90;p=thirdparty%2Fapache%2Fhttpd.git

Propose PR 43210 and r468042 fixes from trunk mod_authn_dbd for backport.


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

diff --git a/STATUS b/STATUS
index de6ad2dba71..896140efd58 100644
--- a/STATUS
+++ b/STATUS
@@ -226,7 +226,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        http://svn.apache.org/viewvc?view=rev&revision=568879
    Backport version for 2.2.x of patch:
        http://people.apache.org/~chrisd/patches/mod_headers_merge/mod_headers-merge-2.2.x.patch
-   +1 chrisd, niq
+   +1: chrisd, niq
 
   * mod_speling: remove regression from 1.3/2.0 behavior and
     drop dependency between mod_speling and AcceptPathInfo.
@@ -237,6 +237,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        Trunk version of patch works
    +1: jim, niq
 
+ * mod_authn_dbd: Disambiguate and tidy database authentication
+   error messages.  Also move assignment statements after #if blocks
+   to avoid having them treated as variable declarations.
+   PR: 43210.
+   Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=639079
+       http://svn.apache.org/viewvc?view=rev&revision=468042
+   Backport version for 2.2.x of patch:
+       http://people.apache.org/~chrisd/patches/mod_authn_dbd_msgs/mod_authn_dbd-msgs-2.2.x.patch
+   +1: chrisd
+
 PATCHES/ISSUES THAT ARE STALLED
 
    * beos MPM: Create pmain pool and run modules' child_init hooks when