Merge r1503866 from trunk:

Fix command line parsing. This was introduced in r1395253 when refactoring the code.
Untested
PR 55264 <jrhett netconsonance com>
Submitted by: jailletc36
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index aeb63d518cffdea8b41bf5e6b6932f44d875b224..8b3285b77dab5bf2bdde7a7ea3d64977b8dcf4ee 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -92,12 +92,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * support/htdbm: fix processing of -t command line switch. Regression
-    introduced in 2.4.4
-    PR55264 [Jo Rhett <jrhett netconsonance com>]
-    trunk: http://svn.apache.org/r1503866
-    2.4.x patch: trunk works
-    +1: jailletc36, druggeri, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/support/htdbm.c b/support/htdbm.c
index 1452d7a0eb89ac2693410b51e78fc129114ac914..1cd0591fe6bd0a70c0edf564d96187830f4d8a11 100644 (file)
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -337,7 +337,7 @@ int main(int argc, const char * const argv[])
     if (rv != APR_SUCCESS)
         exit(ERR_SYNTAX);
 
-    while ((rv = apr_getopt(state, "cnmspdBbDivxlC:T:", &opt, &opt_arg)) == APR_SUCCESS) {
+    while ((rv = apr_getopt(state, "cnmspdBbtivxlC:T:", &opt, &opt_arg)) == APR_SUCCESS) {
         switch (opt) {
         case 'c':
             h->create = 1;