aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-12-011-15/+48
|\
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
| * With "debug http 1", show the path with the query string instead of just the ...Justin Clark-Casey (justincc)2011-11-291-21/+21
| * Add "debug http" command for currently simple extra debug logging of non-even...Justin Clark-Casey (justincc)2011-11-291-12/+43
* | Merge branch 'master' into bigmergeMelanie2011-11-171-0/+3
|\ \ | |/
| * send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-101-8/+6
|\ \ | |/
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
* | Merge branch 'master' into bigmergeMelanie2011-10-263-19/+27
|\ \ | |/
| * Restart the event queue worker threads that I accidentally disabled earlier t...Justin Clark-Casey (justincc)2011-10-251-7/+9
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-253-19/+25
* | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmergeMelanie2011-10-251-12/+2
|\ \ | |/
| * Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-252-5/+9
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS...Justin Clark-Casey (justincc)2011-10-242-5/+9
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all...Justin Clark-Casey (justincc)2011-09-301-1/+1
* | Resolve merge commits, stage 1Tom2011-09-041-57/+55
|\ \ | |/
| * read m_rpcHandlersKeepAlive under appropriate lockJustin Clark-Casey (justincc)2011-08-221-2/+4
| * oops, fix build break from last commitJustin Clark-Casey (justincc)2011-08-221-12/+8
| * improve locking of m_agentHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-10/+10
| * improve locking of m_HTTPHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+2
| * improve locking of m_streamHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+4
| * remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSD...Justin Clark-Casey (justincc)2011-08-221-11/+6
| * improve locking of m_llsdHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-30/+32
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-221-3/+3
| * improve locking of m_rpcHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-2/+2
|\ \ | |/
| * First pass at making the V2 map work. Standalones only for now. There are som...Diva Canto2011-06-121-2/+2
* | Some additional protection, it seems that responsedata needs to be locked, bu...Tom2011-05-261-5/+14
* | If a response cannot be obtained (the script has no handler) return a more fr...Tom2011-05-171-4/+18
|/
* Adding ssl supportBlueWall2011-05-051-0/+14
* Get Viewer 2 voice working with OpenSim.Justin Clark-Casey (justincc)2011-04-201-1/+1
* Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-123-445/+0
* Thanks Kevin Cozens for a patch that:BlueWall2011-03-171-1/+1
* minor: bring comment into line with code realityJustin Clark-Casey (justincc)2011-03-161-1/+1
* Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386Diva Canto2011-02-161-1/+13
* Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-0/+32
* With mic's permission, adjust long call time info messages to 500ms from 200msJustin Clark-Casey (justincc)2011-01-191-2/+3
* Added more performance checks to the HTTP server. Each requestMic Bowman2011-01-051-1/+15
* Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-201-2/+2
* minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
* Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-0/+4
|\
| * Support for CORS with simple requests in BaseHttpServerMarck2010-11-021-0/+4
| * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-2/+2
|/
* * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-171-1/+2
|\
| * * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-141-1/+2
* | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-5/+5
|/