From e4775b049e35026a66afe5564c820895478da253 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 23 Jul 2013 16:04:00 +0000 Subject: [PATCH] Merge r1503866 from trunk: Fix command line parsing. This was introduced in r1395253 when refactoring the code. Untested PR 55264 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 --- STATUS | 6 ------ support/htdbm.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/STATUS b/STATUS index aeb63d518c..8b3285b77d 100644 --- 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 ] - 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 1452d7a0eb..1cd0591fe6 100644 --- 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; -- 2.40.0