projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #960 from ermshiperete/ShowHelp
[mono.git]
/
mcs
/
class
/
System.Runtime.Remoting
/
System.Runtime.Remoting.Channels.Http
/
HttpRemotingHandler.cs
diff --git
a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandler.cs
b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandler.cs
index 3cb1475817072c8af12365abcb5adf7396214f4b..206b032fe6dbdc1a8624221fb1765d1852f53dac 100644
(file)
--- a/
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandler.cs
+++ b/
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Http/HttpRemotingHandler.cs
@@
-65,7
+65,6
@@
namespace System.Runtime.Remoting.Channels.Http
HttpResponse response = context.Response;
// Create transport headers for the request
HttpResponse response = context.Response;
// Create transport headers for the request
-
TransportHeaders theaders = new TransportHeaders();
string objectUri = request.RawUrl;
TransportHeaders theaders = new TransportHeaders();
string objectUri = request.RawUrl;
@@
-86,12
+85,16
@@
namespace System.Runtime.Remoting.Channels.Http
ITransportHeaders responseHeaders;
Stream responseStream;
ITransportHeaders responseHeaders;
Stream responseStream;
- // Dispatch the request
+ // Dispatch the request
+ ServerProcessing proc = transportSink.SynchronousDispatch
+ (theaders, request.InputStream, out responseHeaders, out responseStream);
- transportSink.DispatchRequest (request.InputStream, theaders, out responseStream, out responseHeaders);
+ if (proc == ServerProcessing.Async) {
+ throw new NotSupportedException ("HttpRemotingHandler does not support async processing in " +
+ "the synchronous HTTP pipeline" );
+ }
// Write the response
// Write the response
-
if (responseHeaders != null && responseHeaders["__HttpStatusCode"] != null)
{
// The formatter can set the status code
if (responseHeaders != null && responseHeaders["__HttpStatusCode"] != null)
{
// The formatter can set the status code
@@
-108,15
+111,10
@@
namespace System.Runtime.Remoting.Channels.Http
response.AppendHeader(key, entry.Value.ToString());
}
}
response.AppendHeader(key, entry.Value.ToString());
}
}
-
- byte[] bodyBuffer = bodyBuffer = new byte [responseStream.Length];
- responseStream.Seek (0, SeekOrigin.Begin);
-
- int nr = 0;
- while (nr < responseStream.Length)
- nr += responseStream.Read (bodyBuffer, nr, bodyBuffer.Length - nr);
- response.OutputStream.Write (bodyBuffer, 0, bodyBuffer.Length);
+ if (responseStream != null) {
+ HttpClientTransportSink.CopyStream (responseStream, response.OutputStream, 1024);
+ }
}
}
}
}
}
}