diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Framework/ServiceAuth | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs index 512ac4f..9126cfb 100644 --- a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs +++ b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth | |||
56 | { | 56 | { |
57 | // remove_me = section; | 57 | // remove_me = section; |
58 | m_Username = Util.GetConfigVarFromSections<string>(config, "HttpAuthUsername", new string[] { "Network", section }, string.Empty); | 58 | m_Username = Util.GetConfigVarFromSections<string>(config, "HttpAuthUsername", new string[] { "Network", section }, string.Empty); |
59 | m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty); | 59 | m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty); |
60 | string str = m_Username + ":" + m_Password; | 60 | string str = m_Username + ":" + m_Password; |
61 | byte[] encData_byte = Util.UTF8.GetBytes(str); | 61 | byte[] encData_byte = Util.UTF8.GetBytes(str); |
62 | 62 | ||
diff --git a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs index a49952c..79d6ff4 100644 --- a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs +++ b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth | |||
56 | m_authentications.Remove(auth); | 56 | m_authentications.Remove(auth); |
57 | } | 57 | } |
58 | 58 | ||
59 | public void AddAuthorization(NameValueCollection headers) | 59 | public void AddAuthorization(NameValueCollection headers) |
60 | { | 60 | { |
61 | foreach (IServiceAuth auth in m_authentications) | 61 | foreach (IServiceAuth auth in m_authentications) |
62 | auth.AddAuthorization(headers); | 62 | auth.AddAuthorization(headers); |