Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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 |
| | |||||
* | 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 | ||||
* | 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 |
| | |||||
* | 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 | ||||
* | minor logging changes to BaseHttpServer, OSHttpRequest | Justin Clark-Casey (justincc) | 2010-03-16 | 1 | -30/+46 |
| | |||||
* | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵ | Justin Clark-Casey (justincc) | 2010-03-11 | 1 | -4/+2 |
| | | | | the caller that the best match for an incoming request URI is invoked | ||||
* | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 1 | -1/+1 |
| | |||||
* | - commented out unused method ConvertIHttpClientContextToOSHttp | dr scofield (aka dirk husemann) | 2009-12-23 | 1 | -7/+7 |
| | |||||
* | Make sure that we catch and display any exceptions that get right to the top ↵ | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -46/+52 |
| | | | | of our incoming http request handling stack | ||||
* | minor: make logging messages consistent in BaseHttpServer | Justin Clark-Casey (justincc) | 2009-12-15 | 1 | -25/+25 |
| | |||||
* | * Fix line endings in BaseHttpServer.cs | Teravus Ovares (Dan Olivares) | 2009-12-05 | 1 | -6/+6 |
| | |||||
* | if an xml rpc method throws an exception, log as an error to the console as ↵ | Justin Clark-Casey (justincc) | 2009-12-03 | 1 | -3/+11 |
| | | | | well as returning the exception to the caller | ||||
* | Implemented a Watchdog class. Do not manually create Thread objects anymore, ↵ | John Hurliman | 2009-10-22 | 1 | -8/+0 |
| | | | | use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated | ||||
* | * Removed OpenSim.Data.NHibernate | John Hurliman | 2009-10-19 | 1 | -1/+1 |
| | | | | * Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing | ||||
* | Merge branch 'diva-textures-osgrid' | Melanie | 2009-10-04 | 1 | -1/+1 |
|\ | |||||
| * | * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵ | John Hurliman | 2009-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework) * Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization? | ||||
* | | Formatting cleanup. | Jeff Ames | 2009-10-01 | 1 | -11/+11 |
| | | |||||
* | | minor: replace xmlprc 'no method found' magic number with constant from ↵ | Justin Clark-Casey (justincc) | 2009-09-24 | 1 | -1/+5 |
| | | | | | | | | xmlrpc library | ||||
* | | Completely remove the prior implementation of the request event handling | Melanie | 2009-09-22 | 1 | -38/+40 |
| | | | | | | | | | | on poll handlers. Introduce a new delegate on the PollServiceEventArgs that allow access to the request headers and body. | ||||
* | | Remove support for executing a handler on poll. It caused other issues | Melanie | 2009-09-22 | 1 | -27/+11 |
| | | |||||
* | | Disable the handler execution for poll services until the ramifications | Melanie | 2009-09-22 | 1 | -3/+3 |
| | | | | | | | | can be studied | ||||
* | | Add the headers collection to the keysvals for HTT requests | Melanie | 2009-09-21 | 1 | -0/+1 |
| | | |||||
* | | Add X-PollServiceID pseudo-header to the request handling for polls | Melanie | 2009-09-21 | 1 | -1/+3 |
| | | |||||
* | | Make the poll service handler call the handler method on incoming requests. | Melanie | 2009-09-21 | 1 | -9/+30 |
|/ | |||||
* | * Another attempt at fixing the random spurious test error. | Teravus Ovares (Dan Olivares) | 2009-08-26 | 1 | -6/+13 |
| | | | | * This time it might be the listening socket thread from HttpServer aborting with a non blocking thread abort exception. Hopefully calling Stop() on MainServer.Instance will solve that. | ||||
* | change 535cb0efc so that the default LLSD serialization format is | dr scofield (aka dirk husemann) | 2009-08-12 | 1 | -2/+4 |
| | | | | | | | llsd+xml instead of llsd+json --- the latter seems to break existing bots. this assumes that those bots that want llsd+json will properly signal that desire, if that is not the case, we need to revisit this. fixes mantis #3977. | ||||
* | * FreeContext may be a bit too buggy for my tastes in some environments. * ↵ | Teravus Ovares (Dan Olivares) | 2009-08-08 | 1 | -7/+7 |
| | | | | Commenting it for the moment. | ||||
* | * Patch from jhurliman to add accept type recognition to determine the llsd ↵ | Teravus Ovares (Dan Olivares) | 2009-08-05 | 1 | -7/+67 |
| | | | | | | content format. *should allow both json and xml serializations of llsd to work properly. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
* | Add copyright header. Formatting cleanup. | Jeff Ames | 2009-08-01 | 1 | -1/+1 |
| | |||||
* | * Fixed another potential httpserver leak. | Teravus Ovares | 2009-07-30 | 1 | -1/+6 |
| | |||||
* | Add basic support ofr detached request handling to the HTTP server. | Melanie Thielker | 2009-07-29 | 1 | -1/+7 |
| | | | | | | Groundwork to finish HTTP IN. | ||||
* | * An attempt to fix mantis #3955 | Teravus Ovares | 2009-07-29 | 1 | -2/+2 |
| | | | | | * It's possible it could re-cause mantis #3953, but the FreeContext isn't always necessary because Connection: close ---> Disconnect(SocketError.Success) { FreeContext(); } | ||||
* | * An attempt to fix mantis #3953 | Teravus Ovares | 2009-07-29 | 1 | -1/+12 |
| | |||||
* | * Adds the ability to have a thread efficient long poll service (such as the ↵ | Teravus Ovares | 2009-07-29 | 1 | -5/+90 |
| | | | | | | | | | eventqueue) * If this doesn't melt the Http Server, this will significantly reduce the number of threads in use on regions with many users. * Adds AddPollServiceHTTPHandler, and RemovePollServiceHTTPHandler to BaseHttpServer * Generic enough to be used for many long poll services, not only the EventQueue. | ||||
* | * Updated C# WebServer to the latest available source download (r19869) and ↵ | Teravus Ovares | 2009-07-21 | 1 | -5/+14 |
| | | | | | | | | | | applied a few mods from the old version (now up on opensim-libs (VS 3.5 project). * Made various changes to BaseHttpServer to accommodate the new interfaces. * This version has been significantly re-architected and may fail in unusual and insidious ways. * Please pay attention to any errors you get and post a Mantis if you can reproduce an issue with the HTTPServer. I'm including the pdb and having the http server compiled in debug for a few weeks so that when an error occurs, it'll print the pertenant data. * Once again, this is the full C# WebServer, not the lite branch that is included in LibOMV (we need SSL!) | ||||
* | Applied patch from Mantis #3736 , which should stop the userserver crashing ↵ | MW | 2009-06-18 | 1 | -1/+2 |
| | | | | when a SL viewer version 1.23 logs in. Thanks StrawberryFride | ||||
* | Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵ | Jeff Ames | 2009-06-01 | 1 | -1/+1 |
| | | | | LICENSE.txt. | ||||
* | Added option (on my default) to the clone avatar function so that the ↵ | MW | 2009-05-30 | 1 | -1/+9 |
| | | | | | | | clothes and attachments that the target avatar is wearing, to begin with, are removed. So the end result isn't a merger of those clothes/attachments and the ones the template avatar is wearing. Added IPAddress ListenIPAddress property to BaseHttpServer so that the listening/binding IP can be set. |