From dc5dc6a749fee1d1b80436cbeb375cb7ff1a1072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Tue, 28 Apr 2015 15:34:27 +0200 Subject: [PATCH] Fix uploader --- .../src/com/jpexs/uploader/Uploader.java | 22 +----------------- uploader.jar | Bin 10289 -> 12191 bytes 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java index 23ce2cafb..3864e3240 100644 --- a/libsrc/uploader/src/com/jpexs/uploader/Uploader.java +++ b/libsrc/uploader/src/com/jpexs/uploader/Uploader.java @@ -1,8 +1,3 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package com.jpexs.uploader; import java.awt.Dimension; @@ -61,9 +56,9 @@ public class Uploader { httpConn.setUseCaches(false); httpConn.setDoOutput(true); // indicates POST method httpConn.setDoInput(true); + httpConn.setRequestProperty("User-Agent", "JPEXS Uploader"); httpConn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary); - httpConn.setRequestProperty("User-Agent", "JPEXS Uploader"); outputStream = httpConn.getOutputStream(); writer = new PrintWriter(new OutputStreamWriter(outputStream, charset), true); @@ -122,17 +117,6 @@ public class Uploader { writer.flush(); } - /** - * Adds a header field to the request. - * - * @param name - name of the header field - * @param value - value of the header field - */ - public void addHeaderField(String name, String value) { - writer.append(name + ": " + value).append(LINE_FEED); - writer.flush(); - } - /** * Completes the request and receives response from the server. * @@ -248,9 +232,6 @@ public class Uploader { try { MultipartUtility multipart = new MultipartUtility(requestURL, charset); - - multipart.addHeaderField("User-Agent", "JPEXS Uploader"); - for (int i = 0; i < types.size(); i++) { if (types.get(i).equals("field")) { multipart.addFormField(names.get(i), values.get(i)); @@ -272,7 +253,6 @@ public class Uploader { } System.exit(ok ? 0 : 1); } catch (IOException ex) { - ex.printStackTrace(); System.exit(1); } } diff --git a/uploader.jar b/uploader.jar index 0793f1ace0c7a8e33de6823d1aaa9972c553d861..504c582e8c241146648eebce34fc244726bc2e84 100644 GIT binary patch delta 5507 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 KE3`OEdjAEBrhvi# delta 3983 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