[Mono.Posix] Add Syscall.getgrouplist().

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

diff --git a/mcs/class/System/System.Net/HttpListenerRequest.cs b/mcs/class/System/System.Net/HttpListenerRequest.cs
index 3e5e5f7e6fd922422d23b4f2dac4fd17cb985252..92866e6485c0193f9da233f68ffbe69ed0e36de5 100644 (file)
--- a/mcs/class/System/System.Net/HttpListenerRequest.cs
+++ b/mcs/class/System/System.Net/HttpListenerRequest.cs
@@ -2,11 +2,11 @@
 // System.Net.HttpListenerRequest
 //
 // Authors:
-//     Gonzalo Paniagua Javier (gonzalo@novell.com)
+//     Gonzalo Paniagua Javier (gonzalo.mono@gmail.com)
 //     Marek Safar (marek.safar@gmail.com)
 //
 // Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
-// Copyright 2011 Xamarin Inc.
+// Copyright (c) 2011-2012 Xamarin, Inc. (http://xamarin.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -42,6 +42,7 @@ using System.Security.Authentication.ExtendedProtection;
 #if NET_4_5
 using System.Threading.Tasks;
 #endif
+using Mono.Security.Protocol.Tls;
 
 namespace System.Net {
        public sealed class HttpListenerRequest
@@ -57,8 +58,6 @@ namespace System.Net {
 #endif
 
                string [] accept_types;
-//             int client_cert_error;
-//             bool no_get_certificate;
                Encoding content_encoding;
                long content_length;
                bool cl_set;
@@ -76,6 +75,9 @@ namespace System.Net {
                bool is_chunked;
                bool ka_set;
                bool keep_alive;
+               delegate X509Certificate2 GCCDelegate ();
+               GCCDelegate gcc_delegate;
+
                static byte [] _100continue = Encoding.ASCII.GetBytes ("HTTP/1.1 100 Continue\r\n\r\n");
 
                internal HttpListenerRequest (HttpListenerContext context)
@@ -163,7 +165,7 @@ namespace System.Net {
                        if (Uri.MaybeUri (raw_url) && Uri.TryCreate (raw_url, UriKind.Absolute, out raw_uri))
                                path = raw_uri.PathAndQuery;
                        else
-                               path = HttpUtility.UrlDecode (raw_url);
+                               path = raw_url;
 
                        if ((host == null || host.Length == 0))
                                host = UserHostAddress;
@@ -317,7 +319,7 @@ namespace System.Net {
                                // TODO: test if MS has a timeout when doing this
                                try {
                                        IAsyncResult ares = InputStream.BeginRead (bytes, 0, length, null, null);
-                                       if (!ares.IsCompleted && !ares.AsyncWaitHandle.WaitOne (100))
+                                       if (!ares.IsCompleted && !ares.AsyncWaitHandle.WaitOne (1000))
                                                return false;
                                        if (InputStream.EndRead (ares) <= 0)
                                                return true;
@@ -331,15 +333,14 @@ namespace System.Net {
                        get { return accept_types; }
                }
 
-               [MonoTODO ("Always returns 0")]
                public int ClientCertificateError {
                        get {
-/*                             
-                               if (no_get_certificate)
-                                       throw new InvalidOperationException (
-                                               "Call GetClientCertificate() before calling this method.");
-                               return client_cert_error;
-*/
+                               HttpConnection cnc = context.Connection;
+                               if (cnc.ClientCertificate == null)
+                                       throw new InvalidOperationException ("No client certificate");
+                               int [] errors = cnc.ClientCertificateErrors;
+                               if (errors != null && errors.Length > 0)
+                                       return errors [0];
                                return 0;
                        }
                }
@@ -479,24 +480,27 @@ namespace System.Net {
                        get { return user_languages; }
                }
 
-               [MonoTODO]
                public IAsyncResult BeginGetClientCertificate (AsyncCallback requestCallback, object state)
                {
-                       throw new NotImplementedException ();
+                       if (gcc_delegate == null)
+                               gcc_delegate = new GCCDelegate (GetClientCertificate);
+                       return gcc_delegate.BeginInvoke (requestCallback, state);
                }
 
-               [MonoTODO]
                public X509Certificate2 EndGetClientCertificate (IAsyncResult asyncResult)
                {
-                       throw new NotImplementedException ();
+                       if (asyncResult == null)
+                               throw new ArgumentNullException ("asyncResult");
+
+                       if (gcc_delegate == null)
+                               throw new InvalidOperationException ();
+
+                       return gcc_delegate.EndInvoke (asyncResult);
                }
 
                public X509Certificate2 GetClientCertificate ()
                {
-                       // set no_client_certificate once done.
-
-                       // InvalidOp if call in progress.
-                       return null;
+                       return context.Connection.ClientCertificate;
                }
 
 #if NET_4_0