Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -57/+55 |
|\ | |||||
| * | read m_rpcHandlersKeepAlive under appropriate lock | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| | | |||||
| * | oops, fix build break from last commit | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -12/+8 |
| | | |||||
| * | improve locking of m_agentHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -10/+10 |
| | | |||||
| * | improve locking of m_HTTPHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+2 |
| | | |||||
| * | improve locking of m_streamHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -2/+4 |
| | | |||||
| * | remove necessity to catch a KeyNotFoundException in ↵ | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -11/+6 |
| | | | | | | | | BaseHttpServer.RemoveLLSDHandler() | ||||
| * | improve locking of m_llsdHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -30/+32 |
| | | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -3/+3 |
| | | |||||
| * | improve locking of m_rpcHandlers in BaseHttpServer | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-13 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | First pass at making the V2 map work. Standalones only for now. There are ↵ | Diva Canto | 2011-06-12 | 1 | -2/+2 |
| | | | | | | | | some issues with the zoom level -- TBD. | ||||
* | | Some additional protection, it seems that responsedata needs to be locked, ↵ | Tom | 2011-05-26 | 1 | -5/+14 |
| | | | | | | | | but I can't immediately see where it's being accessed from another thread. For now, this will protect the server | ||||
* | | If a response cannot be obtained (the script has no handler) return a more ↵ | Tom | 2011-05-17 | 1 | -4/+18 |
|/ | | | | friendly 500 error instead of crashing out with a null reference and letting the connection hang | ||||
* | Adding ssl support | BlueWall | 2011-05-05 | 1 | -0/+14 |
| | | | | | Adding ssl support for "Out of Band" applications such as the remote admin module or Robust services | ||||
* | Get Viewer 2 voice working with OpenSim. | Justin Clark-Casey (justincc) | 2011-04-20 | 1 | -1/+1 |
| | | | | | | | | See http://opensimulator.org/mantis/view.php?id=5336 It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop. Viewer 1 was quite happy to ignore the lack of response. This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work. However, at some point we need to fill out the watcher response, whatever that is. | ||||
* | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵ | Diva Canto | 2011-04-12 | 3 | -445/+0 |
| | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. | ||||
* | Thanks Kevin Cozens for a patch that: | BlueWall | 2011-03-17 | 1 | -1/+1 |
| | | | | Fixes several spelling mistakes | ||||
* | minor: bring comment into line with code reality | Justin Clark-Casey (justincc) | 2011-03-16 | 1 | -1/+1 |
| | |||||
* | Up the timeout on slow requests to 3000 to stop console spam. Make sure | Melanie | 2011-03-14 | 1 | -5/+21 |
| | | | | | request method and target are reported correctly and drop the txn id as it's empty 99% of the time. | ||||
* | XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386 | Diva Canto | 2011-02-16 | 1 | -1/+13 |
| | |||||
* | Added a couple of console commands to help diagnose issues: | Diva Canto | 2011-02-05 | 1 | -0/+32 |
| | | | | | show circuits: shows the lists of agent circuit data show http-handlers: shows the currently registered http handlers | ||||
* | With mic's permission, adjust long call time info messages to 500ms from 200ms | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -2/+3 |
| | |||||
* | Added more performance checks to the HTTP server. Each request | Mic Bowman | 2011-01-05 | 1 | -1/+15 |
| | | | | | coming through the WebUtil fns has a request id in the header that can match the request to the actual work done by the service | ||||
* | Shooting in the dark for solutions to the appearance problem | Mic Bowman | 2010-12-20 | 1 | -2/+2 |
| | |||||
* | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 |
| | |||||
* | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -0/+4 |
|\ | |||||
| * | Support for CORS with simple requests in BaseHttpServer | Marck | 2010-11-02 | 1 | -0/+4 |
| | | |||||
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+2 |
|/ | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
* | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | |||||
* | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 1 | -1/+2 |
|\ | |||||
| * | * Partially complete stuff for Mesh support that Melanie wanted to see ↵ | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | ||||
* | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -5/+5 |
|/ | |||||
* | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -62/+59 |
| | |||||
* | Fix build break | Melanie | 2010-09-05 | 1 | -4/+0 |
| | |||||
* | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -57/+54 |
| | | | | on IDwellModule | ||||
* | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 1 | -0/+2 |
| | |||||
* | minor: Add some method doc to BaseHttpServer.HandleRequest() | Justin Clark-Casey (justincc) | 2010-08-30 | 1 | -2/+8 |
| | |||||
* | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -2/+7 |
| | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief. | ||||
* | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry | Melanie Thielker | 2010-08-25 | 1 | -2/+2 |
| | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless. | ||||
* | HACK ALERT! There's some underlying bug in the HTTP server that makes ↵ | Diva Canto | 2010-08-06 | 1 | -0/+7 |
| | | | | requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in. | ||||
* | comment out further debug line in BaseHttpServer | Justin Clark-Casey (justincc) | 2010-07-27 | 1 | -1/+1 |
| | |||||
* | do a whole load of crappy hacking to get cubes to display google.com | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -1/+1 |
| | | | | | | currently, for smoe reason the page only appears when you click a face. also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason you can still change the url and normal navigation will work again | ||||
* | Handle a specific exception without spewing red ink. | Melanie | 2010-07-08 | 1 | -2/+13 |
| | |||||
* | fix web request exception reporting properly this time | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | |||||
* | Revert "Report http server onRequest() exception properly." | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d. | ||||
* | Report http server onRequest() exception properly. | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | |||||
* | Better error message. | Diva Canto | 2010-04-26 | 1 | -1/+1 |
| | |||||
* | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -2/+0 |
| | | | | do this in callers so that we know who is setting up these things | ||||
* | put out full exception stack if something reaches top of base http server ↵ | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -1/+1 |
| | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit |