aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-06-06 21:55:47 +0100
committerUbitUmarov2017-06-06 21:55:47 +0100
commit7d58b73bbcef148cdcd57b9a2796331c6497c397 (patch)
treea16386826709002a6b295234c0248a308b2af0d0 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
parentMerge branch 'master' into httptests (diff)
downloadopensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.zip
opensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.tar.gz
opensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.tar.bz2
opensim-SC-7d58b73bbcef148cdcd57b9a2796331c6497c397.tar.xz
some changes on pollevent
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs13
1 files changed, 1 insertions, 12 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index e59d475..ce4503c 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1935,20 +1935,13 @@ namespace OpenSim.Framework.Servers.HttpServer
1935 { 1935 {
1936 response.ProtocolVersion = (string)responsedata["http_protocol_version"]; 1936 response.ProtocolVersion = (string)responsedata["http_protocol_version"];
1937 } 1937 }
1938/* 1938
1939 if (responsedata.ContainsKey("keepalive")) 1939 if (responsedata.ContainsKey("keepalive"))
1940 { 1940 {
1941 bool keepalive = (bool)responsedata["keepalive"]; 1941 bool keepalive = (bool)responsedata["keepalive"];
1942 response.KeepAlive = keepalive; 1942 response.KeepAlive = keepalive;
1943 } 1943 }
1944 1944
1945 if (responsedata.ContainsKey("reusecontext"))
1946 response.ReuseContext = (bool) responsedata["reusecontext"];
1947*/
1948 // disable this things
1949 response.KeepAlive = false;
1950 // response.ReuseContext = false;
1951
1952 // Cross-Origin Resource Sharing with simple requests 1945 // Cross-Origin Resource Sharing with simple requests
1953 if (responsedata.ContainsKey("access_control_allow_origin")) 1946 if (responsedata.ContainsKey("access_control_allow_origin"))
1954 response.AddHeader("Access-Control-Allow-Origin", (string)responsedata["access_control_allow_origin"]); 1947 response.AddHeader("Access-Control-Allow-Origin", (string)responsedata["access_control_allow_origin"]);
@@ -1961,11 +1954,8 @@ namespace OpenSim.Framework.Servers.HttpServer
1961 contentType = "text/html"; 1954 contentType = "text/html";
1962 } 1955 }
1963 1956
1964
1965
1966 // The client ignores anything but 200 here for web login, so ensure that this is 200 for that 1957 // The client ignores anything but 200 here for web login, so ensure that this is 200 for that
1967 1958
1968
1969 response.StatusCode = responsecode; 1959 response.StatusCode = responsecode;
1970 1960
1971 if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently) 1961 if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently)
@@ -1975,7 +1965,6 @@ namespace OpenSim.Framework.Servers.HttpServer
1975 } 1965 }
1976 1966
1977 response.AddHeader("Content-Type", contentType); 1967 response.AddHeader("Content-Type", contentType);
1978
1979 if (responsedata.ContainsKey("headers")) 1968 if (responsedata.ContainsKey("headers"))
1980 { 1969 {
1981 Hashtable headerdata = (Hashtable)responsedata["headers"]; 1970 Hashtable headerdata = (Hashtable)responsedata["headers"];