You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2014/06/21 15:41:28 UTC
svn commit: r1604373 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
support/ab.c
Author: trawick
Date: Sat Jun 21 13:41:28 2014
New Revision: 1604373
URL: http://svn.apache.org/r1604373
Log:
Merge r1601076 from trunk:
ab: support custom HTTP method with -m argument.
PR: 56604
Submitted by: Roman Jurkov <winfinit gmail.com>
Reviewed by: ylavic, trawick, covener
(r1601680 and r1601700 not reflected in mergeinfo due to
a collision with an unrelated trunk change)
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/support/ab.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1601076
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1604373&r1=1604372&r2=1604373&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Jun 21 13:41:28 2014
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.4.10
+
+ *) ab: support custom HTTP method with -m argument. PR 56604.
+ [Roman Jurkov <winfinit gmail.com>]
+
*) mod_proxy_balancer: Correctly encode user provided data in management
interface. PR 56532 [Maksymilian, <max cert.cx>]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1604373&r1=1604372&r2=1604373&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Jun 21 13:41:28 2014
@@ -143,15 +143,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
ylavic: I don't have any conflict here but with r1586745 regarding
docs/log-message-tags. BTW 2.4.x patch provided above.
- * ab: support custom HTTP method with -m argument. PR 56604.
- trunk patch: http://svn.apache.org/r1601076
- http://svn.apache.org/r1601680
- http://svn.apache.org/r1601700
- 2.4.x patch: trunk works (modulo CHANGES)
- 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ab_custom_method.patch
- (modulo CHANGES)
- +1: ylavic, trawick, covener
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/support/ab.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/ab.c?rev=1604373&r1=1604372&r2=1604373&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/ab.c (original)
+++ httpd/httpd/branches/2.4.x/support/ab.c Sat Jun 21 13:41:28 2014
@@ -266,14 +266,14 @@ struct data {
int verbosity = 0; /* no verbosity by default */
int recverrok = 0; /* ok to proceed after socket receive errors */
-enum {NO_METH = 0, GET, HEAD, PUT, POST} method = NO_METH;
-const char *method_str[] = {"bug", "GET", "HEAD", "PUT", "POST"};
+enum {NO_METH = 0, GET, HEAD, PUT, POST, CUSTOM_METHOD} method = NO_METH;
+const char *method_str[] = {"bug", "GET", "HEAD", "PUT", "POST", ""};
int send_body = 0; /* non-zero if sending body with request */
int requests = 1; /* Number of requests to make */
int heartbeatres = 100; /* How often do we say we're alive */
int concurrency = 1; /* Number of multiple requests to make */
int percentile = 1; /* Show percentile served */
-int nolength = 0; /* Accept variable document length */
+int nolength = 0; /* Accept variable document length */
int confidence = 1; /* Show confidence estimator and warnings */
int tlimit = 0; /* time limit in secs */
int keepalive = 0; /* try and do keepalive connections */
@@ -1949,6 +1949,7 @@ static void usage(const char *progname)
fprintf(stderr, " -g filename Output collected data to gnuplot format file.\n");
fprintf(stderr, " -e filename Output CSV file with percentages served\n");
fprintf(stderr, " -r Don't exit on socket receive errors.\n");
+ fprintf(stderr, " -m method Method name\n");
fprintf(stderr, " -h Display usage information (this message)\n");
#ifdef USE_SSL
@@ -2127,7 +2128,7 @@ int main(int argc, const char * const ar
myhost = NULL; /* 0.0.0.0 or :: */
apr_getopt_init(&opt, cntxt, argc, argv);
- while ((status = apr_getopt(opt, "n:c:t:s:b:T:p:u:v:lrkVhwix:y:z:C:H:P:A:g:X:de:SqB:"
+ while ((status = apr_getopt(opt, "n:c:t:s:b:T:p:u:v:lrkVhwix:y:z:C:H:P:A:g:X:de:SqB:m:"
#ifdef USE_SSL
"Z:f:"
#endif
@@ -2300,6 +2301,10 @@ int main(int argc, const char * const ar
case 'Z':
ssl_cipher = strdup(opt_arg);
break;
+ case 'm':
+ method = CUSTOM_METHOD;
+ method_str[CUSTOM_METHOD] = strdup(opt_arg);
+ break;
case 'f':
if (strncasecmp(opt_arg, "ALL", 3) == 0) {
meth = SSLv23_client_method();
Re: svn commit: r1604373 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
STATUS support/ab.c
Posted by Yann Ylavic <yl...@gmail.com>.
On Sat, Jun 21, 2014 at 11:24 PM, Jeff Trawick <tr...@gmail.com> wrote:
> On Sat, Jun 21, 2014 at 4:49 PM, Marion & Christophe JAILLET
> <ch...@wanadoo.fr> wrote:
>>
>> Hi,
>>
>> doc should also be updated accordingly + compatibility note should be
>> added to state in which version this -m option has been added.
>
>
> Thanks for noting this. We shouldn't have voted to include it in the 2.4.x
> branch without documentation.
>
> r1604461 and r1604463.
Thanks for the work Jeff, I should have done it.
Re: svn commit: r1604373 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
STATUS support/ab.c
Posted by Jeff Trawick <tr...@gmail.com>.
On Sat, Jun 21, 2014 at 4:49 PM, Marion & Christophe JAILLET <
christophe.jaillet@wanadoo.fr> wrote:
> Hi,
>
> doc should also be updated accordingly + compatibility note should be
> added to state in which version this -m option has been added.
>
Thanks for noting this. We shouldn't have voted to include it in the 2.4.x
branch without documentation.
r1604461 and r1604463.
>
>
> For your information,, I have a pending patch on my computer for missing
> compatibility notes in "support" applications updated in previous releases.
> Will be applied shortly.
>
> CJ
>
> Le 21/06/2014 15:41, trawick@apache.org a écrit :
>
> Author: trawick
>> Date: Sat Jun 21 13:41:28 2014
>> New Revision: 1604373
>>
>> URL:http://svn.apache.org/r1604373
>> Log:
>> Merge r1601076 from trunk:
>>
>> ab: support custom HTTP method with -m argument.
>>
>> PR: 56604
>> Submitted by: Roman Jurkov <winfinit gmail.com>
>> Reviewed by: ylavic, trawick, covener
>>
>> (r1601680 and r1601700 not reflected in mergeinfo due to
>> a collision with an unrelated trunk change)
>>
>> Modified:
>> httpd/httpd/branches/2.4.x/ (props changed)
>> httpd/httpd/branches/2.4.x/CHANGES
>> httpd/httpd/branches/2.4.x/STATUS
>> httpd/httpd/branches/2.4.x/support/ab.c
>>
>
>
--
Born in Roswell... married an alien...
http://emptyhammock.com/
http://edjective.org/
Re: svn commit: r1604373 - in /httpd/httpd/branches/2.4.x: ./ CHANGES
STATUS support/ab.c
Posted by Marion & Christophe JAILLET <ch...@wanadoo.fr>.
Hi,
doc should also be updated accordingly + compatibility note should be
added to state in which version this -m option has been added.
For your information,, I have a pending patch on my computer for missing
compatibility notes in "support" applications updated in previous releases.
Will be applied shortly.
CJ
Le 21/06/2014 15:41, trawick@apache.org a écrit :
> Author: trawick
> Date: Sat Jun 21 13:41:28 2014
> New Revision: 1604373
>
> URL:http://svn.apache.org/r1604373
> Log:
> Merge r1601076 from trunk:
>
> ab: support custom HTTP method with -m argument.
>
> PR: 56604
> Submitted by: Roman Jurkov <winfinit gmail.com>
> Reviewed by: ylavic, trawick, covener
>
> (r1601680 and r1601700 not reflected in mergeinfo due to
> a collision with an unrelated trunk change)
>
> Modified:
> httpd/httpd/branches/2.4.x/ (props changed)
> httpd/httpd/branches/2.4.x/CHANGES
> httpd/httpd/branches/2.4.x/STATUS
> httpd/httpd/branches/2.4.x/support/ab.c