2005-01-11 Michael Koch <konqueror@gmx.de>

	PR libgcj/14012, PR libgcj/14013, PR libgcj/15157, PR libgcj/15509
	* gnu/java/net/BASE64.java,
	gnu/java/net/EmptyX509TrustManager.java,
	gnu/java/net/LineInputStream.java,
	gnu/java/net/protocol/http/Authenticator.java,
	gnu/java/net/protocol/http/ByteArrayRequestBodyWriter.java,
	gnu/java/net/protocol/http/ByteArrayResponseBodyReader.java,
	gnu/java/net/protocol/http/ChunkedInputStream.java,
	gnu/java/net/protocol/http/Cookie.java,
	gnu/java/net/protocol/http/CookieManager.java,
	gnu/java/net/protocol/http/Credentials.java,
	gnu/java/net/protocol/http/HTTPConnection.java,
	gnu/java/net/protocol/http/HTTPDateFormat.java,
	gnu/java/net/protocol/http/HTTPURLConnection.java,
	gnu/java/net/protocol/http/Headers.java,
	gnu/java/net/protocol/http/Request.java,
	gnu/java/net/protocol/http/RequestBodyWriter.java,
	gnu/java/net/protocol/http/Response.java,
	gnu/java/net/protocol/http/ResponseBodyReader.java,
	gnu/java/net/protocol/http/ResponseHeaderHandler.java,
	gnu/java/net/protocol/http/SimpleCookieManager.java,
	gnu/java/net/protocol/http/event/ConnectionEvent.java,
	gnu/java/net/protocol/http/event/ConnectionListener.java,
	gnu/java/net/protocol/http/event/RequestEvent.java,
	gnu/java/net/protocol/http/event/RequestListener.java: New files.
	* gnu/java/net/protocol/http/Connection.java: Removed.
	* gnu/java/net/protocol/http/Handler.java,
	javax/net/ssl/HttpsURLConnection.java: Updated.
	* Makefile.am: Added new files and remove old ones.
	* Makefile.in: Regenerated.


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

1 files changed, 17 insertions, 30 deletions

diff --git a/libjava/gnu/java/net/protocol/http/Handler.java b/libjava/gnu/java/net/protocol/http/Handler.java
index 6f2ebb125d8..43ff63df9b3 100644
--- a/libjava/gnu/java/net/protocol/http/Handler.java
+++ b/libjava/gnu/java/net/protocol/http/Handler.java
@@ -1,5 +1,5 @@
-/* Handler.java -- HTTP protocol handler for java.net
-   Copyright (c) 1998, 1999, 2003 Free Software Foundation, Inc.
+/* Handler.java --
+   Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
-
+ 
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -35,6 +35,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
+
 package gnu.java.net.protocol.http;
 
 import java.io.IOException;
@@ -43,44 +44,30 @@ import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
 /**
- * This is the protocol handler for the HTTP protocol.  It implements
- * the abstract openConnection() method from URLStreamHandler by returning
- * a new HttpURLConnection object (from this package).  All other 
- * methods are inherited
+ * An HTTP URL stream handler.
  *
- * @author Aaron M. Renn (arenn@urbanophile.com)
- * @author Warren Levy
- * @author Anthony Green <green@redhat.com>
+ * @author Chris Burdess (dog@gnu.org)
  */
-public class Handler extends URLStreamHandler
+public class Handler
+  extends URLStreamHandler
 {
-  /**
-   * A do nothing constructor
-   */
-  public Handler()
-  {
-  }
 
   /**
-   * This method returs a new HttpURLConnection for the specified URL
-   *
-   * @param url The URL to return a connection for
-   *
-   * @return The URLConnection
-   *
-   * @exception IOException If an error occurs
+   * Returns the default HTTP port (80).
    */
-  protected URLConnection openConnection (URL url) throws IOException
+  protected int getDefaultPort()
   {
-    return new Connection (url);
+    return HTTPConnection.HTTP_PORT;
   }
 
   /**
-   * Returns the default port for a URL parsed by this handler.
+   * Returns an HTTPURLConnection for the given URL.
    */
-  protected int getDefaultPort()
+  public URLConnection openConnection(URL url)
+    throws IOException
   {
-    return 80;
+    return new HTTPURLConnection(url);
   }
 
-} // class Handler
+}
+