Return-Path: X-Original-To: apmail-jmeter-dev-archive@minotaur.apache.org Delivered-To: apmail-jmeter-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D7D60181C1 for ; Tue, 16 Feb 2016 21:10:08 +0000 (UTC) Received: (qmail 21142 invoked by uid 500); 16 Feb 2016 21:10:08 -0000 Delivered-To: apmail-jmeter-dev-archive@jmeter.apache.org Received: (qmail 21114 invoked by uid 500); 16 Feb 2016 21:10:08 -0000 Mailing-List: contact dev-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list dev@jmeter.apache.org Received: (qmail 21103 invoked by uid 99); 16 Feb 2016 21:10:08 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Feb 2016 21:10:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id DB6681A0019 for ; Tue, 16 Feb 2016 21:10:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.471 X-Spam-Level: * X-Spam-Status: No, score=1.471 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id lVJ9REFamBw5 for ; Tue, 16 Feb 2016 21:10:04 +0000 (UTC) Received: from internetallee.de (internetallee.de [81.169.162.220]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTPS id 0C7A55FBCD for ; Tue, 16 Feb 2016 21:10:04 +0000 (UTC) Received: from [192.168.178.20] (dslb-088-077-182-020.088.077.pools.vodafone-ip.de [88.77.182.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by internetallee.de (Postfix) with ESMTPSA id 229F54948031 for ; Tue, 16 Feb 2016 22:09:56 +0100 (CET) Subject: Re: svn commit: r1730604 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/ src/protocol/http/org/apache/jmeter/protocol/http/util/ xdocs/ xdocs/usermanual/ To: dev@jmeter.apache.org References: <20160215200825.742F33A07CD@svn01-us-west.apache.org> <56C23365.50009@internetallee.de> <56C236E1.6060909@internetallee.de> <56C238CD.3030705@internetallee.de> From: Felix Schumacher Message-ID: <56C39022.7090706@internetallee.de> Date: Tue, 16 Feb 2016 22:09:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------050707030106030005040905" --------------050707030106030005040905 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Am 15.02.2016 um 23:00 schrieb sebb: > On 15 February 2016 at 20:58, Philippe Mouawad > wrote: >> there might be 1 side effect that we need to think about. >> >> Take 1 plan using an additional method. >> Plan is opened in a new instance not having this configuration. >> What to put in select box ? >> That might not be easy to diagnose. >> It's the same issue as for java sampler when class is not in jar. >> >> Maybe it would be better to have an editable selech box. > +1 > > But I think we should preset the known values. > > Might also be useful to allow new methods to be added via a property. > This would make it easier when new ones are added, and hopefully would > not be a problem with porting to other versions, so long as they have > the editable select box. I have attached a simple version of it. With the patch one can choose any method and it will be treated as a valid webdav method. I haven't added the property, but that should be easy. I think the webdav class can be removed, if it's used the way the patch makes it to be used. Should I open a new bug, or use the one for the search entry? Regards, Felix > >> Regards >> >> On Monday, February 15, 2016, Philippe Mouawad >> wrote: >> >>> ok for me >>> >>> On Monday, February 15, 2016, Felix Schumacher < >>> felix.schumacher@internetallee.de >>> > >>> wrote: >>> >>>> Am 15.02.2016 um 21:40 schrieb Philippe Mouawad: >>>> >>>>> On Monday, February 15, 2016, Felix Schumacher < >>>>> felix.schumacher@internetallee.de> wrote: >>>>> >>>>> Am 15.02.2016 um 21:30 schrieb Philippe Mouawad: >>>>>> Wouldn't a standard property (comma separated values) be better ? >>>>>>> Yes. That would be even better. >>>>>> Merge them into the ones we already have, or replace them? >>>>>> >>>>> no firm opinion. >>>>> Merge might be safer ? >>>>> >>>> Merge is probably safer. So use the ones we have already as the base >>>> stock? >>>> >>>>> Are you restricting it to webdav or to all methods ? >>>>> >>>> I think it should be free. Who knows what methods creep up in the future? >>>> >>>>> If all maybe we need to have a way to express if it can have a body or >>>>> not >>>>> ? >>>>> >>>> If it is needed, we could add another comma separated list, that lists >>>> those. But I think we can start without. >>>> >>>> Felix >>>> >>>>> >>>>>>> On Monday, February 15, 2016, Felix Schumacher < >>>>>>> felix.schumacher@internetallee.de> wrote: >>>>>>> >>>>>>> Am 15.02.2016 um 21:19 schrieb Philippe Mouawad: >>>>>>> >>>>>>>> Hi Felix, >>>>>>>> >>>>>>>>> There are other webdav methods that we don't support, should we add >>>>>>>>> them >>>>>>>>> all ? >>>>>>>>> >>>>>>>>> I thought about putting the list of supported methods into a file, so >>>>>>>>> >>>>>>>> anyone could edit it, if a new method is needed. >>>>>>>> >>>>>>>> What do you think about that? >>>>>>>> >>>>>>>> >>>>>>> Felix >>>>>>> >>>>>>>> Regards >>>>>>>> >>>>>>>>> On Monday, February 15, 2016, wrote: >>>>>>>>> >>>>>>>>> Author: fschumacher >>>>>>>>> >>>>>>>>> Date: Mon Feb 15 20:08:25 2016 >>>>>>>>>> New Revision: 1730604 >>>>>>>>>> >>>>>>>>>> URL: http://svn.apache.org/viewvc?rev=1730604&view=rev >>>>>>>>>> Log: >>>>>>>>>> HTTP Sampler : Added WebDAV verb (SEARCH). >>>>>>>>>> >>>>>>>>>> Bugzilla Id: 59005 >>>>>>>>>> >>>>>>>>>> Modified: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java >>>>>>>>>> jmeter/trunk/xdocs/changes.xml >>>>>>>>>> jmeter/trunk/xdocs/usermanual/component_reference.xml >>>>>>>>>> >>>>>>>>>> Modified: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java >>>>>>>>>> URL: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1730604&r1=1730603&r2=1730604&view=diff >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> ============================================================================== >>>>>>>>>> --- >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java >>>>>>>>>> (original) >>>>>>>>>> +++ >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java >>>>>>>>>> Mon Feb 15 20:08:25 2016 >>>>>>>>>> @@ -96,7 +96,7 @@ import org.apache.oro.text.regex.Perl5Ma >>>>>>>>>> public abstract class HTTPSamplerBase extends AbstractSampler >>>>>>>>>> implements TestStateListener, TestIterationListener, >>>>>>>>>> ThreadListener, >>>>>>>>>> HTTPConstantsInterface { >>>>>>>>>> >>>>>>>>>> - private static final long serialVersionUID = 240L; >>>>>>>>>> + private static final long serialVersionUID = 241L; >>>>>>>>>> >>>>>>>>>> private static final Logger log = >>>>>>>>>> LoggingManager.getLoggerForClass(); >>>>>>>>>> >>>>>>>>>> @@ -241,7 +241,8 @@ public abstract class HTTPSamplerBase ex >>>>>>>>>> HTTPConstants.LOCK, >>>>>>>>>> HTTPConstants.UNLOCK, >>>>>>>>>> HTTPConstants.REPORT, >>>>>>>>>> - HTTPConstants.MKCALENDAR >>>>>>>>>> + HTTPConstants.MKCALENDAR, >>>>>>>>>> + HTTPConstants.SEARCH >>>>>>>>>> }; >>>>>>>>>> >>>>>>>>>> private static final List METHODLIST = >>>>>>>>>> Collections.unmodifiableList(Arrays.asList(METHODS)); >>>>>>>>>> >>>>>>>>>> Modified: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java >>>>>>>>>> URL: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java?rev=1730604&r1=1730603&r2=1730604&view=diff >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> ============================================================================== >>>>>>>>>> --- >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java >>>>>>>>>> (original) >>>>>>>>>> +++ >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java >>>>>>>>>> Mon Feb 15 20:08:25 2016 >>>>>>>>>> @@ -49,6 +49,7 @@ public interface HTTPConstantsInterface >>>>>>>>>> String CONNECT = "CONNECT"; // $NON-NLS-1$ >>>>>>>>>> String REPORT = "REPORT"; // $NON-NLS-1$ >>>>>>>>>> String MKCALENDAR = "MKCALENDAR"; // $NON-NLS-1$ >>>>>>>>>> + String SEARCH = "SEARCH"; // $NON-NLS-1$ >>>>>>>>>> String HEADER_AUTHORIZATION = "Authorization"; // >>>>>>>>>> $NON-NLS-1$ >>>>>>>>>> String HEADER_COOKIE = "Cookie"; // $NON-NLS-1$ >>>>>>>>>> String HEADER_CONNECTION = "Connection"; // $NON-NLS-1$ >>>>>>>>>> >>>>>>>>>> Modified: jmeter/trunk/xdocs/changes.xml >>>>>>>>>> URL: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1730604&r1=1730603&r2=1730604&view=diff >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> ============================================================================== >>>>>>>>>> --- jmeter/trunk/xdocs/changes.xml (original) >>>>>>>>>> +++ jmeter/trunk/xdocs/changes.xml Mon Feb 15 20:08:25 2016 >>>>>>>>>> @@ -107,6 +107,7 @@ Summary >>>>>>>>>> This is the same behaviour as with POST >>>>>>>>>> requests. >>>>>>>>>>
  • 58860HTTP Request : Add automatic variable >>>>>>>>>> generation >>>>>>>>>> in HTTP parameters table by right click. Contributed by Benoit Wiart >>>>>>>>>> (benoit dot wiart at gmail.com)
    • >>>>>>>>>>
  • 58923normalize URIs when downloading embedded >>>>>>>>>> resources.
    • >>>>>>>>>> +
  • 59005HTTP Sampler : Added WebDAV verb >>>>>>>>>> (SEARCH).
    • >>>>>>>>>>
  • 59006Change Default proxy recording port to >>>>>>>>>> 8888 >>>>>>>>>> to >>>>>>>>>> align it with Recording Template. Contributed by Antonio Gomes >>>>>>>>>> Rodrigues >>>>>>>>>> (ra0077 at gmail.com)
    • >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml >>>>>>>>>> URL: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1730604&r1=1730603&r2=1730604&view=diff >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> ============================================================================== >>>>>>>>>> --- jmeter/trunk/xdocs/usermanual/component_reference.xml (original) >>>>>>>>>> +++ jmeter/trunk/xdocs/usermanual/component_reference.xml Mon Feb 15 >>>>>>>>>> 20:08:25 2016 >>>>>>>>>> @@ -157,7 +157,8 @@ Latency is set to the time it takes to l >>>>>>>>>> >>>>>>>>>>
  • It does not support virtual hosts.
    • >>>>>>>>>>
  • It does not support the following methods: >>>>>>>>>> COPY, LOCK, MKCOL, >>>>>>>>>> MOVE, >>>>>>>>>> - PATCH, PROPFIND, >>>>>>>>>> PROPPATCH, UNLOCK, REPORT, >>>>>>>>>> MKCALENDAR.
    • >>>>>>>>>> + PATCH, PROPFIND, >>>>>>>>>> PROPPATCH, UNLOCK, REPORT, >>>>>>>>>> + MKCALENDAR, SEARCH. >>>>>>>>>>
  • It does not support client based certificate >>>>>>>>>> testing >>>>>>>>>> with >>>>>>>>>> Keystore Config.
    • >>>>>>>>>> >>>>>>>>>> Note: the FILE protocol is intended >>>>>>>>>> for >>>>>>>>>> testing purposes only. >>>>>>>>>> @@ -232,7 +233,8 @@ https.default.protocol=SSLv3 >>>>>>>>>> OPTIONS, PUT, >>>>>>>>>> DELETE, >>>>>>>>>> PATCH (not supported for >>>>>>>>>> JAVA implementation). With >>>>>>>>>> HttpClient4, the following methods related to WebDav >>>>>>>>>> are >>>>>>>>>> also allowed: COPY, LOCK, >>>>>>>>>> MKCOL, MOVE, >>>>>>>>>> - PROPFIND, PROPPATCH, >>>>>>>>>> UNLOCK, REPORT, >>>>>>>>>> MKCALENDAR. >>>>>>>>>> + PROPFIND, PROPPATCH, >>>>>>>>>> UNLOCK, REPORT, MKCALENDAR, >>>>>>>>>> + SEARCH. >>>>>>>>>> >>>>>>>>>> Content encoding to be used (for POST, >>>>>>>>>> PUT, PATCH and FILE). >>>>>>>>>> This is the character encoding to be used, and is not >>>>>>>>>> related >>>>>>>>>> to >>>>>>>>>> the Content-Encoding HTTP header. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>> --------------050707030106030005040905 Content-Type: text/x-patch; name="0001-accept-all-methods.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-accept-all-methods.patch" diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java index 603a238..8637565 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java @@ -597,7 +597,7 @@ public class UrlConfigGui extends JPanel implements ChangeListener { if (notConfigOnly){ method = new JLabeledChoice(JMeterUtils.getResString("method"), // $NON-NLS-1$ - HTTPSamplerBase.getValidMethodsAsArray()); + HTTPSamplerBase.getValidMethodsAsArray(), true); } JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java index f7e4dbf..d2236f5 100644 --- a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java +++ b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java @@ -67,6 +67,6 @@ public final class HttpWebdav extends HttpEntityEnclosingRequestBase { * @return true if method is a Webdav one */ public static boolean isWebdavMethod(String method) { - return WEBDAV_METHODS.contains(method); + return true; } } --------------050707030106030005040905--