merge of '17e445455139cbd0a4d4096e2f6bf673bdf0f868'

     and '8c95a90070f2706b8b4d3eb9151e0c614d25663b'

apps/ministreaming/java/test/junit/net/i2p/client/streaming/I2PSocketEepGetTest.java

@@ -117,8 +117,14 @@ public class I2PSocketEepGetTest {
 
     @Test
     public void testFetch_negPort() {
+        // Fails, because URI is stricter than URL
+        fetchFrom("http://" + STATS_HOST + ":-1", false);
+    }
+
+    @Test
+    public void testFetch_zeroPort() {
         // Gets rewritten to 80
-        fetchFrom("http://" + STATS_HOST + ":-1", true);
+        fetchFrom("http://" + STATS_HOST + ":0", true);
     }
 
     @Test