View | Details | Raw Unified | Return to bug 63130
Collapse All | Expand All

(-)a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (-2 / +12 lines)
Lines 47-52 import javax.security.auth.Subject; Link Here
47
47
48
import org.apache.commons.lang3.StringUtils;
48
import org.apache.commons.lang3.StringUtils;
49
import org.apache.commons.lang3.tuple.Pair;
49
import org.apache.commons.lang3.tuple.Pair;
50
import org.apache.commons.codec.DecoderException;
51
import org.apache.commons.codec.net.URLCodec;
50
import org.apache.http.Header;
52
import org.apache.http.Header;
51
import org.apache.http.HttpClientConnection;
53
import org.apache.http.HttpClientConnection;
52
import org.apache.http.HttpConnectionMetrics;
54
import org.apache.http.HttpConnectionMetrics;
Lines 1687-1694 public class HTTPHC4Impl extends HTTPHCAbstractImpl { Link Here
1687
                // Must decode the value now, so that when the
1689
                // Must decode the value now, so that when the
1688
                // httpclient encodes it, we end up with the same value
1690
                // httpclient encodes it, we end up with the same value
1689
                // as the user had entered.
1691
                // as the user had entered.
1690
                parameterName = URLDecoder.decode(parameterName, urlContentEncoding);
1692
                try {
1691
                parameterValue = URLDecoder.decode(parameterValue, urlContentEncoding);
1693
                    URLCodec urlCodec = new URLCodec(contentEncoding);
1694
                    //parameterName = URLDecoder.decode(parameterName, urlContentEncoding);
1695
                    parameterName = urlCodec.decode(parameterName, urlContentEncoding);
1696
                    //parameterValue = URLDecoder.decode(parameterValue, urlContentEncoding);
1697
                    parameterValue = urlCodec.decode(parameterValue,urlContentEncoding);
1698
                } catch (DecoderException e) {
1699
                    log.error(contentEncoding + " exception in encoding!");
1700
                    throw new Error(e.toString(), e);
1701
                }
1692
            }
1702
            }
1693
            // Add the parameter, httpclient will urlencode it
1703
            // Add the parameter, httpclient will urlencode it
1694
            nvps.add(new BasicNameValuePair(parameterName, parameterValue));
1704
            nvps.add(new BasicNameValuePair(parameterName, parameterValue));

Return to bug 63130