aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDr Scofield2008-07-18 19:28:52 +0000
committerDr Scofield2008-07-18 19:28:52 +0000
commit6a7d5444971b7891a23f3dc2f326ea3d7dacbaef (patch)
treec30562eef5ac1b3b175637a72ce5d2a577144e5a /OpenSim/Framework
parentMantis#1778. Thank you kindly, Junta_Kohime for a patch that: (diff)
downloadopensim-SC-6a7d5444971b7891a23f3dc2f326ea3d7dacbaef.zip
opensim-SC-6a7d5444971b7891a23f3dc2f326ea3d7dacbaef.tar.gz
opensim-SC-6a7d5444971b7891a23f3dc2f326ea3d7dacbaef.tar.bz2
opensim-SC-6a7d5444971b7891a23f3dc2f326ea3d7dacbaef.tar.xz
pulling query handling through the handlers. adding (non-functional,
work-in-progress) HttpHandler. NOTE: non-active code. does not glow in the dark. non-combustible.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/OSHttpHandler.cs4
-rw-r--r--OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs2
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpHandler.cs b/OpenSim/Framework/Servers/OSHttpHandler.cs
index 6e8f6fb..66fff3e 100644
--- a/OpenSim/Framework/Servers/OSHttpHandler.cs
+++ b/OpenSim/Framework/Servers/OSHttpHandler.cs
@@ -137,10 +137,12 @@ namespace OpenSim.Framework.Servers
137 /// <param name="contentType">null or content type 137 /// <param name="contentType">null or content type
138 /// regex</param> 138 /// regex</param>
139 /// <param name="whitelist">null or IP address regex</param> 139 /// <param name="whitelist">null or IP address regex</param>
140 public OSHttpHandler(Regex method, Regex path, Dictionary<string, Regex> headers, Regex contentType, Regex whitelist) 140 public OSHttpHandler(Regex method, Regex path, Dictionary<string, Regex> query,
141 Dictionary<string, Regex> headers, Regex contentType, Regex whitelist)
141 { 142 {
142 _method = method; 143 _method = method;
143 _path = path; 144 _path = path;
145 _query = query;
144 _ipEndPointRegex = whitelist; 146 _ipEndPointRegex = whitelist;
145 147
146 if (null == _headers && null != contentType) 148 if (null == _headers && null != contentType)
diff --git a/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs b/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs
index 2c31cfd..f3f056a 100644
--- a/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs
+++ b/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Framework.Servers
114 /// </remarks> 114 /// </remarks>
115 public OSHttpXmlRpcHandler(XmlRpcMethod handler, string methodName, Regex path, 115 public OSHttpXmlRpcHandler(XmlRpcMethod handler, string methodName, Regex path,
116 Dictionary<string, Regex> headers, Regex whitelist) 116 Dictionary<string, Regex> headers, Regex whitelist)
117 : base(new Regex(@"^POST$", RegexOptions.IgnoreCase | RegexOptions.Compiled), path, headers, 117 : base(new Regex(@"^POST$", RegexOptions.IgnoreCase | RegexOptions.Compiled), path, null, headers,
118 new Regex(@"^(text|application)/xml", RegexOptions.IgnoreCase | RegexOptions.Compiled), 118 new Regex(@"^(text|application)/xml", RegexOptions.IgnoreCase | RegexOptions.Compiled),
119 whitelist) 119 whitelist)
120 { 120 {