2009-04-21 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / System / System.Net / EndPointListener.cs

diff --git a/mcs/class/System/System.Net/EndPointListener.cs b/mcs/class/System/System.Net/EndPointListener.cs
index da30949229e6000070ec9ee14bbd40b62c1382ba..23aff2518c2a1f74121932824735d4518fa9dfa4 100644 (file)
--- a/mcs/class/System/System.Net/EndPointListener.cs
+++ b/mcs/class/System/System.Net/EndPointListener.cs
@@ -25,10 +25,12 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+
+#if NET_2_0 && SECURITY_DEP
+
 using System.IO;
 using System.Net.Sockets;
-using System.Collections.Generic;
+using System.Collections;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using Mono.Security.Authenticode;
@@ -38,9 +40,9 @@ namespace System.Net {
        {
                IPEndPoint endpoint;
                Socket sock;
-               Dictionary<ListenerPrefix, HttpListener> prefixes;
-               List<ListenerPrefix> unhandled; // host = '*'
-               List<ListenerPrefix> all; // host = '+'
+               Hashtable prefixes;  // Dictionary <ListenerPrefix, HttpListener>
+               ArrayList unhandled; // List<ListenerPrefix> unhandled; host = '*'
+               ArrayList all;       // List<ListenerPrefix> all;  host = '+'
                X509Certificate2 cert;
                AsymmetricAlgorithm key;
                bool secure;
@@ -57,7 +59,7 @@ namespace System.Net {
                        sock.Bind (endpoint);
                        sock.Listen (500);
                        sock.BeginAccept (OnAccept, this);
-                       prefixes = new Dictionary<ListenerPrefix, HttpListener> ();
+                       prefixes = new Hashtable ();
                }
 
                void LoadCertificateAndKey (IPAddress addr, int port)
@@ -147,7 +149,15 @@ namespace System.Net {
                                        host = host.Substring (0, colon);
                        }
 
-                       string path = HttpUtility.UrlDecode (raw_url);
+                       string path;
+                       Uri raw_uri;
+                       if (Uri.MaybeUri (raw_url) && Uri.TryCreate (raw_url, UriKind.Absolute, out raw_uri))
+                               path = raw_uri.PathAndQuery;
+                       else
+                               path = HttpUtility.UrlDecode (raw_url);
+                       
+                       string path_slash = path [path.Length - 1] == '/' ? path : path + "/";
+                       
                        HttpListener best_match = null;
                        int best_length = -1;
 
@@ -158,9 +168,9 @@ namespace System.Net {
                                                if (ppath.Length < best_length)
                                                        continue;
 
-                                               if (p.Host == host && path.StartsWith (ppath)) {
+                                               if (p.Host == host && (path.StartsWith (ppath) || path_slash.StartsWith (ppath))) {
                                                        best_length = ppath.Length;
-                                                       best_match = prefixes [p];
+                                                       best_match = (HttpListener) prefixes [p];
                                                        prefix = p;
                                                }
                                        }
@@ -179,7 +189,7 @@ namespace System.Net {
                        return null;
                }
 
-               HttpListener MatchFromList (string host, string path, List<ListenerPrefix> list, out ListenerPrefix prefix)
+               HttpListener MatchFromList (string host, string path, ArrayList list, out ListenerPrefix prefix)
                {
                        prefix = null;
                        if (list == null)
@@ -203,7 +213,7 @@ namespace System.Net {
                        return best_match;
                }
 
-               void AddSpecial (List<ListenerPrefix> coll, ListenerPrefix prefix)
+               void AddSpecial (ArrayList coll, ListenerPrefix prefix)
                {
                        if (coll == null)
                                return;
@@ -216,14 +226,14 @@ namespace System.Net {
                        coll.Add (prefix);
                }
 
-               void RemoveSpecial (List<ListenerPrefix> coll, ListenerPrefix prefix)
+               void RemoveSpecial (ArrayList coll, ListenerPrefix prefix)
                {
                        if (coll == null)
                                return;
 
                        int c = coll.Count;
                        for (int i = 0; i < c; i++) {
-                               ListenerPrefix p = coll [i];
+                               ListenerPrefix p = (ListenerPrefix) coll [i];
                                if (p.Path == prefix.Path) {
                                        coll.RemoveAt (i);
                                        CheckIfRemove ();
@@ -256,7 +266,7 @@ namespace System.Net {
                        lock (prefixes) {
                                if (prefix.Host == "*") {
                                        if (unhandled == null)
-                                               unhandled = new List<ListenerPrefix> ();
+                                               unhandled = new ArrayList ();
 
                                        prefix.Listener = listener;
                                        AddSpecial (unhandled, prefix);
@@ -265,14 +275,14 @@ namespace System.Net {
 
                                if (prefix.Host == "+") {
                                        if (all == null)
-                                               all = new List<ListenerPrefix> ();
+                                               all = new ArrayList ();
                                        prefix.Listener = listener;
                                        AddSpecial (all, prefix);
                                        return;
                                }
 
                                if (prefixes.ContainsKey (prefix)) {
-                                       HttpListener other = prefixes [prefix];
+                                       HttpListener other = (HttpListener) prefixes [prefix];
                                        if (other != listener) // TODO: code.
                                                throw new HttpListenerException (400, "There's another listener for " + prefix);
                                        return;