aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-111-1/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2011-09-301-1/+1
| | | | | | | | | | | | allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
* | 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 ↵Justin Clark-Casey (justincc)2011-08-221-11/+6
| | | | | | | | BaseHttpServer.RemoveLLSDHandler()
| * 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 ↵Diva Canto2011-06-121-2/+2
| | | | | | | | some issues with the zoom level -- TBD.
* | Some additional protection, it seems that responsedata needs to be locked, ↵Tom2011-05-261-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 ↵Tom2011-05-171-4/+18
|/ | | | friendly 500 error instead of crashing out with a null reference and letting the connection hang
* Adding ssl supportBlueWall2011-05-051-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-201-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.
* 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
| | | | | 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 #5386Diva Canto2011-02-161-1/+13
|
* Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-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 200msJustin Clark-Casey (justincc)2011-01-191-2/+3
|
* Added more performance checks to the HTTP server. Each requestMic Bowman2011-01-051-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
* 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
|/ | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
* * 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 ↵Teravus Ovares (Dan Olivares)2010-10-141-1/+2
| | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either.
* | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-5/+5
|/
* Formatting cleanup.Jeff Ames2010-09-121-62/+59
|
* Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-031-0/+2
|
* minor: Add some method doc to BaseHttpServer.HandleRequest()Justin Clark-Casey (justincc)2010-08-301-2/+8
|
* HACK ALERT! There's some underlying bug in the HTTP server that makes ↵Diva Canto2010-08-061-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 BaseHttpServerJustin Clark-Casey (justincc)2010-07-271-1/+1
|
* do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)2010-07-261-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
* fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
|
* Revert "Report http server onRequest() exception properly."Justin Clark-Casey (justincc)2010-06-251-1/+1
| | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d.
* Report http server onRequest() exception properly.Justin Clark-Casey (justincc)2010-06-251-1/+1
|
* minor: Print out port that http servers are usingJustin Clark-Casey (justincc)2010-03-251-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-251-1/+1
| | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
* minor logging changes to BaseHttpServer, OSHttpRequestJustin Clark-Casey (justincc)2010-03-161-30/+46
|
* minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵Justin Clark-Casey (justincc)2010-03-111-4/+2
| | | | the caller that the best match for an incoming request URI is invoked
* Formatting cleanup. Add copyright headers.Jeff Ames2010-01-041-1/+1
|
* - commented out unused method ConvertIHttpClientContextToOSHttpdr scofield (aka dirk husemann)2009-12-231-7/+7
|
* Make sure that we catch and display any exceptions that get right to the top ↵Justin Clark-Casey (justincc)2009-12-151-46/+52
| | | | of our incoming http request handling stack
* minor: make logging messages consistent in BaseHttpServerJustin Clark-Casey (justincc)2009-12-151-25/+25
|
* * Fix line endings in BaseHttpServer.csTeravus Ovares (Dan Olivares)2009-12-051-6/+6
|
generated by cgit v1.1 at 2024-12-27 01:13:51 +0000