mono
/
xsp
зеркало из https://github.com/mono/xsp.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

2004-07-07 Gonzalo Paniagua Javier <gonzalo@ximian.com> 

* server/ModMonoApplicationHost.cs:
	* server/ModMonoWorkerRequest.cs:
	* server/ModMonoRequest.cs: removed unused method/options and the
	ack sent back after writing something. Unified setting status code
	and message into 1 single command.

svn path=/trunk/xsp/; revision=30806
This commit is contained in:
Gonzalo Paniagua Javier 2004-07-06 22:40:20 +00:00
Родитель 9f06773475
Коммит db4dda3967
4 изменённых файлов: 21 добавлений и 43 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
ChangeLog
Просмотреть файл

@ -1,3 +1,15 @@
2004-07-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* server/ModMonoApplicationHost.cs:
* server/ModMonoWorkerRequest.cs:
* server/ModMonoRequest.cs: removed unused method/options and the
ack sent back after writing something. Unified setting status code
and message into 1 single command.
2004-06-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* Released 1.0.
2004-06-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* configure.in: 0.15.99.

2
server/ModMonoApplicationHost.cs
Просмотреть файл

@ -3,7 +3,7 @@
//
// Authors:
// Gonzalo Paniagua Javier (gonzalo@ximian.com)
// Lluis Sanchez Gual (lluis@ximian.com)
// Lluis Sanchez Gual (lluis@ximian.com)
//
// (C) Copyright 2004 Novell, Inc
//

44
server/ModMonoRequest.cs
Просмотреть файл

@ -65,14 +65,10 @@ namespace Mono.ASPNET
enum Cmd
{
FIRST_COMMAND,
GET_REQUEST_LINE = 0,
SEND_FROM_MEMORY,
GET_PATH_INFO,
SEND_FROM_MEMORY = 0,
GET_SERVER_VARIABLE,
GET_PATH_TRANSLATED,
GET_SERVER_PORT,
SET_RESPONSE_HEADER,
GET_FILENAME,
GET_REMOTE_ADDRESS,
GET_LOCAL_ADDRESS,
GET_REMOTE_PORT,
@ -83,8 +79,7 @@ namespace Mono.ASPNET
SHOULD_CLIENT_BLOCK,
SETUP_CLIENT_BLOCK,
GET_CLIENT_BLOCK,
SET_STATUS_LINE,
SET_STATUS_CODE,
SET_STATUS,
DECLINE_REQUEST,
LAST_COMMAND
}
@ -137,13 +132,6 @@ namespace Mono.ASPNET
writer.Write (b);
}
void ReadEnd ()
{
byte b = reader.ReadByte ();
if (b != 0)
throw new Exception ("Protocol violation or error");
}
string ReadString ()
{
int size = reader.ReadInt32 ();
@ -168,7 +156,6 @@ namespace Mono.ASPNET
public void Decline ()
{
SendSimpleCommand (Cmd.DECLINE_REQUEST);
ReadEnd ();
}
public string GetProtocol ()
@ -186,7 +173,6 @@ namespace Mono.ASPNET
SendSimpleCommand (Cmd.SEND_FROM_MEMORY);
writer.Write (length);
writer.Write (data, position, length);
ReadEnd ();
}
public void SetResponseHeader (string name, string value)
@ -194,7 +180,6 @@ namespace Mono.ASPNET
SendSimpleCommand (Cmd.SET_RESPONSE_HEADER);
WriteString (name);
WriteString (value);
ReadEnd ();
}
public string [] GetAllHeaders ()
@ -226,7 +211,6 @@ namespace Mono.ASPNET
SendSimpleCommand (Cmd.GET_SERVER_VARIABLE);
WriteString (name);
ReadEnd ();
o = ReadString ();
serverVariables [name] = o;
@ -238,14 +222,6 @@ namespace Mono.ASPNET
return uri;
}
public string GetFileName ()
{
// Not used!
SendSimpleCommand (Cmd.GET_FILENAME);
ReadEnd ();
return ReadString ();
}
public string GetQueryString ()
{
return queryString;
@ -259,7 +235,6 @@ namespace Mono.ASPNET
return serverPort;
SendSimpleCommand (Cmd.GET_SERVER_PORT);
ReadEnd ();
serverPort = reader.ReadInt32 ();
return serverPort;
}
@ -270,7 +245,6 @@ namespace Mono.ASPNET
return remoteAddress;
SendSimpleCommand (Cmd.GET_REMOTE_ADDRESS);
ReadEnd ();
remoteAddress = ReadString ();
return remoteAddress;
}
@ -281,7 +255,6 @@ namespace Mono.ASPNET
return remoteName;
SendSimpleCommand (Cmd.GET_REMOTE_NAME);
ReadEnd ();
remoteName = ReadString ();
return remoteName;
}
@ -292,7 +265,6 @@ namespace Mono.ASPNET
return localAddress;
SendSimpleCommand (Cmd.GET_LOCAL_ADDRESS);
ReadEnd ();
localAddress = ReadString ();
return localAddress;
}
@ -303,7 +275,6 @@ namespace Mono.ASPNET
return localPort;
SendSimpleCommand (Cmd.GET_LOCAL_PORT);
ReadEnd ();
localPort = reader.ReadInt32 ();
return localPort;
}
@ -314,7 +285,6 @@ namespace Mono.ASPNET
return remotePort;
SendSimpleCommand (Cmd.GET_REMOTE_PORT);
ReadEnd ();
remotePort = reader.ReadInt32 ();
return remotePort;
}
@ -322,13 +292,11 @@ namespace Mono.ASPNET
public void Flush ()
{
SendSimpleCommand (Cmd.FLUSH);
ReadEnd ();
}
public void Close ()
{
SendSimpleCommand (Cmd.CLOSE);
ReadEnd ();
}
public int SetupClientBlock ()
@ -338,7 +306,6 @@ namespace Mono.ASPNET
setupClientBlockCalled = true;
SendSimpleCommand (Cmd.SETUP_CLIENT_BLOCK);
ReadEnd ();
int i = reader.ReadInt32 ();
clientBlock = i;
return i;
@ -347,7 +314,6 @@ namespace Mono.ASPNET
public bool ShouldClientBlock ()
{
SendSimpleCommand (Cmd.SHOULD_CLIENT_BLOCK);
ReadEnd ();
int i = reader.ReadInt32 ();
return (i == 0);
}
@ -359,7 +325,6 @@ namespace Mono.ASPNET
SendSimpleCommand (Cmd.GET_CLIENT_BLOCK);
writer.Write (size);
ReadEnd ();
int i = reader.ReadInt32 ();
if (i > size)
throw new Exception ("Houston...");
@ -369,12 +334,9 @@ namespace Mono.ASPNET
public void SetStatusCodeLine (int code, string status)
{
SendSimpleCommand (Cmd.SET_STATUS_CODE);
SendSimpleCommand (Cmd.SET_STATUS);
writer.Write (code);
ReadEnd ();
SendSimpleCommand (Cmd.SET_STATUS_LINE);
WriteString (status);
ReadEnd ();
}
}
}

6
server/ModMonoWorkerRequest.cs
Просмотреть файл

@ -143,7 +143,11 @@ namespace Mono.ASPNET
indexFiles = (string []) files.ToArray (typeof (string));
}
public ModMonoWorkerRequest (int requestId, ModMonoRequestBroker requestBroker, IApplicationHost appHost, string verb, string path, string queryString, string protocol, string localAddress, int serverPort, string remoteAddress, int remotePort, string remoteName, string[] headers, string[] headerValues)
public ModMonoWorkerRequest (int requestId, ModMonoRequestBroker requestBroker,
IApplicationHost appHost, string verb, string path,
string queryString, string protocol, string localAddress,
int serverPort, string remoteAddress, int remotePort,
string remoteName, string[] headers, string[] headerValues)
: base (appHost)
{
this.requestId = requestId;