Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 43 insertions, 0 deletions

diff --git a/src/DotNetOpenId/NoDiscoveryIdentifier.cs b/src/DotNetOpenId/NoDiscoveryIdentifier.cs
new file mode 100644
index 0000000..4b47abc
--- /dev/null
+++ b/src/DotNetOpenId/NoDiscoveryIdentifier.cs
@@ -0,0 +1,43 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using DotNetOpenId.RelyingParty;

+

+namespace DotNetOpenId {

+	/// <summary>

+	/// Wraps an existing Identifier and prevents it from performing discovery.

+	/// </summary>

+	class NoDiscoveryIdentifier : Identifier {

+		Identifier wrappedIdentifier ;

+		internal NoDiscoveryIdentifier(Identifier wrappedIdentifier, bool claimSsl)

+			: base(claimSsl) {

+			if (wrappedIdentifier == null) throw new ArgumentNullException("wrappedIdentifier");

+

+			this.wrappedIdentifier = wrappedIdentifier;

+		}

+

+		internal override IEnumerable<ServiceEndpoint> Discover() {

+			return new ServiceEndpoint[0];

+		}

+

+		internal override Identifier TrimFragment() {

+			return new NoDiscoveryIdentifier(wrappedIdentifier.TrimFragment(), IsDiscoverySecureEndToEnd);

+		}

+

+		internal override bool TryRequireSsl(out Identifier secureIdentifier) {

+			return wrappedIdentifier.TryRequireSsl(out secureIdentifier);

+		}

+

+		public override string ToString() {

+			return wrappedIdentifier.ToString();

+		}

+

+		public override bool Equals(object obj) {

+			return wrappedIdentifier.Equals(obj);

+		}

+

+		public override int GetHashCode() {

+			return wrappedIdentifier.GetHashCode();

+		}

+	}

+}