HttpClient URI space to %20, not +

BobHanson · BobHanson · commit 06a014888e0d · 2020-06-26T12:02:21.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/http/SimpleHttpClient.java b/sources/net.sf.j2s.java.core/src/javajs/http/SimpleHttpClient.java
@@ -5,6 +5,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -308,7 +309,7 @@ private Response fulfillGet(Response r) throws IOException {
 					htGetParams.put(fd.getName(), fd.getData().toString());
 				}
 				for (Entry<String, String> e : htGetParams.entrySet()) {
-					data += e.getKey() + "=" + URLEncoder.encode(e.getValue(), "UTF-8");
+					data += e.getKey() + "=" + encodeURI(e.getValue());
 				}
 			}
 			if (data.length() > 0) {
@@ -319,6 +320,16 @@ private Response fulfillGet(Response r) throws IOException {
 			return r.getResponse(getConnection(url), this);
 		}
 
+		private String encodeURI(String value) {
+			try {
+				return URLEncoder.encode(value.replace(' ', '\0'), "UTF-8").replaceAll("%00", "%20");
+			} catch (UnsupportedEncodingException e) {
+				// impossible
+			}
+			
+			return null;
+		}
+
 		private Response fulfillPost(Response r) throws IOException {
 			HttpURLConnection conn = getConnection(uri.toURL());
 			sendFormData(conn, formData);
