diff options
author | Teravus Ovares | 2008-09-27 22:05:36 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-27 22:05:36 +0000 |
commit | 98632ee594670625fbebc0faa49795fdccb9218a (patch) | |
tree | e36b3d00e10fc000121cc25df7302046a0a3f848 /OpenSim/Framework/Servers/BaseHttpServer.cs | |
parent | Continue working on the new EventQueueGetModule. Not finished (or even working) (diff) | |
download | opensim-SC_OLD-98632ee594670625fbebc0faa49795fdccb9218a.zip opensim-SC_OLD-98632ee594670625fbebc0faa49795fdccb9218a.tar.gz opensim-SC_OLD-98632ee594670625fbebc0faa49795fdccb9218a.tar.bz2 opensim-SC_OLD-98632ee594670625fbebc0faa49795fdccb9218a.tar.xz |
* Event queue is now polling..
* returns FAKEEVENT instead of the connection returning a 502. It doesn't like our 502's for some reason.. so, in leau of this.. send it a fake event.
* Once again, this is still 'really early' code, so please don't blame us if you have no more threads left.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 24bba2b..504ca8b 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -991,6 +991,7 @@ namespace OpenSim.Framework.Servers | |||
991 | string responseString = (string)responsedata["str_response_string"]; | 991 | string responseString = (string)responsedata["str_response_string"]; |
992 | string contentType = (string)responsedata["content_type"]; | 992 | string contentType = (string)responsedata["content_type"]; |
993 | 993 | ||
994 | |||
994 | if (responsedata.ContainsKey("keepalive")) | 995 | if (responsedata.ContainsKey("keepalive")) |
995 | response.KeepAlive = true; | 996 | response.KeepAlive = true; |
996 | 997 | ||
@@ -1003,7 +1004,7 @@ namespace OpenSim.Framework.Servers | |||
1003 | } | 1004 | } |
1004 | 1005 | ||
1005 | // The client ignores anything but 200 here for web login, so ensure that this is 200 for that | 1006 | // The client ignores anything but 200 here for web login, so ensure that this is 200 for that |
1006 | 1007 | ||
1007 | response.StatusCode = responsecode; | 1008 | response.StatusCode = responsecode; |
1008 | 1009 | ||
1009 | if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently) | 1010 | if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently) |
@@ -1028,7 +1029,7 @@ namespace OpenSim.Framework.Servers | |||
1028 | response.SendChunked = false; | 1029 | response.SendChunked = false; |
1029 | response.ContentLength64 = buffer.Length; | 1030 | response.ContentLength64 = buffer.Length; |
1030 | response.ContentEncoding = Encoding.UTF8; | 1031 | response.ContentEncoding = Encoding.UTF8; |
1031 | 1032 | ||
1032 | 1033 | ||
1033 | try | 1034 | try |
1034 | { | 1035 | { |
@@ -1042,6 +1043,7 @@ namespace OpenSim.Framework.Servers | |||
1042 | { | 1043 | { |
1043 | response.OutputStream.Close(); | 1044 | response.OutputStream.Close(); |
1044 | } | 1045 | } |
1046 | |||
1045 | } | 1047 | } |
1046 | 1048 | ||
1047 | public void SendHTML404(OSHttpResponse response, string host) | 1049 | public void SendHTML404(OSHttpResponse response, string host) |