aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-232-18/+32
|\
| * minor: remove mono compiler warnings in WebsocketServerHandler.csJustin Clark-Casey (justincc)2013-06-201-13/+7
| * Display existing statistic of how many http requests a server is making as se...Justin Clark-Casey (justincc)2013-06-191-1/+1
| * Make number of inbound http requests handled available as a httpserver.<port>...Justin Clark-Casey (justincc)2013-06-181-5/+25
* | Merge branch 'avination-current' into careminsterMelanie2013-06-112-319/+0
|\ \
| * | Clean up poll serviceMelanie2013-06-072-319/+0
* | | Merge branch 'master' into careminsterMelanie2013-06-112-7/+9
|\ \ \ | | |/ | |/|
| * | Add port numbers to poll service thread names so that we can tell which belon...Justin Clark-Casey (justincc)2013-06-101-2/+2
| * | Reinstate explicit starting and stopping of PollServiceRequestManager added i...Justin Clark-Casey (justincc)2013-06-102-4/+7
| * | Supply proper type information for the various types of requestsMelanie2013-06-071-3/+1
| * | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-074-226/+209
* | | Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+1
|\ \ \ | | |/ | |/|
| * | Send 503 when throttling texturesMelanie2013-04-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
|\ \ \ | |/ / |/| / | |/
| * * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-1/+1
* | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-3/+14
|\ \ | |/
| * *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a c...teravus2013-03-161-3/+14
* | Merge branch 'master' into careminsterMelanie2013-03-053-1/+24
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-03-051-1/+16
| |\
| | * * Add a Max Payload size property to the Websocket Server Handler. If you ...teravus2013-03-051-1/+16
| * | Add method to remove JsonRpc Handlers from the serverBlueWall2013-03-032-0/+8
| |/
* | Merge branch 'master' into careminsterMelanie2013-02-271-12/+3
|\ \ | |/
| * Make sure we dispose of WebResponse, StreamReader and Stream in various place...Justin Clark-Casey (justincc)2013-02-271-12/+3
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
* | Merge branch 'master' into careminsterMelanie2013-02-151-0/+2
|\ \ | |/
| * * gracefully handle a Situation where a double close is called on the WebSock...teravus2013-02-141-0/+2
* | Merge branch 'master' into careminsterMelanie2013-02-073-1/+1140
|\ \ | |/
| * * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows...teravus2013-02-072-1/+11
| |\
| * | This is the final commit that enables the Websocket handlerteravus2013-02-072-2/+1095
| * | We're not really done here.. but we're getting there. Socket Read is work...teravus2013-02-051-1/+37
* | | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ \ | | |/ | |/|
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-232-5/+15
| |\
| * | Add additional return statusBlueWall2013-01-232-4/+23
* | | Merge branch 'master' into careminsterMelanie2013-01-192-4/+14
|\ \ \ | | |/ | |/|
| * | Explicitly stop PollServiceRequestManager() rather than relying on its destru...Justin Clark-Casey (justincc)2013-01-192-5/+15
| |/
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-164-0/+294
|\ \ | |/
| * Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-154-0/+294
* | Merge branch 'master' into careminsterMelanie2012-12-071-1/+1
|\ \ | |/
| * In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather tha...Justin Clark-Casey (justincc)2012-12-051-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-251-53/+0
|\ \ | |/
| * Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0
* | Merge branch 'master' into careminsterMelanie2012-11-201-2/+5
|\ \ | |/
| * minor: If logging full incoming HTTP data, don't deceptively print ... at the...Justin Clark-Casey (justincc)2012-11-201-2/+5
* | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-1/+2
|\ \
| * | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ \ | | |/ | |/|
| * | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-141-0/+33