Commit e99e6d71 by Tom Tromey Committed by Tom Tromey

URI.java (AUTHORITY_REGEXP): Handle case where user name or port is missing.

	* java/net/URI.java (AUTHORITY_REGEXP): Handle case where user
	name or port is missing.
	(AUTHORITY_USERINFO_GROUP, AUTHORITY_HOST_GROUP,
	AUTHORITY_PORT_GROUP): Updated.

From-SVN: r94760
parent 9f4faeae
2005-02-08 Tom Tromey <tromey@redhat.com>
* java/net/URI.java (AUTHORITY_REGEXP): Handle case where user
name or port is missing.
(AUTHORITY_USERINFO_GROUP, AUTHORITY_HOST_GROUP,
AUTHORITY_PORT_GROUP): Updated.
2005-02-08 Tom Tromey <tromey@redhat.com>
* configure: Rebuilt.
* configure.ac: Reduce number of calls to AC_CHECK_FUNCS and
AC_CHECK_HEADERS.
......
......@@ -65,7 +65,7 @@ public final class URI implements Comparable, Serializable
"^(([^:/?#]+):)?((//([^/?#]*))?([^?#]*)(\\?([^#]*))?)?(#(.*))?";
private static final String AUTHORITY_REGEXP =
"^(([^?#]*)@([^?#]*):([^?#]*))?";
"^((([^?#]*)@)?([^?#:]*)(:([^?#]*)))?";
/**
* Valid characters (taken from rfc2396)
......@@ -115,9 +115,9 @@ public final class URI implements Comparable, Serializable
*/
private static final int FRAGMENT_GROUP = 10;
private static final int AUTHORITY_USERINFO_GROUP = 2;
private static final int AUTHORITY_HOST_GROUP = 3;
private static final int AUTHORITY_PORT_GROUP = 4;
private static final int AUTHORITY_USERINFO_GROUP = 3;
private static final int AUTHORITY_HOST_GROUP = 4;
private static final int AUTHORITY_PORT_GROUP = 6;
private transient String scheme;
private transient String rawSchemeSpecificPart;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment