You've already forked linux-packaging-mono
Imported Upstream version 3.8.0
Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
This commit is contained in:
@@ -446,7 +446,7 @@ namespace System.Web
|
||||
}
|
||||
|
||||
[MonoTODO ("Not implemented")]
|
||||
public void AddCacheDependency (CacheDependency[] dependencies)
|
||||
public void AddCacheDependency (params CacheDependency[] dependencies)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
@@ -195,6 +195,7 @@ namespace System.Web
|
||||
mimeTypes.Add ("htx", "text/html");
|
||||
mimeTypes.Add ("ice", "x-conference/x-cooltalk");
|
||||
mimeTypes.Add ("ico", "image/x-icon");
|
||||
mimeTypes.Add ("ics", "text/calendar");
|
||||
mimeTypes.Add ("idc", "text/plain");
|
||||
mimeTypes.Add ("ief", "image/ief");
|
||||
mimeTypes.Add ("iefs", "image/ief");
|
||||
@@ -271,11 +272,11 @@ namespace System.Web
|
||||
mimeTypes.Add ("mme", "application/base64");
|
||||
mimeTypes.Add ("mny", "application/x-msmoney");
|
||||
mimeTypes.Add ("mod", "audio/mod");
|
||||
mimeTypes.Add ("moov", "video/quicktime");
|
||||
mimeTypes.Add ("movie", "video/x-sgi-movie");
|
||||
mimeTypes.Add ("mov", "video/quicktime");
|
||||
mimeTypes.Add ("movie", "video/x-sgi-movie");
|
||||
mimeTypes.Add ("moov", "video/quicktime");
|
||||
mimeTypes.Add ("mp2", "video/mpeg");
|
||||
mimeTypes.Add ("mp3", "audio/mpeg3");
|
||||
mimeTypes.Add ("mp3", "audio/mpeg");
|
||||
mimeTypes.Add ("mp4", "video/mp4");
|
||||
//mimeTypes.Add ("mp4a", "audio/mp4"); // A common but unofficial alternative to m4a
|
||||
mimeTypes.Add ("mpa", "audio/mpeg");
|
||||
|
File diff suppressed because one or more lines are too long
@@ -165,7 +165,6 @@ namespace MonoTests.System.Web.UI.Adapters
|
||||
pd.SaveStateComplete = RenderPostBackEvent_OnSaveStateComplete;
|
||||
t.Invoker = new PageInvoker (pd);
|
||||
string html = t.Run ();
|
||||
File.WriteAllText("response.html", html);
|
||||
}
|
||||
|
||||
public static void RenderPostBackEvent_OnSaveStateComplete (Page p)
|
||||
|
@@ -18,11 +18,6 @@ namespace MonoTests.SystemWeb.Framework
|
||||
{
|
||||
internal class MyHost : MarshalByRefObject
|
||||
{
|
||||
AutoResetEvent _done;
|
||||
AutoResetEvent _doNext;
|
||||
WebTest _currentTest;
|
||||
Exception _e;
|
||||
|
||||
#region MyData
|
||||
class MyData
|
||||
{
|
||||
@@ -30,40 +25,12 @@ namespace MonoTests.SystemWeb.Framework
|
||||
public Exception exception;
|
||||
}
|
||||
#endregion
|
||||
|
||||
public MyHost ()
|
||||
{
|
||||
_done = new AutoResetEvent (false);
|
||||
_doNext = new AutoResetEvent (false);
|
||||
ThreadPool.QueueUserWorkItem (new WaitCallback (param => {
|
||||
try {
|
||||
AsyncRun (param);
|
||||
} catch {}
|
||||
}), null);
|
||||
}
|
||||
|
||||
public AppDomain AppDomain
|
||||
{ get { return AppDomain.CurrentDomain; } }
|
||||
|
||||
public WebTest Run (WebTest t)
|
||||
{
|
||||
_currentTest = t;
|
||||
_doNext.Set ();
|
||||
_done.WaitOne ();
|
||||
if (_e != null) {
|
||||
Exception e = _e;
|
||||
_e = null;
|
||||
throw e;
|
||||
}
|
||||
return t;
|
||||
}
|
||||
|
||||
void AsyncRun (object param)
|
||||
{
|
||||
for (;;) {
|
||||
_doNext.WaitOne ();
|
||||
try {
|
||||
WebTest t = _currentTest;
|
||||
HttpWorkerRequest wr = t.Request.CreateWorkerRequest ();
|
||||
MyData data = GetMyData (wr);
|
||||
data.currentTest = t;
|
||||
@@ -74,12 +41,8 @@ namespace MonoTests.SystemWeb.Framework
|
||||
|
||||
if (data.exception != null)
|
||||
RethrowException (data.exception);
|
||||
} catch (Exception e) {
|
||||
_e = e;
|
||||
}
|
||||
|
||||
_done.Set ();
|
||||
}
|
||||
|
||||
return t;
|
||||
}
|
||||
|
||||
private static void RethrowException (Exception inner)
|
||||
|
Reference in New Issue
Block a user