Revert "doc: update documentation for sampleresult.default.encoding default value"

This reverts commit 4340b2a048.

bin/jmeter.properties

@@ -1101,8 +1101,8 @@ csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII
 # List of extra HTTP methods that should be available in select box
 #httpsampler.user_defined_methods=VERSION-CONTROL,REPORT,CHECKOUT,CHECKIN,UNCHECKOUT,MKWORKSPACE,UPDATE,LABEL,MERGE,BASELINE-CONTROL,MKACTIVITY
 
-# The encoding to be used if none is provided (default UTF-8 since JMeter 5.6.1)
-#sampleresult.default.encoding=UTF-8
+# The encoding to be used if none is provided (default ISO-8859-1)
+#sampleresult.default.encoding=ISO-8859-1
 
 # CookieManager behaviour - should cookies with null/empty values be deleted?
 # Default is true. Use false to revert to original behaviour

src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java

@@ -66,10 +66,15 @@ public class SampleResult implements Serializable, Cloneable, Searchable {
     private static final String INVALID_CALL_SEQUENCE_MSG = "Invalid call sequence"; // $NON-NLS-1$
 
 
+    // Bug 33196 - encoding ISO-8859-1 is only suitable for Western countries
+    // However the suggested System.getProperty("file.encoding") is Cp1252 on
+    // Windows
+    // So use a new property with the original value as default
+    // needs to be accessible from test code
     /**
      * The default encoding to be used to decode the responseData byte array.
      * The value is defined by the property "sampleresult.default.encoding"
-     * with a default of {@link #DEFAULT_HTTP_ENCODING} if that is not defined.
+     * with a default of DEFAULT_HTTP_ENCODING if that is not defined.
      */
     protected static final String DEFAULT_ENCODING
             = JMeterUtils.getPropDefault("sampleresult.default.encoding", // $NON-NLS-1$

xdocs/changes.xml

@@ -69,6 +69,41 @@ Summary
         Timer relative to start of Thread Group instead of the start of the test.</li>
     <li><issue>6357</issue><pr>6358</pr> Ensure writable directories when copying template files while report generation.</li>
   </ul>
+<ch_section>New and Noteworthy</ch_section>
+
+<ch_section>Improvements</ch_section>
+
+<h3>HTTP Samplers and Test Script Recorder</h3>
+<ul>
+  <li><pr>6010</pr>Use UTF-8 as a default encoding in HTTP sampler. It enables sending parameter names, and filenames with unicode characters</li>
+  <li><pr>6010</pr>Test Recorder will use UTF-8 encoding by default, so it will infer human-readable arguments rather than percent-encoded ones</li>
+</ul>
+
+<ch_section>Non-functional changes</ch_section>
+<ul>
+  <li><pr>6000</pr>Add release-drafter for populating GitHub releases info based on the merged PRs</li>
+  <li><pr>5989</pr>Use Gradle toolchains for JDK provisioning, enable building and testing with different JDKs, start testing with Java 21</li>
+  <li><pr>5991</pr>Update jackson-core, jackson-databind, jackson-annotations to 2.15.2 (from 2.15.1)</li>
+  <li><pr>5993</pr>Update ph-commons to 10.2.5 (from 10.2.4)</li>
+  <li><pr>6017</pr>Update kotlin-stdlib to 1.8.22 (from 1.8.21)</li>
+  <li><pr>6020</pr>Update error_prone_annotations to 2.20.0 (from 2.19.1)</li>
+  <li><pr>6023</pr>Update checker-qual to 3.35.0 (from 3.34.0)</li>
+</ul>
+
+ <!-- =================== Bug fixes =================== -->
+
+<ch_section>Bug fixes</ch_section>
+
+<h3>Thread Groups</h3>
+<ul>
+  <li><pr>6011</pr>Regression since 5.6: ThreadGroups are running endlessly in non-gui mode: use default value
+    for LoopController.continue_forever rather than initializing it in the constructor</li>
+</ul>
+
+<h3>Other Samplers</h3>
+<ul>
+  <li><pr>6012</pr> Java Request sampler cannot be enabled again after disabling in UI (regression since 5.6)</li>
+</ul>
 
  <!--  =================== Thanks =================== -->
 

xdocs/usermanual/properties_reference.xml

@@ -1399,7 +1399,7 @@ JMETER-SERVER</source>
 </property>
 <property name="sampleresult.default.encoding">
     The encoding to be used if none is provided.<br/>
-    Defaults to: <code>UTF-8</code> (since 5.6.1)
+    Defaults to: <code>ISO-8859-1</code>
 </property>
 <property name="CookieManager.delete_null_cookies">
     CookieManager behaviour - should cookies with null/empty values be deleted?<br/>