Author: gonzalo
Date: 2005-04-27 05:18:50 -0400 (Wed, 27 Apr 2005)
New Revision: 43646
Modified:
trunk/xsp/ChangeLog
trunk/xsp/server/ModMonoRequest.cs
trunk/xsp/server/ModMonoWorkerRequest.cs
trunk/xsp/server/XSPWorkerRequest.cs
Log:
2005-04-27 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* server/ModMonoWorkerRequest.cs:
* server/XSPWorkerRequest.cs:
* server/ModMonoRequest.cs: Default -> DefaultInvariant. Also don't
send a FLUSH command to mod_mono, as it's ignored.
Modified: trunk/xsp/ChangeLog
===================================================================
--- trunk/xsp/ChangeLog 2005-04-27 08:48:49 UTC (rev 43645)
+++ trunk/xsp/ChangeLog 2005-04-27 09:18:50 UTC (rev 43646)
@@ -1,3 +1,10 @@
+2005-04-27 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * server/ModMonoWorkerRequest.cs:
+ * server/XSPWorkerRequest.cs:
+ * server/ModMonoRequest.cs: Default -> DefaultInvariant. Also don't
+ send a FLUSH command to mod_mono, as it's ignored.
+
2005-04-20 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* server/XSPWorkerRequest.cs:
Modified: trunk/xsp/server/ModMonoRequest.cs
===================================================================
--- trunk/xsp/server/ModMonoRequest.cs 2005-04-27 08:48:49 UTC (rev 43645)
+++ trunk/xsp/server/ModMonoRequest.cs 2005-04-27 09:18:50 UTC (rev 43646)
@@ -63,8 +63,8 @@
const int MAX_STRING_SIZE = 1024 * 10;
BinaryReader reader;
BinaryWriter writer;
- Hashtable serverVariables = new Hashtable
(CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+ Hashtable serverVariables = new Hashtable
(CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant);
string verb;
string queryString;
string protocol;
@@ -110,8 +110,8 @@
queryString = ReadString ();
protocol = ReadString ();
int nheaders = reader.ReadInt32 ();
- headers = new Hashtable
(CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+ headers = new Hashtable
(CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant);
for (int i = 0; i < nheaders; i++) {
string key = ReadString ();
headers [key] = ReadString ();
@@ -272,7 +272,8 @@
public void Flush ()
{
- SendSimpleCommand (Cmd.FLUSH);
+ // No-op in mod_mono. Not needed.
+ // SendSimpleCommand (Cmd.FLUSH);
}
public void Close ()
Modified: trunk/xsp/server/ModMonoWorkerRequest.cs
===================================================================
--- trunk/xsp/server/ModMonoWorkerRequest.cs 2005-04-27 08:48:49 UTC (rev
43645)
+++ trunk/xsp/server/ModMonoWorkerRequest.cs 2005-04-27 09:18:50 UTC (rev
43646)
@@ -225,7 +225,8 @@
public override void FlushResponse (bool finalFlush)
{
- requestBroker.Flush (requestId);
+ // FLUSH is a no-op in mod_mono. Apache takes care of
it.
+ // requestBroker.Flush (requestId);
}
public override bool IsSecure ()
@@ -382,7 +383,7 @@
string GetRequestHeader (string name)
{
- IHashCodeProvider hp =
CaseInsensitiveHashCodeProvider.Default;
+ IHashCodeProvider hp =
CaseInsensitiveHashCodeProvider.DefaultInvariant;
if (headersHash == null) {
headersHash = new int [headers.Length];
for (int i = 0; i < headers.Length; i++) {
Modified: trunk/xsp/server/XSPWorkerRequest.cs
===================================================================
--- trunk/xsp/server/XSPWorkerRequest.cs 2005-04-27 08:48:49 UTC (rev
43645)
+++ trunk/xsp/server/XSPWorkerRequest.cs 2005-04-27 09:18:50 UTC (rev
43646)
@@ -249,8 +249,8 @@
{
try {
string line;
- headers = new Hashtable
(CaseInsensitiveHashCodeProvider.Default,
-
CaseInsensitiveComparer.Default);
+ headers = new Hashtable
(CaseInsensitiveHashCodeProvider.DefaultInvariant,
+
CaseInsensitiveComparer.DefaultInvariant);
while ((line = ReadLine ()) != null &&
line.Length > 0) {
int colon = line.IndexOf (':');
if (colon == -1 || line.Length < colon
+ 2)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
