Author: gonzalo
Date: 2005-05-07 16:07:01 -0400 (Sat, 07 May 2005)
New Revision: 44206
Modified:
trunk/xsp/ChangeLog
trunk/xsp/server/BaseRequestBroker.cs
trunk/xsp/server/IWebSource.cs
trunk/xsp/server/ModMonoApplicationHost.cs
trunk/xsp/server/ModMonoRequest.cs
trunk/xsp/server/ModMonoWorkerRequest.cs
trunk/xsp/server/XSPApplicationHost.cs
Log:
2005-05-07 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* server/ModMonoWorkerRequest.cs: implemented IsClientConnected.
* server/ModMonoRequest.cs: added IsConnected and increased version
number.
* server/BaseRequestBroker.cs:
* server/ModMonoApplicationHost.cs: Close the current connection before
stopping the server when a shutdown request is received.
* server/XSPApplicationHost.cs:
* server/IWebSource.cs: IsConnected is now part if IWorker interface.
Modified: trunk/xsp/ChangeLog
===================================================================
--- trunk/xsp/ChangeLog 2005-05-07 19:19:49 UTC (rev 44205)
+++ trunk/xsp/ChangeLog 2005-05-07 20:07:01 UTC (rev 44206)
@@ -1,3 +1,15 @@
+2005-05-07 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * server/ModMonoWorkerRequest.cs: implemented IsClientConnected.
+ * server/ModMonoRequest.cs: added IsConnected and increased version
+ number.
+
+ * server/BaseRequestBroker.cs:
+ * server/ModMonoApplicationHost.cs: Close the current connection before
+ stopping the server when a shutdown request is received.
+ * server/XSPApplicationHost.cs:
+ * server/IWebSource.cs: IsConnected is now part if IWorker interface.
+
2005-05-03 Ben Maurer <[EMAIL PROTECTED]>
* configure.in: 1.0.9
Modified: trunk/xsp/server/BaseRequestBroker.cs
===================================================================
--- trunk/xsp/server/BaseRequestBroker.cs 2005-05-07 19:19:49 UTC (rev
44205)
+++ trunk/xsp/server/BaseRequestBroker.cs 2005-05-07 20:07:01 UTC (rev
44206)
@@ -97,6 +97,11 @@
worker.Flush ();
}
+ public bool IsConnected (int requestId)
+ {
+ return (GetWorker (requestId)).IsConnected ();
+ }
+
public override object InitializeLifetimeService ()
{
return null;
Modified: trunk/xsp/server/IWebSource.cs
===================================================================
--- trunk/xsp/server/IWebSource.cs 2005-05-07 19:19:49 UTC (rev 44205)
+++ trunk/xsp/server/IWebSource.cs 2005-05-07 20:07:01 UTC (rev 44206)
@@ -49,6 +49,7 @@
void Write (byte[] buffer, int position, int size);
void Close ();
void Flush ();
+ bool IsConnected ();
}
}
Modified: trunk/xsp/server/ModMonoApplicationHost.cs
===================================================================
--- trunk/xsp/server/ModMonoApplicationHost.cs 2005-05-07 19:19:49 UTC (rev
44205)
+++ trunk/xsp/server/ModMonoApplicationHost.cs 2005-05-07 20:07:01 UTC (rev
44206)
@@ -226,8 +226,8 @@
try {
RequestReader rr = new RequestReader (Stream);
if (rr.ShuttingDown) {
+ Close ();
server.Stop ();
- Close ();
return;
}
@@ -318,9 +318,14 @@
public void Flush ()
{
- modRequest.Flush ();
+ //modRequest.Flush (); No-op
}
-
+
+ public bool IsConnected ()
+ {
+ return modRequest.IsConnected ();
+ }
+
public string GetServerVariable (string name)
{
return modRequest.GetServerVariable (name);
Modified: trunk/xsp/server/ModMonoRequest.cs
===================================================================
--- trunk/xsp/server/ModMonoRequest.cs 2005-05-07 19:19:49 UTC (rev 44205)
+++ trunk/xsp/server/ModMonoRequest.cs 2005-05-07 20:07:01 UTC (rev 44206)
@@ -55,6 +55,7 @@
SET_STATUS,
DECLINE_REQUEST,
NOT_FOUND,
+ IS_CONNECTED,
LAST_COMMAND
}
@@ -98,7 +99,7 @@
if (shutdown)
return;
- if (cmd != 1) {
+ if (cmd != 2) {
string msg = "mod_mono and xsp have different
versions.";
Console.WriteLine (msg);
Console.Error.WriteLine (msg);
@@ -293,6 +294,13 @@
return i;
}
+ public bool IsConnected ()
+ {
+ SendSimpleCommand (Cmd.IS_CONNECTED);
+ int i = reader.ReadInt32 ();
+ return (i != 0);
+ }
+
public bool ShouldClientBlock ()
{
SendSimpleCommand (Cmd.SHOULD_CLIENT_BLOCK);
Modified: trunk/xsp/server/ModMonoWorkerRequest.cs
===================================================================
--- trunk/xsp/server/ModMonoWorkerRequest.cs 2005-05-07 19:19:49 UTC (rev
44205)
+++ trunk/xsp/server/ModMonoWorkerRequest.cs 2005-05-07 20:07:01 UTC (rev
44206)
@@ -324,8 +324,8 @@
public override bool IsClientConnected ()
{
- //TODO
- return true;
+ WebTrace.WriteLine ("IsClientConnected()");
+ return (requestBroker != null &&
requestBroker.IsConnected (requestId));
}
public override string GetUriPath ()
Modified: trunk/xsp/server/XSPApplicationHost.cs
===================================================================
--- trunk/xsp/server/XSPApplicationHost.cs 2005-05-07 19:19:49 UTC (rev
44205)
+++ trunk/xsp/server/XSPApplicationHost.cs 2005-05-07 20:07:01 UTC (rev
44206)
@@ -100,11 +100,6 @@
//
public class XSPRequestBroker: BaseRequestBroker
{
- public bool IsConnected (int requestId)
- {
- return ((XSPWorker)GetWorker (requestId)).IsConnected
();
- }
-
public int GetReuseCount (int requestId)
{
XSPWorker worker = (XSPWorker) GetWorker (requestId);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
