Connection.java (userAgent): New static final field.

       * gnu/java/net/protocol/http/Connection.java (userAgent): New static
       final field.
       (sendRequest): Use new field in user-agent http agent.

From-SVN: r83741

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 71ab0bfc1af691e94d0870243818fd5f6487fc8e..ae95f7b034a34065d60c75c0a1a7418a83bf4f3c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-27  Mark Wielaard  <mark@klomp.org>
+
+       * gnu/java/net/protocol/http/Connection.java (userAgent): New static
+       final field.
+       (sendRequest): Use new field in user-agent http agent.
+
 2004-06-27  Mark Wielaard  <mark@klomp.org>
 
        * java/awt/EventQueue.java (postEvent): Throw NullPointerException

diff --git a/libjava/gnu/java/net/protocol/http/Connection.java b/libjava/gnu/java/net/protocol/http/Connection.java
index ac369f4ee6e60ddd3713f51be555db6757754e7d..44239e1721a3a19c8a37a0f77091c5a1acacb2ae 100644 (file)
--- a/libjava/gnu/java/net/protocol/http/Connection.java
+++ b/libjava/gnu/java/net/protocol/http/Connection.java
@@ -80,6 +80,8 @@ public final class Connection extends HttpURLConnection
   private static boolean proxyInUse = false;
   private static String proxyHost = null;
 
+  private static final String userAgent;
+
   static 
   {
     // Recognize some networking properties listed at
@@ -101,6 +103,14 @@ public final class Connection extends HttpURLConnection
              }
          }
       }
+
+    userAgent = "gnu-classpath/"
+      + System.getProperty("gnu.classpath.version")
+      + " ("
+      + System.getProperty("gnu.classpath.vm.shortname")
+      + "/"
+      + System.getProperty("java.vm.version")
+      + ")";
   }
 
   /**
@@ -215,8 +225,7 @@ public final class Connection extends HttpURLConnection
       setRequestProperty ("Connection", "Close");
     
     if (getRequestProperty ("user-agent") == null)
-      setRequestProperty ("user-agent", "gnu-libgcj/"
-                          + System.getProperty ("java.vm.version"));
+      setRequestProperty ("user-agent", userAgent);
     
     if (getRequestProperty ("accept") == null)
       setRequestProperty ("accept", "*/*");