diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs index 41aa19b..7fc9f0b 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs | |||
| @@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 47 | : base(httpMethod, path, name, description) {} | 47 | : base(httpMethod, path, name, description) {} |
| 48 | 48 | ||
| 49 | protected BaseStreamHandler(string httpMethod, string path, IServiceAuth auth) | 49 | protected BaseStreamHandler(string httpMethod, string path, IServiceAuth auth) |
| 50 | : base(httpMethod, path, null, null) | 50 | : base(httpMethod, path, null, null) |
| 51 | { | 51 | { |
| 52 | m_Auth = auth; | 52 | m_Auth = auth; |
| 53 | } | 53 | } |
| @@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 62 | HttpStatusCode statusCode; | 62 | HttpStatusCode statusCode; |
| 63 | 63 | ||
| 64 | if (!m_Auth.Authenticate(httpRequest.Headers, httpResponse.AddHeader, out statusCode)) | 64 | if (!m_Auth.Authenticate(httpRequest.Headers, httpResponse.AddHeader, out statusCode)) |
| 65 | { | 65 | { |
| 66 | httpResponse.StatusCode = (int)statusCode; | 66 | httpResponse.StatusCode = (int)statusCode; |
| 67 | httpResponse.ContentType = "text/plain"; | 67 | httpResponse.ContentType = "text/plain"; |
| 68 | return new byte[0]; | 68 | return new byte[0]; |