projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4433 from kumpera/android-fixes
[mono.git]
/
mcs
/
class
/
System
/
System.Net
/
HttpConnection.cs
diff --git
a/mcs/class/System/System.Net/HttpConnection.cs
b/mcs/class/System/System.Net/HttpConnection.cs
index 2be693f5b16c4fa3fee90b2e3daa2096746d714f..b9940eb07d89585b683f2904aa1b0fb49aa84157 100644
(file)
--- a/
mcs/class/System/System.Net/HttpConnection.cs
+++ b/
mcs/class/System/System.Net/HttpConnection.cs
@@
-31,20
+31,12
@@
#if MONO_SECURITY_ALIAS
extern alias MonoSecurity;
#endif
#if MONO_SECURITY_ALIAS
extern alias MonoSecurity;
#endif
-#if MONO_X509_ALIAS
-extern alias PrebuiltSystem;
-#endif
#if MONO_SECURITY_ALIAS
using MSI = MonoSecurity::Mono.Security.Interface;
#else
using MSI = Mono.Security.Interface;
#endif
#if MONO_SECURITY_ALIAS
using MSI = MonoSecurity::Mono.Security.Interface;
#else
using MSI = Mono.Security.Interface;
#endif
-#if MONO_X509_ALIAS
-using XX509CertificateCollection = PrebuiltSystem::System.Security.Cryptography.X509Certificates.X509CertificateCollection;
-#else
-using XX509CertificateCollection = System.Security.Cryptography.X509Certificates.X509CertificateCollection;
-#endif
using System.IO;
using System.Net.Sockets;
using System.IO;
using System.Net.Sockets;
@@
-397,7
+389,7
@@
namespace System.Net {
HttpListenerResponse response = context.Response;
response.StatusCode = status;
response.ContentType = "text/html";
HttpListenerResponse response = context.Response;
response.StatusCode = status;
response.ContentType = "text/html";
- string description = HttpListenerResponse.GetStatusDescription (status);
+ string description = HttpListenerResponse
Helper
.GetStatusDescription (status);
string str;
if (msg != null)
str = String.Format ("<h1>{0} ({1})</h1>", description, msg);
string str;
if (msg != null)
str = String.Format ("<h1>{0} ({1})</h1>", description, msg);