--- a/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java	Tue Feb 27 14:38:17 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java	Tue Feb 27 14:45:49 2018 +0000
@@ -114,8 +114,8 @@
     }
 
     private String getPathAndQuery(URI uri) {
-        String path = uri.getPath();
-        String query = uri.getQuery();
+        String path = uri.getRawPath();
+        String query = uri.getRawQuery();
         if (path == null || path.equals("")) {
             path = "/";
         }