Changeset 9314 in josm for trunk

Timestamp:

2016-01-04T23:55:48+01:00 (9 years ago)

Author:

simon04

Message:

fix #7094 see #12231 - HttpClient: set Content-Length for all POST/PUT/DELETE requests

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -42 +42 @@
     private byte[] requestBody;
     private long ifModifiedSince;
-    private long contentLength;
     private final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     private int maxRedirects = Main.pref.getInteger("socket.maxredirects", 5);
@@ -86 +85 @@
             connection.setIfModifiedSince(ifModifiedSince);
         }
-        if (contentLength > 0) {
-            connection.setFixedLengthStreamingMode(contentLength);
-        }
         connection.setUseCaches(useCache);
         if (!useCache) {
@@ -104 +100 @@
         if ("PUT".equals(requestMethod) || "POST".equals(requestMethod) || "DELETE".equals(requestMethod)) {
             Main.info("{0} {1} ({2}) ...", requestMethod, url, Utils.getSizeString(requestBody.length, Locale.getDefault()));
-            headers.put("Content-Length", String.valueOf(requestBody.length));
+            connection.setFixedLengthStreamingMode(requestBody.length);
             connection.setDoOutput(true);
             try (OutputStream out = new BufferedOutputStream(
@@ -517 +513 @@
      * @see HttpURLConnection#setFixedLengthStreamingMode(long)
      * @since 9178
-     */
+     * @deprecated Submitting data via POST, PUT, DELETE automatically sets this property on the connection
+     */
+    @Deprecated
     public HttpClient setFixedLengthStreamingMode(long contentLength) {
-        this.contentLength = contentLength;
         return this;
     }