# HG changeset patch
# User michaelm
# Date 1299172463 0
# Node ID e2df5f8fa0828804537efed57294153ada3e109d
# Parent  ca8d6ccdd9dcda027dd56cce90cb6ae9e73e8d09
7024264: HttpURLConnection/NetPermission doc issue
Reviewed-by: chegar

diff -r ca8d6ccdd9dc -r e2df5f8fa082 jdk/src/share/classes/java/net/HttpURLConnection.java
--- a/jdk/src/share/classes/java/net/HttpURLConnection.java	Thu Mar 03 15:34:09 2011 +0000
+++ b/jdk/src/share/classes/java/net/HttpURLConnection.java	Thu Mar 03 17:14:23 2011 +0000
@@ -400,7 +400,8 @@
      * @exception ProtocolException if the method cannot be reset or if
      *              the requested method isn't valid for HTTP.
      * @exception SecurityException if a security manager is set and the
-     *              "allowHttpTrace" NetPermission is not granted.
+     *              method is "TRACE", but the "allowHttpTrace"
+     *              NetPermission is not granted.
      * @see #getRequestMethod()
      */
     public void setRequestMethod(String method) throws ProtocolException {
diff -r ca8d6ccdd9dc -r e2df5f8fa082 jdk/src/share/classes/java/net/NetPermission.java
--- a/jdk/src/share/classes/java/net/NetPermission.java	Thu Mar 03 15:34:09 2011 +0000
+++ b/jdk/src/share/classes/java/net/NetPermission.java	Thu Mar 03 17:14:23 2011 +0000
@@ -73,6 +73,13 @@
  *   </tr>
  *
  * <tr>
+ *  <td>getNetworkInformation</td>
+ *  <td>The ability to retrieve all information about local network interfaces.</td>
+ *  <td>Malicious code can read information about network hardware such as
+ *  MAC addresses, which could be used to construct local IPv6 addresses.</td>
+ * </tr>
+ *
+ * <tr>
  *   <td>getProxySelector</td>
  *   <td>The ability to get the proxy selector used to make decisions
  *   on which proxies to use when making network connections.</td>