--- a/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java	Tue Feb 27 14:38:17 2018 +0000
+++ b/src/java.net.http/share/classes/jdk/internal/net/http/Stream.java	Tue Feb 27 14:45:49 2018 +0000
@@ -570,8 +570,8 @@
         // TODO: userinfo deprecated. Needs to be removed
         hdrs.setHeader(":authority", uri.getAuthority());
         // TODO: ensure header names beginning with : not in user headers
-        String query = uri.getQuery();
-        String path = uri.getPath();
+        String query = uri.getRawQuery();
+        String path = uri.getRawPath();
         if (path == null || path.isEmpty()) {
             if (method.equalsIgnoreCase("OPTIONS")) {
                 path = "*";