diff options
| author | UbitUmarov | 2016-12-09 04:50:07 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-09 04:50:07 +0000 |
| commit | 8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da (patch) | |
| tree | ca6a6e9200e4c1cd69104ce405338ee54dde2de3 /OpenSim/Framework/Servers/HttpServer | |
| parent | provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can b... (diff) | |
| parent | JsonRpc: don't try to connect to a empty uri (diff) | |
| download | opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.zip opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.tar.gz opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.tar.bz2 opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs index 2fe1a7d..f3faf4f 100644 --- a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs | |||
| @@ -77,6 +77,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 77 | if (parameters == null) | 77 | if (parameters == null) |
| 78 | throw new ArgumentNullException("parameters"); | 78 | throw new ArgumentNullException("parameters"); |
| 79 | 79 | ||
| 80 | if(string.IsNullOrWhiteSpace(uri)) | ||
| 81 | return false; | ||
| 82 | |||
| 80 | OSDMap request = new OSDMap(); | 83 | OSDMap request = new OSDMap(); |
| 81 | request.Add("jsonrpc", OSD.FromString("2.0")); | 84 | request.Add("jsonrpc", OSD.FromString("2.0")); |
| 82 | request.Add("id", OSD.FromString(jsonId)); | 85 | request.Add("id", OSD.FromString(jsonId)); |