aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-244-4/+65
|\
| * Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post reques...Diva Canto2013-07-181-1/+1
| * Revert "Revert "Putting the requests back in the queue while testing for coun...Diva Canto2013-07-181-3/+7
| * Reverting the reverts I did yesterday. cpu-branch has now beenDiva Canto2013-07-182-48/+35
| * Revert "Cleared up much confusion in PollServiceRequestManager. Here's the hi...Diva Canto2013-07-172-35/+48
| * Revert "Putting the requests back in the queue while testing for count >0 is ...Diva Canto2013-07-171-7/+3
| * Revert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRe...Diva Canto2013-07-171-2/+2
| * Revert "This is a completely unreasonable thing to do, effectively defying th...Diva Canto2013-07-171-52/+40
| * This is a completely unreasonable thing to do, effectively defying the purpos...Diva Canto2013-07-171-40/+52
| * Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestMan...Diva Canto2013-07-171-2/+2
| * Putting the requests back in the queue while testing for count >0 is not the ...Diva Canto2013-07-171-3/+7
| * Cleared up much confusion in PollServiceRequestManager. Here's the history:Diva Canto2013-07-172-48/+35
| * Add request received/handling stats for caps which are served by http poll ha...Justin Clark-Casey (justincc)2013-07-154-50/+69
* | Merge branch 'master' into careminsterMelanie2013-07-189-17/+112
|\ \ | |/
| * Add missing file BaseOutputStreamHandler.cs from recent commit e19defdJustin Clark-Casey (justincc)2013-07-081-0/+60
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-1/+1
| |\
| | * BaseHttpServer: if the handler sets the content length, don't override it. Th...Diva Canto2013-07-081-1/+1
| * | Add "show caps stats by user" and "show caps stats by cap" console commands t...Justin Clark-Casey (justincc)2013-07-087-16/+51
| |/
* | 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
|\ \ \ | | |/ | |/|