x

qiniu · Nov 13, 2020 · 1dc3aa7 · 1dc3aa7
1 parent d0a5ab5
commit 1dc3aa7
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/src/main/java/com/qiniu/http/Client.java b/src/main/java/com/qiniu/http/Client.java
@@ -89,7 +89,7 @@ public okhttp3.Response intercept(Chain chain) throws IOException {
                     return response;
                 }
                 try {
-                    tag.ip = chain.connection().socket().getRemoteSocketAddress().toString();
+                    tag.ip = chain.connection().socket().getRemoteSocketAddress() + "";
                 } catch (Exception e) {
                     // ingore
                 }

diff --git a/src/test/java/test/com/qiniu/HttpTest.java b/src/test/java/test/com/qiniu/HttpTest.java
@@ -101,8 +101,29 @@ public void testProxy() {
 
     @Test
     public void testTimeout() throws NoSuchFieldException, IllegalAccessException {
+        Client client0 = new Client();
         try {
-            Response res = new Client().get("https://www.qiniu.com/?v=12345");
+            Response res = client0.get("https://www.qiniu.com/?v=12345");
+            String r = res.toString();
+            System.out.println(r);
+            Assert.assertTrue("https, must have port 443", r.indexOf(":443") > 0);
+        } catch (QiniuException e) {
+            e.printStackTrace();
+            Assert.fail("should be ok");
+        }
+
+        try {
+            Response res = client0.get("https://www.qiniu.com/?v=12345");
+            String r = res.toString();
+            System.out.println(r);
+            Assert.assertTrue("https, must have port 443", r.indexOf(":443") > 0);
+        } catch (QiniuException e) {
+            e.printStackTrace();
+            Assert.fail("should be ok");
+        }
+
+        try {
+            Response res = client0.get("https://www.qiniu.com/?v=12345");
             String r = res.toString();
             System.out.println(r);
             Assert.assertTrue("https, must have port 443", r.indexOf(":443") > 0);
@@ -118,6 +139,20 @@ public void testTimeout() throws NoSuchFieldException, IllegalAccessException {
         okHttpClient = okHttpClient.newBuilder().connectTimeout(3, TimeUnit.MILLISECONDS).build();
         field.set(client, okHttpClient);
 
+        try {
+            client.get("http://rs.qbox.me/?v=12");
+            Assert.fail("should be timeout");
+        } catch (QiniuException e) {
+            e.printStackTrace();
+            Assert.assertTrue("http, must have port 80", e.getMessage().indexOf(":80") > 10);
+        }
+        try {
+            client.get("http://rs.qbox.me/?v=12");
+            Assert.fail("should be timeout");
+        } catch (QiniuException e) {
+            e.printStackTrace();
+            Assert.assertTrue("http, must have port 80", e.getMessage().indexOf(":80") > 10);
+        }
         try {
             client.get("http://rs.qbox.me/?v=12");
             Assert.fail("should be timeout");