From 29cf693e712a55762b29c317b9b55d0b0c1b8a60 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Thu, 7 Aug 2008 14:02:01 +0000 Subject: [PATCH] 2008-08-07 Sebastien Pouliot * GenericUriParserOptions.cs: Add new values for SL2 (NET_2_1) * UriFormatException.cs: Add ctor(string,Exception) for SL2 (NET_2_1) * UriIdnScope.cs: Fix values svn path=/trunk/mcs/; revision=109860 --- mcs/class/System/System/ChangeLog | 6 ++++++ mcs/class/System/System/GenericUriParserOptions.cs | 8 ++++++-- mcs/class/System/System/UriFormatException.cs | 12 ++++++++---- mcs/class/System/System/UriIdnScope.cs | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog index 58fb32138ef..4809ef03b31 100644 --- a/mcs/class/System/System/ChangeLog +++ b/mcs/class/System/System/ChangeLog @@ -1,3 +1,9 @@ +2008-08-07 Sebastien Pouliot + + * GenericUriParserOptions.cs: Add new values for SL2 (NET_2_1) + * UriFormatException.cs: Add ctor(string,Exception) for SL2 (NET_2_1) + * UriIdnScope.cs: Fix values + 2008-08-06 Miguel de Icaza * Uri.cs: Use exception-less operations. diff --git a/mcs/class/System/System/GenericUriParserOptions.cs b/mcs/class/System/System/GenericUriParserOptions.cs index 961572952dc..db27c7da0c2 100644 --- a/mcs/class/System/System/GenericUriParserOptions.cs +++ b/mcs/class/System/System/GenericUriParserOptions.cs @@ -4,7 +4,7 @@ // Author: // Sebastien Pouliot // -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) +// Copyright (C) 2005, 2008 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -42,7 +42,11 @@ namespace System { NoFragment = 32, DontConvertPathBackslashes = 64, DontCompressPath = 128, - DontUnescapePathDotsAndSlashes = 256 + DontUnescapePathDotsAndSlashes = 256, +#if NET_2_1 + Idn = 512, + IriParsing = 1024 +#endif } } diff --git a/mcs/class/System/System/UriFormatException.cs b/mcs/class/System/System/UriFormatException.cs index a47c60773b8..3ecf939d7e9 100644 --- a/mcs/class/System/System/UriFormatException.cs +++ b/mcs/class/System/System/UriFormatException.cs @@ -7,7 +7,7 @@ // // (C) 2001 Scott Sanders // (C) 2002 Ximian, Inc. -// Copyright (C) 2005 Novell, Inc (http://www.novell.com) +// Copyright (C) 2005, 2008 Novell, Inc (http://www.novell.com) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -48,14 +48,19 @@ namespace System { : base (message) { } - +#if NET_2_1 + public UriFormatException (string message, Exception exception) + : base (message, exception) + { + } +#endif protected UriFormatException (SerializationInfo info, StreamingContext context) : base (info, context) { } // Methods - [MonoTODO ("Why override")] + // This effectively kills the LinkDemand from Exception.GetObjectData (if someone // use the ISerializable interface to serialize the object). See unit tests. void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context) @@ -64,4 +69,3 @@ namespace System { } } } - diff --git a/mcs/class/System/System/UriIdnScope.cs b/mcs/class/System/System/UriIdnScope.cs index 45ad11b47ee..372e70cd61a 100644 --- a/mcs/class/System/System/UriIdnScope.cs +++ b/mcs/class/System/System/UriIdnScope.cs @@ -34,8 +34,8 @@ namespace System public enum UriIdnScope { None, - All, AllExceptIntranet, + All, } } -- 2.11.4.GIT