[HtmlUnit] SVN: [14683] trunk/htmlunit/src

[<asa...@us...>]

Revision: 14683
          http://sourceforge.net/p/htmlunit/code/14683
Author:   asashour
Date:     2017-07-21 10:56:46 +0000 (Fri, 21 Jul 2017)
Log Message:
-----------
Fix build

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2017-07-21 10:01:12 UTC (rev 14682)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java	2017-07-21 10:56:46 UTC (rev 14683)
@@ -1421,7 +1421,9 @@
                 if (locationString == null) {
                     return webResponse;
                 }
-                locationString = new String(locationString.getBytes(ISO_8859_1), UTF_8);
+                if (!getBrowserVersion().hasFeature(URL_MINIMAL_QUERY_ENCODING)) {
+                	locationString = new String(locationString.getBytes(ISO_8859_1), UTF_8);
+                }
                 newUrl = expandUrl(url, locationString);
             }
             catch (final MalformedURLException e) {

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2017-07-21 10:01:12 UTC (rev 14682)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/HttpWebConnection3Test.java	2017-07-21 10:56:46 UTC (rev 14683)
@@ -192,7 +192,9 @@
      * @throws Exception if an error occurs
      */
     @Test
-    @Alerts("§§URL§§test?%D8%A3%D9%87%D9%84%D8%A7%D9%8B")
+    @Alerts(DEFAULT = "§§URL§§test?%D8%A3%D9%87%D9%84%D8%A7%D9%8B",
+    		IE = "§§URL§§test?أهلاً")
+    @NotYetImplemented(IE)
     // seems to work only when running alone
     public void locationQueryUTF() throws Exception {
         final String response = "HTTP/1.1 302 Found\r\n"