Merge http-client-branch
authormichaelm
Fri, 19 Jan 2018 15:05:57 +0000
branchhttp-client-branch
changeset 56032 bea253ebd7ac
parent 56031 c52c9a3a2046 (current diff)
parent 56030 69fbcac27e35 (diff)
child 56033 db102c5ca88a
Merge
--- a/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java	Fri Jan 19 15:05:27 2018 +0000
+++ b/src/jdk.incubator.httpclient/share/classes/jdk/incubator/http/HttpRequest.java	Fri Jan 19 15:05:57 2018 +0000
@@ -440,12 +440,14 @@
          *
          * @apiNote The {@linkplain BodyPublisher#noBody() noBody} request
          * body publisher can be used where no request body is required or
-         * appropriate.
+         * appropriate. Whether a method is restricted, or not, is
+         * implementation specific. For example, some implementations may choose
+         * to restrict the {@code CONNECT} method.
          *
          * @param method the method to use
          * @param bodyPublisher the body publisher
          * @return a {@code HttpRequest}
-         * @throws IllegalArgumentException if the method is unrecognised
+         * @throws IllegalArgumentException if the method is restricted
          */
         public abstract Builder method(String method, BodyPublisher bodyPublisher);