diff options
| author | Melanie Thielker | 2016-06-16 01:48:27 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2016-06-16 01:48:27 +0200 |
| commit | ed168473af59532f80af215b2b233e7a4d906032 (patch) | |
| tree | 940e58dba6a581cf5d5afca5991b0b7b545d9754 /OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | |
| parent | Also make the HGUserManagementModule more amenable to subclassing. (diff) | |
| parent | "reverting" the keep alive changes brought in from avination, to check if tha... (diff) | |
| download | opensim-SC_OLD-ed168473af59532f80af215b2b233e7a4d906032.zip opensim-SC_OLD-ed168473af59532f80af215b2b233e7a4d906032.tar.gz opensim-SC_OLD-ed168473af59532f80af215b2b233e7a4d906032.tar.bz2 opensim-SC_OLD-ed168473af59532f80af215b2b233e7a4d906032.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs index 17e9dc2..ccf9c91 100644 --- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs | |||
| @@ -322,10 +322,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 322 | { | 322 | { |
| 323 | _httpResponse.Body.Flush(); | 323 | _httpResponse.Body.Flush(); |
| 324 | 324 | ||
| 325 | // disable this till they are safe to use | ||
| 326 | _httpResponse.Connection = ConnectionType.Close; | ||
| 327 | _httpResponse.Chunked = false; | ||
| 328 | |||
| 329 | _httpResponse.Send(); | 325 | _httpResponse.Send(); |
| 330 | } | 326 | } |
| 331 | 327 | ||