Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -2/+2 |
|\ | |||||
| * | 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 |
| |\ | |||||
| * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -5/+5 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -62/+59 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -62/+59 |
| | | |||||
| * | Fix build break | Melanie | 2010-09-05 | 1 | -4/+0 |
| | | |||||
* | | Revert "Workaround for mono bug #312968" | Melanie Thielker | 2010-09-06 | 1 | -1/+0 |
| | | | | | | | | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead. | ||||
* | | Workaround for mono bug #312968 | Melanie Thielker | 2010-09-06 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | 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 |
| | | |||||
* | | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -58/+51 |
| | | | | | | | | on IDwellModule | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -2/+8 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | 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 the synchronousrestformsrequester so it will successfully handle a ↵ | Tom Grimshaw | 2010-07-10 | 1 | -1/+1 |
| | | | | | | | | response from a server which does not provide a valid content length header | ||||
* | | Fix an issue where the SynchronousRestObjectRequester will fail if a ↵ | Tom Grimshaw | 2010-07-10 | 1 | -1/+1 |
| | | | | | | | | webserver does not report a content length (-1), but the content is still valid | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-08 | 1 | -2/+13 |
|\ \ | |/ | |||||
| * | Handle a specific exception without spewing red ink. | Melanie | 2010-07-08 | 1 | -2/+13 |
| | | |||||
* | | Correct positioning of timeout modifier in the SynchronousRestObjectRequester | Tom Grimshaw | 2010-07-04 | 1 | -1/+1 |
| | | |||||
* | | Implement a timeout value in the SynchronousRestObjectRequester. Default is ↵ | Tom Grimshaw | 2010-07-03 | 1 | -1/+16 |
|/ | | | | 100 seconds. | ||||
* | 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 | ||||
* | minor logging changes to BaseHttpServer, OSHttpRequest | Justin Clark-Casey (justincc) | 2010-03-16 | 2 | -30/+58 |
| | |||||
* | minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell ↵ | Justin Clark-Casey (justincc) | 2010-03-11 | 2 | -5/+7 |
| | | | | the caller that the best match for an incoming request URI is invoked | ||||
* | very minor spacing adjustment | Justin Clark-Casey (justincc) | 2010-03-11 | 1 | -1/+0 |
| | |||||
* | 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 |
| |