From: mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 27 Jun 2004 19:36:01 +0000 (+0000)
Subject:        * gnu/java/net/protocol/http/Connection.java (userAgent): New static
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=31dd62f9c4ac740b5732df1b3a279c93d1f27344;p=thirdparty%2Fgcc.git

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83741 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 71ab0bfc1af6..ae95f7b034a3 100644
--- 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 ac369f4ee6e6..44239e1721a3 100644
--- 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", "*/*");