[kaffe] CVS kaffe (robilad): resynced with gnu classpath: http fix

[Kaffe CVS]

PatchSet 6494 
Date: 2005/05/15 12:27:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: http fix

2005-05-15  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-04-29  Michael Koch  <konqueror at gmx.de>

        * gnu/java/net/protocol/http/HTTPConnection.java:
        (userAgent): Initialize from system properties.
        (initUserAgent): Removed.

Members: 
	ChangeLog:1.4019->1.4020 
	libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4019 kaffe/ChangeLog:1.4020
--- kaffe/ChangeLog:1.4019	Sun May 15 12:25:35 2005
+++ kaffe/ChangeLog	Sun May 15 12:27:23 2005
@@ -4,6 +4,16 @@
 
 	2005-04-29  Michael Koch  <konqueror at gmx.de>
 
+        * gnu/java/net/protocol/http/HTTPConnection.java:
+        (userAgent): Initialize from system properties.
+        (initUserAgent): Removed.
+
+2005-05-15  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
+	2005-04-29  Michael Koch  <konqueror at gmx.de>
+
         * java/lang/ClassLoader.java:
         Fixed formatting.
 
Index: kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java
diff -u kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.6 kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.7
--- kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.6	Tue Mar  8 21:03:51 2005
+++ kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java	Sun May 15 12:27:23 2005
@@ -1,5 +1,5 @@
 /* HTTPConnection.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@
 package gnu.java.net.protocol.http;
 
 import gnu.classpath.Configuration;
+import gnu.classpath.SystemProperties;
 import gnu.java.net.EmptyX509TrustManager;
 import gnu.java.net.protocol.http.event.ConnectionEvent;
 import gnu.java.net.protocol.http.event.ConnectionListener;
@@ -83,28 +84,7 @@
    */
   public static final int HTTPS_PORT = 443;
 
-  private static final String userAgent = initUserAgent();
-
-  private static String initUserAgent()
-  {
-    try
-      {
-        StringBuffer buf = new StringBuffer("classpath/");
-        buf.append(Configuration.CLASSPATH_VERSION);
-        buf.append(" (");
-        buf.append(System.getProperty("os.name"));
-        buf.append("; ");
-        buf.append(System.getProperty("os.arch"));
-        buf.append("; ");
-        buf.append(System.getProperty("user.language"));
-        buf.append(")");
-        return buf.toString();
-      }
-    catch (SecurityException e)
-      {
-        return "inetlib/1.1";
-      }
-  }
+  private static final String userAgent = SystemProperties.getProperty("http.agent");
 
   /**
    * The host name of the server to connect to.