Merge pull request #246 from sxci/7.3.3

 7.3.3

Author: longbai

CHANGELOG.md

@@ -1,5 +1,14 @@
 #Changelog
 
+## 7.3.3 (2017-01-18)
+
+### 增加
+* 搜集客户端日志信息
+
+### 修正
+* Etag 大文件计算数字溢出
+* UA 包含非 iso 8859-1 字符异常退出
+
 ## 7.3.2 (2016-11-21)
 
 ### 增加

library/src/androidTest/java/com/qiniu/android/HttpTest.java

@@ -17,6 +17,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.Charset;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -225,4 +226,35 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
         Assert.assertTrue(!"".equals(info.reqId));
         Assert.assertEquals(400, info.statusCode);
     }
+
+    @SmallTest
+    public void testHeader() {
+        // com.qiniu.android.http.UserAgent#getUa
+        // return new String((ua + "; " + _part + ")").getBytes(Charset.forName("ISO-8859-1")));
+
+        String name = new String(("电话☎️的の").getBytes(Charset.forName("ISO-8859-1")));
+        String value = new String(("sdf✈️he覆盖😁🆚9837-=/ df").getBytes(Charset.forName("ISO-8859-1")));
+        checkNameAndValue(name, value);
+    }
+
+    // copy from okhttp3.Headers
+    private void checkNameAndValue(String name, String value) {
+        if (name == null) throw new IllegalArgumentException("name == null");
+        if (name.isEmpty()) throw new IllegalArgumentException("name is empty");
+        for (int i = 0, length = name.length(); i < length; i++) {
+            char c = name.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                throw new IllegalArgumentException(String.format(
+                        "Unexpected char %#04x at %d in header name: %s", (int) c, i, name));
+            }
+        }
+        if (value == null) throw new IllegalArgumentException("value == null");
+        for (int i = 0, length = value.length(); i < length; i++) {
+            char c = value.charAt(i);
+            if (c <= '\u001f' || c >= '\u007f') {
+                throw new IllegalArgumentException(String.format(
+                        "Unexpected char %#04x at %d in %s value: %s", (int) c, i, name, value));
+            }
+        }
+    }
 }

library/src/main/java/com/qiniu/android/common/Constants.java

@@ -2,7 +2,7 @@
 
 
 public final class Constants {
-    public static final String VERSION = "7.3.2";
+    public static final String VERSION = "7.3.3";
 
     public static final String UTF_8 = "utf-8";
 }