Hi,
I committed the attached patch to fix URI authority parsing.
Regards,
Jeroen
2005-03-07 Jeroen Frijters <[EMAIL PROTECTED]>
* java/net/URI.java (AUTHORITY_REGEXP): Corrected regexp.
(AUTHORITY_USERINFO_GROUP,AUTHORITY_HOST_GROUP,AUTHORITY_PORT_GROUP):
Adjusted to match new regexp.
Index: java/net/URI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URI.java,v
retrieving revision 1.10
diff -u -r1.10 URI.java
--- java/net/URI.java 9 Feb 2005 03:03:36 -0000 1.10
+++ java/net/URI.java 7 Mar 2005 13:37:03 -0000
@@ -65,7 +65,7 @@
"^(([^:/?#]+):)?((//([^/?#]*))?([^?#]*)(\\?([^#]*))?)?(#(.*))?";
private static final String AUTHORITY_REGEXP =
- "^((([^?#]*)@)?([^?#:]*)(:([^?#]*)))?";
+ "(([^?#]*)@)?([^?#:]*)(:([^?#]*))?";
/**
* Valid characters (taken from rfc2396)
@@ -115,9 +115,9 @@
*/
private static final int FRAGMENT_GROUP = 10;
- 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 static final int AUTHORITY_USERINFO_GROUP = 2;
+ private static final int AUTHORITY_HOST_GROUP = 3;
+ private static final int AUTHORITY_PORT_GROUP = 5;
private transient String scheme;
private transient String rawSchemeSpecificPart;
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
