diff options
| author | Myan Thor | 2010-12-29 13:40:47 +0100 |
|---|---|---|
| committer | Diva Canto | 2010-12-29 06:03:43 -0800 |
| commit | 915c0b17b0638342a3e2de8b4f9d2505014561fd (patch) | |
| tree | ff83d0128990fc4aa2f4fbcfedece9293524d783 | |
| parent | Update SimianGridServicesConnector to work more like (diff) | |
| download | opensim-SC_OLD-915c0b17b0638342a3e2de8b4f9d2505014561fd.zip opensim-SC_OLD-915c0b17b0638342a3e2de8b4f9d2505014561fd.tar.gz opensim-SC_OLD-915c0b17b0638342a3e2de8b4f9d2505014561fd.tar.bz2 opensim-SC_OLD-915c0b17b0638342a3e2de8b4f9d2505014561fd.tar.xz | |
fixes a problem with ending slashes in GatekeeperService to verify session-addresses
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 4419201..bbddd87 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -330,10 +330,12 @@ namespace OpenSim.Services.HypergridService | |||
| 330 | if (parts.Length < 2) | 330 | if (parts.Length < 2) |
| 331 | return false; | 331 | return false; |
| 332 | 332 | ||
| 333 | string addressee = parts[0]; | 333 | char[] trailing_slash = new char[] { '/' }; |
| 334 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Verifying {0} against {1}", addressee, m_ExternalName); | 334 | string addressee = parts[0].TrimEnd(trailing_slash); |
| 335 | string externalname = m_ExternalName.TrimEnd(trailing_slash); | ||
| 336 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Verifying {0} against {1}", addressee, externalname); | ||
| 335 | 337 | ||
| 336 | return string.Equals(addressee, m_ExternalName, StringComparison.OrdinalIgnoreCase); | 338 | return string.Equals(addressee, externalname, StringComparison.OrdinalIgnoreCase); |
| 337 | } | 339 | } |
| 338 | 340 | ||
| 339 | #endregion | 341 | #endregion |