diff options
author | Dr Scofield | 2008-10-06 21:59:43 +0000 |
---|---|---|
committer | Dr Scofield | 2008-10-06 21:59:43 +0000 |
commit | ad04626737c164138d6d15d5e06eb20ff5b5f859 (patch) | |
tree | 6bc3aeb5dbb645503fcedb4012e68f069f8ada72 /OpenSim/Framework/Servers/OSHttpRequest.cs | |
parent | oops. forgot testcase (diff) | |
download | opensim-SC-ad04626737c164138d6d15d5e06eb20ff5b5f859.zip opensim-SC-ad04626737c164138d6d15d5e06eb20ff5b5f859.tar.gz opensim-SC-ad04626737c164138d6d15d5e06eb20ff5b5f859.tar.bz2 opensim-SC-ad04626737c164138d6d15d5e06eb20ff5b5f859.tar.xz |
cleaning up OSHttpResponse: note that read access to extra header
fields is GONE (HttpServer does not support that), you can read the
"normal" HTTP headers available via properties, and you can add
headers. also, it is now possible to set a timeout for KeepAlive (for
those clients that pay attention to it).
this also fixes the broken REST inventory/assets/appearance services,
they should be working again.
testcase for OSHttpResponse will follow.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/OSHttpRequest.cs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs index c47fe10..4c7d7ce 100644 --- a/OpenSim/Framework/Servers/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/OSHttpRequest.cs | |||
@@ -42,9 +42,8 @@ namespace OpenSim.Framework.Servers | |||
42 | { | 42 | { |
43 | private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | protected HttpServer.IHttpRequest _request = null; | 45 | protected IHttpRequest _request = null; |
46 | protected HttpServer.IHttpClientContext _context = null; | 46 | protected IHttpClientContext _context = null; |
47 | |||
48 | 47 | ||
49 | public string[] AcceptTypes | 48 | public string[] AcceptTypes |
50 | { | 49 | { |
@@ -137,8 +136,15 @@ namespace OpenSim.Framework.Servers | |||
137 | } | 136 | } |
138 | private string _userAgent; | 137 | private string _userAgent; |
139 | 138 | ||
139 | internal IHttpRequest IHttpRequest | ||
140 | { | ||
141 | get { return _request; } | ||
142 | } | ||
140 | 143 | ||
141 | 144 | internal IHttpClientContext IHttpClientContext | |
145 | { | ||
146 | get { return _context; } | ||
147 | } | ||
142 | 148 | ||
143 | /// <summary> | 149 | /// <summary> |
144 | /// Internal whiteboard for handlers to store temporary stuff | 150 | /// Internal whiteboard for handlers to store temporary stuff |
@@ -151,11 +157,9 @@ namespace OpenSim.Framework.Servers | |||
151 | private Dictionary<string, object> _whiteboard = new Dictionary<string, object>(); | 157 | private Dictionary<string, object> _whiteboard = new Dictionary<string, object>(); |
152 | 158 | ||
153 | 159 | ||
154 | public OSHttpRequest() | 160 | public OSHttpRequest() {} |
155 | { | ||
156 | } | ||
157 | 161 | ||
158 | public OSHttpRequest(HttpServer.IHttpClientContext context, HttpServer.IHttpRequest req) | 162 | public OSHttpRequest(IHttpClientContext context, IHttpRequest req) |
159 | { | 163 | { |
160 | _request = req; | 164 | _request = req; |
161 | _context = context; | 165 | _context = context; |