OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify default 404 message, removing wrong(missing) host info

master
UbitUmarov 2020-04-25 21:13:54 +01:00
parent cafe49d44b
commit 70d2878d0a
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -1718,11 +1718,6 @@ namespace OpenSim.Framework.Servers.HttpServer
headervals[headername] = request.Headers[headername]; headervals[headername] = request.Headers[headername];
} }
if (headervals.Contains("Host"))
{
host = (string)headervals["Host"];
}
keysvals.Add("headers", headervals); keysvals.Add("headers", headervals);
keysvals.Add("querystringkeys", querystringkeys); keysvals.Add("querystringkeys", querystringkeys);
keysvals.Add("requestvars", requestVars); keysvals.Add("requestvars", requestVars);
@ -1745,7 +1740,7 @@ namespace OpenSim.Framework.Servers.HttpServer
else else
{ {
// m_log.Warn("[BASE HTTP SERVER]: Handler Not Found"); // m_log.Warn("[BASE HTTP SERVER]: Handler Not Found");
buffer = SendHTML404(response, host); buffer = SendHTML404(response);
} }
} }
else else
@ -1762,7 +1757,7 @@ namespace OpenSim.Framework.Servers.HttpServer
else else
{ {
// m_log.Warn("[BASE HTTP SERVER]: Handler Not Found2"); // m_log.Warn("[BASE HTTP SERVER]: Handler Not Found2");
buffer = SendHTML404(response, host); buffer = SendHTML404(response);
} }
} }
@ -1946,12 +1941,12 @@ namespace OpenSim.Framework.Servers.HttpServer
return buffer; return buffer;
} }
public byte[] SendHTML404(OSHttpResponse response, string host) public byte[] SendHTML404(OSHttpResponse response)
{ {
response.StatusCode = 404; response.StatusCode = 404;
response.ContentType = "text/html"; response.ContentType = "text/html";
string responseString = GetHTTP404(host); string responseString = GetHTTP404();
byte[] buffer = Encoding.UTF8.GetBytes(responseString); byte[] buffer = Encoding.UTF8.GetBytes(responseString);
response.ContentLength64 = buffer.Length; response.ContentLength64 = buffer.Length;
@ -2185,11 +2180,11 @@ namespace OpenSim.Framework.Servers.HttpServer
return false; return false;
} }
public string GetHTTP404(string host) public string GetHTTP404()
{ {
string file = Path.Combine(".", "http_404.html"); string file = Path.Combine(".", "http_404.html");
if (!File.Exists(file)) if (!File.Exists(file))
return getDefaultHTTP404(host); return getDefaultHTTP404();
StreamReader sr = File.OpenText(file); StreamReader sr = File.OpenText(file);
string result = sr.ReadToEnd(); string result = sr.ReadToEnd();
@ -2198,9 +2193,9 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
// Fallback HTTP responses in case the HTTP error response files don't exist // Fallback HTTP responses in case the HTTP error response files don't exist
private static string getDefaultHTTP404(string host) private static string getDefaultHTTP404()
{ {
return "<HTML><HEAD><TITLE>404 Page not found</TITLE><BODY><BR /><H1>Ooops!</H1><P>The page you requested has been obsconded with by knomes. Find hippos quick!</P><P>If you are trying to log-in, your link parameters should have: &quot;-loginpage http://" + host + "/?method=login -loginuri http://" + host + "/&quot; in your link </P></BODY></HTML>"; return "<HTML><HEAD><TITLE>404 Page not found</TITLE><BODY><BR /><H1>Ooops!</H1><P>The page you requested has been obsconded with by knomes. Find hippos quick!</P></BODY></HTML>";
} }
} }

2
OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
View File

@ -148,6 +148,6 @@ namespace OpenSim.Framework.Servers.HttpServer
void RemoveJsonRPCHandler(string method); void RemoveJsonRPCHandler(string method);
string GetHTTP404(string host); string GetHTTP404();
} }
} }

2
OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
View File

@ -317,7 +317,7 @@ namespace OpenSim.Region.UserStatistics
} }
else else
{ {
strOut = MainServer.Instance.GetHTTP404(""); strOut = MainServer.Instance.GetHTTP404();
} }
responsedata["int_response_code"] = response_code; responsedata["int_response_code"] = response_code;