OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

let StreamReader be in using statements

httptests
UbitUmarov 2017-05-07 00:47:45 +01:00
parent de55ad9545
commit d0912b6151
22 changed files with 81 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
View File

@ -115,9 +115,10 @@ namespace OpenSim.Groups
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

7
OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
View File

@ -91,9 +91,10 @@ namespace OpenSim.Groups
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

42
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -399,11 +399,10 @@ namespace OpenSim.Framework.Servers.HttpServer
Stream requestStream = req.InputStream; Stream requestStream = req.InputStream;
string requestBody;
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;
StreamReader reader = new StreamReader(requestStream, encoding); using(StreamReader reader = new StreamReader(requestStream, encoding))
requestBody = reader.ReadToEnd();
string requestBody = reader.ReadToEnd();
reader.Close();
Hashtable keysvals = new Hashtable(); Hashtable keysvals = new Hashtable();
Hashtable headervals = new Hashtable(); Hashtable headervals = new Hashtable();
@ -567,13 +566,10 @@ namespace OpenSim.Framework.Servers.HttpServer
IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler;
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
string requestBody;
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;
StreamReader reader = new StreamReader(requestStream, encoding); using(StreamReader reader = new StreamReader(requestStream, encoding))
requestBody = reader.ReadToEnd();
string requestBody = reader.ReadToEnd();
reader.Close();
//requestStream.Close();
Hashtable keysvals = new Hashtable(); Hashtable keysvals = new Hashtable();
Hashtable headervals = new Hashtable(); Hashtable headervals = new Hashtable();
@ -690,7 +686,7 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
request.InputStream.Close(); request.InputStream.Dispose();
if (buffer != null) if (buffer != null)
{ {
@ -998,7 +994,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
String requestBody; String requestBody;
Stream requestStream = request.InputStream; Stream requestStream = Util.Copy(request.InputStream);
Stream innerStream = null; Stream innerStream = null;
try try
{ {
@ -1009,9 +1005,8 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8)) using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
{
requestBody = reader.ReadToEnd(); requestBody = reader.ReadToEnd();
}
} }
finally finally
{ {
@ -1263,12 +1258,10 @@ namespace OpenSim.Framework.Servers.HttpServer
//m_log.Warn("[BASE HTTP SERVER]: We've figured out it's a LLSD Request"); //m_log.Warn("[BASE HTTP SERVER]: We've figured out it's a LLSD Request");
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
string requestBody;
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;
StreamReader reader = new StreamReader(requestStream, encoding); using(StreamReader reader = new StreamReader(requestStream, encoding))
requestBody= reader.ReadToEnd();
string requestBody = reader.ReadToEnd();
reader.Close();
requestStream.Close();
//m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody); //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
response.KeepAlive = true; response.KeepAlive = true;
@ -1592,15 +1585,10 @@ namespace OpenSim.Framework.Servers.HttpServer
byte[] buffer; byte[] buffer;
Stream requestStream = request.InputStream; Stream requestStream = request.InputStream;
string requestBody;
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;
StreamReader reader = new StreamReader(requestStream, encoding); using(StreamReader reader = new StreamReader(requestStream, encoding))
requestBody = reader.ReadToEnd();
string requestBody = reader.ReadToEnd();
// avoid warning for now
reader.ReadToEnd();
reader.Close();
requestStream.Close();
Hashtable keysvals = new Hashtable(); Hashtable keysvals = new Hashtable();
Hashtable headervals = new Hashtable(); Hashtable headervals = new Hashtable();

7
OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
View File

@ -50,11 +50,10 @@ namespace OpenSim.Framework.Servers.HttpServer
protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
string requestBody;
Encoding encoding = Encoding.UTF8; Encoding encoding = Encoding.UTF8;
StreamReader streamReader = new StreamReader(request, encoding); using(StreamReader streamReader = new StreamReader(request,encoding))
requestBody = streamReader.ReadToEnd();
string requestBody = streamReader.ReadToEnd();
streamReader.Close();
string param = GetParam(path); string param = GetParam(path);
string responseString = m_restMethod(requestBody, path, param, httpRequest, httpResponse); string responseString = m_restMethod(requestBody, path, param, httpRequest, httpResponse);

5
OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
View File

@ -185,8 +185,9 @@ namespace OpenSim.Region.ClientStack.Linden
protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader reader = new StreamReader(request); string message;
string message = reader.ReadToEnd(); using(StreamReader reader = new StreamReader(request))
message = reader.ReadToEnd();
OSD osd = OSDParser.DeserializeLLSDXml(message); OSD osd = OSDParser.DeserializeLLSDXml(message);

7
OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
View File

@ -65,9 +65,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
protected override byte[] ProcessRequest( protected override byte[] ProcessRequest(
string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

7
OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
View File

@ -60,9 +60,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
// m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body); // m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);

5
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
View File

@ -460,9 +460,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
if (resp.ContentLength > 0) if (resp.ContentLength > 0)
{ {
StreamReader content = new StreamReader(resp.GetResponseStream()); using(StreamReader content = new StreamReader(resp.GetResponseStream()))
m_log.ErrorFormat("[Concierge] response from {0} content: {1}", bs.Uri, content.ReadToEnd()); m_log.ErrorFormat("[Concierge] response from {0} content: {1}", bs.Uri, content.ReadToEnd());
content.Close();
} }
} }
} }

8
OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
View File

@ -82,11 +82,11 @@ namespace OpenSim.Server.Handlers.Authentication
switch (p[0]) switch (p[0])
{ {
case "plain": case "plain":
StreamReader sr = new StreamReader(request); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(request))
sr.Close(); body = sr.ReadToEnd();
return DoPlainMethods(body); return DoPlainMethods(body);
case "crypt": case "crypt":
byte[] buffer = new byte[request.Length]; byte[] buffer = new byte[request.Length];
long length = request.Length; long length = request.Length;

5
OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
View File

@ -222,7 +222,10 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
try try
{ {
NameValueCollection postQuery = HttpUtility.ParseQueryString(new StreamReader(httpRequest.InputStream).ReadToEnd()); string forPost;
using(StreamReader sr = new StreamReader(httpRequest.InputStream))
forPost = sr.ReadToEnd();
NameValueCollection postQuery = HttpUtility.ParseQueryString(forPost);
NameValueCollection getQuery = HttpUtility.ParseQueryString(httpRequest.Url.Query); NameValueCollection getQuery = HttpUtility.ParseQueryString(httpRequest.Url.Query);
NameValueCollection openIdQuery = (postQuery.GetValues("openid.mode") != null ? postQuery : getQuery); NameValueCollection openIdQuery = (postQuery.GetValues("openid.mode") != null ? postQuery : getQuery);

6
OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
View File

@ -60,9 +60,9 @@ namespace OpenSim.Server.Handlers.Avatar
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

6
OpenSim/Server/Handlers/BakedTextures/XBakesPostHandler.cs
View File

@ -65,10 +65,8 @@ namespace OpenSim.Server.Handlers.BakedTextures
return new byte[0]; return new byte[0];
} }
StreamReader sr = new StreamReader(request); using(StreamReader sr = new StreamReader(request))
m_BakesService.Store(p[0],sr.ReadToEnd());
m_BakesService.Store(p[0], sr.ReadToEnd());
sr.Close();
return new byte[0]; return new byte[0];
} }

7
OpenSim/Server/Handlers/Estate/EstateDataRobustConnector.cs
View File

@ -282,9 +282,10 @@ namespace OpenSim.Server.Handlers
// /estates/estate/?eid=int&region=uuid // /estates/estate/?eid=int&region=uuid
if ("estate".Equals(resource)) if ("estate".Equals(resource))
{ {
StreamReader sr = new StreamReader(request); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(request))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
Dictionary<string, object> requestData = ServerUtils.ParseQueryString(body); Dictionary<string, object> requestData = ServerUtils.ParseQueryString(body);

6
OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
View File

@ -61,9 +61,9 @@ namespace OpenSim.Server.Handlers.Friends
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

6
OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
View File

@ -65,9 +65,9 @@ namespace OpenSim.Server.Handlers.Grid
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

6
OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
View File

@ -60,9 +60,9 @@ namespace OpenSim.Server.Handlers.GridUser
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

6
OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
View File

@ -71,9 +71,9 @@ namespace OpenSim.Server.Handlers.Hypergrid
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

6
OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
View File

@ -95,9 +95,9 @@ namespace OpenSim.Server.Handlers.Inventory
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
//m_log.DebugFormat("[XXX]: query String: {0}", body); //m_log.DebugFormat("[XXX]: query String: {0}", body);

6
OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
View File

@ -104,9 +104,9 @@ namespace OpenSim.Server.Handlers.MapImage
protected override byte[] ProcessRequest(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) protected override byte[] ProcessRequest(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
// m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); // m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path);
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
try try

6
OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
View File

@ -102,9 +102,9 @@ namespace OpenSim.Server.Handlers.MapImage
public override byte[] Handle(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) public override byte[] Handle(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
// m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); // m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path);
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
try try

6
OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
View File

@ -72,9 +72,9 @@ namespace OpenSim.Server.Handlers.UserAccounts
protected override byte[] ProcessRequest(string path, Stream requestData, protected override byte[] ProcessRequest(string path, Stream requestData,
IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{ {
StreamReader sr = new StreamReader(requestData); string body;
string body = sr.ReadToEnd(); using(StreamReader sr = new StreamReader(requestData))
sr.Close(); body = sr.ReadToEnd();
body = body.Trim(); body = body.Trim();
// We need to check the authorization header // We need to check the authorization header

2
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
View File

@ -183,8 +183,8 @@ namespace OpenSim.Services.Connectors
{ {
using (StreamReader sr = new StreamReader(s)) using (StreamReader sr = new StreamReader(s))
{ {
sr.ReadToEnd(); // just try to read
//reply = sr.ReadToEnd().Trim(); //reply = sr.ReadToEnd().Trim();
sr.ReadToEnd().Trim();
//m_log.InfoFormat("[REST COMMS]: DoHelloNeighbourCall reply was {0} ", reply); //m_log.InfoFormat("[REST COMMS]: DoHelloNeighbourCall reply was {0} ", reply);
} }
} }