From commits-return-752-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Tue Feb 28 12:05:26 2012 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 336D99FD4 for ; Tue, 28 Feb 2012 12:05:26 +0000 (UTC) Received: (qmail 24693 invoked by uid 500); 28 Feb 2012 12:05:26 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 24671 invoked by uid 500); 28 Feb 2012 12:05:26 -0000 Mailing-List: contact commits-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 commits@jmeter.apache.org Received: (qmail 24663 invoked by uid 99); 28 Feb 2012 12:05:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 12:05:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 12:05:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 32E6F238897D for ; Tue, 28 Feb 2012 12:05:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1294598 - /jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java Date: Tue, 28 Feb 2012 12:05:03 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120228120503.32E6F238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pmouawad Date: Tue Feb 28 12:05:02 2012 New Revision: 1294598 URL: http://svn.apache.org/viewvc?rev=1294598&view=rev Log: Bug 52781 - Content-Disposition header garbled even if browser compatible headers is checked (HC4) Fixed wrong Boundary extraction Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java?rev=1294598&r1=1294597&r2=1294598&view=diff ============================================================================== --- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java (original) +++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java Tue Feb 28 12:05:02 2012 @@ -1084,7 +1084,14 @@ public class TestHTTPSamplersAgainstHttp Pattern pattern = JMeterUtils.getPattern(regularExpression, Perl5Compiler.READ_ONLY_MASK | Perl5Compiler.CASE_INSENSITIVE_MASK | Perl5Compiler.MULTILINE_MASK); if(localMatcher.contains(requestHeaders, pattern)) { MatchResult match = localMatcher.getMatch(); - return match.group(1); + String matchString = match.group(1); + // Header may contain ;charset= , regexp extracts it so computed boundary is wrong + int indexOf = matchString.indexOf(";"); + if(indexOf>=0) { + return matchString.substring(0, indexOf); + } else { + return matchString; + } } else { return null;