httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1506135 - in /httpd/httpd/branches/2.4.x: ./ STATUS support/htdbm.c
Date Tue, 23 Jul 2013 16:04:01 GMT
Author: jim
Date: Tue Jul 23 16:04:00 2013
New Revision: 1506135

URL: http://svn.apache.org/r1506135
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/support/htdbm.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1503866

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1506135&r1=1506134&r2=1506135&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Jul 23 16:04:00 2013
@@ -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:

Modified: httpd/httpd/branches/2.4.x/support/htdbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/htdbm.c?rev=1506135&r1=1506134&r2=1506135&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/htdbm.c (original)
+++ httpd/httpd/branches/2.4.x/support/htdbm.c Tue Jul 23 16:04:00 2013
@@ -337,7 +337,7 @@ int main(int argc, const char * const ar
     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;



Mime
View raw message