Commit 06e563bf authored by Rainer Jung's avatar Rainer Jung
Browse files

Merge r1796538 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
parent 32269c80

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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]

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -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 .

support/ab.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {