From: Rainer Jung <rjung@apache.org>
Date: Sun, 28 May 2017 21:15:41 +0000 (+0000)
Subject: Merge r1796493 from trunk:
X-Git-Tag: 2.4.26~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a188dcfa9062f67f6709fb3b81dc45e52bb355e7;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1796493 from trunk:

ab: enable option processing for setting a custom
HTTP method also for non-SSL builds.

Submitted by: rjung
Reviewed by: rjung, covener, gsmith


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

diff --git a/CHANGES b/CHANGES
index 18d5121f8d6..80f76f64d9b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.26
 
+  *) ab: enable option processing for setting a custom HTTP method also for
+     non-SSL builds.  [Rainer Jung]
+
   *) core: EBCDIC fixes for interim responses with additional headers.
      [Eric Covener]
 
diff --git a/STATUS b/STATUS
index 7fb35a83f5c..69a4cad9f10 100644
--- a/STATUS
+++ b/STATUS
@@ -120,12 +120,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) ab: enable option processing for setting a custom
-     HTTP method also for non-SSL builds.
-     trunk patch: http://svn.apache.org/r1796493
-     2.4.x patch: svn merge -c 1796493 ^/httpd/httpd/trunk .
-     +1: rjung, covener, gsmith
-
   *) core: ap_parse_form_data() doesn't work on EBCDIC systems. PR61124.
      trunk patch: http://svn.apache.org/r1796446
      2.4.x patch: svn merge -c 1796446 ^/httpd/httpd/trunk .
diff --git a/support/ab.c b/support/ab.c
index 25926e9ccd8..daba92e83d4 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -2390,14 +2390,14 @@ int main(int argc, const char * const argv[])
             case 'B':
                 myhost = apr_pstrdup(cntxt, opt_arg);
                 break;
-#ifdef USE_SSL
-            case 'Z':
-                ssl_cipher = strdup(opt_arg);
-                break;
             case 'm':
                 method = CUSTOM_METHOD;
                 method_str[CUSTOM_METHOD] = strdup(opt_arg);
                 break;
+#ifdef USE_SSL
+            case 'Z':
+                ssl_cipher = strdup(opt_arg);
+                break;
             case 'f':
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
                 if (strncasecmp(opt_arg, "ALL", 3) == 0) {