commit ff44cb1068ace81835dfb7862048ded259c4f09a
author Neil Fuller <nfuller@google.com> Thu Sep 08 16:04:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 08 16:04:48 2016 +0000
tree 0625ad1fa402a86ed2b7763399e7a8aabeefb521
parent ffe9365e03aa92918d64900979b322207891a329
parent da039605fac12ce27a4e9e07e3ace8d4a4108868

Use different URL encoding for single quote in query
am: da039605fa

Change-Id: I8a505ab8822fe447eec896181c94bb19faea1f64

okhttp-tests/src/test/java/com/squareup/okhttp/HttpUrlTest.java

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/HttpUrlTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/HttpUrlTest.java
index d45ac10..8510eec 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/HttpUrlTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/HttpUrlTest.java
@@ -553,7 +553,10 @@
   @Test public void queryCharacters() throws Exception {
     new UrlComponentEncodingTester()
         .override(Encoding.IDENTITY, '?', '`')
-        .override(Encoding.PERCENT, '\'')
+        // ANDROID-CHANGED: http://b/30405333
+        // .override(Encoding.PERCENT, '\'')
+        .override(Encoding.IDENTITY, '\'')
+        // ANDROID-CHANGED end.
         .override(Encoding.SKIP, '#', '+')
         .skipForUri('%', '\\', '^', '`', '{', '|', '}')
         .test(Component.QUERY);

okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java

diff --git a/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java b/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java
index 8e75e3f..32e1106 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java
@@ -259,8 +259,12 @@
   static final String PASSWORD_ENCODE_SET = " \"':;<=>@[]^`{}|/\\?#";
   static final String PATH_SEGMENT_ENCODE_SET = " \"<>^`{}|/\\?#";
   static final String PATH_SEGMENT_ENCODE_SET_URI = "[]";
-  static final String QUERY_ENCODE_SET = " \"'<>#";
-  static final String QUERY_COMPONENT_ENCODE_SET = " \"'<>#&=";
+  // ANDROID-CHANGED: http://b/30405333 - we do not encode single quote as %27 in query strings.
+  // static final String QUERY_ENCODE_SET = " \"'<>#";
+  // static final String QUERY_COMPONENT_ENCODE_SET = " \"'<>#&=";
+  static final String QUERY_ENCODE_SET = " \"<>#";
+  static final String QUERY_COMPONENT_ENCODE_SET = " \"<>#&=";
+  // ANDROID-CHANGED end.
   static final String QUERY_COMPONENT_ENCODE_SET_URI = "\\^`{|}";
   static final String FORM_ENCODE_SET = " \"':;<=>@[]^`{}|/\\?#&!$(),~";
   static final String FRAGMENT_ENCODE_SET = "";