aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-2/+3
|\
| * With mic's permission, adjust long call time info messages to 500ms from 200msJustin Clark-Casey (justincc)2011-01-191-2/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-061-1/+15
|\ \ | |/
| * 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-2/+2
|\ \ | |/
| * Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-201-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-1/+1
|\ \ | |/
| * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-2/+2
|\ \ | |/
| * Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-0/+4
| |\
* | | add more detail to the log in case of FORM Timeoutsacha2010-12-041-1/+1
| | | | | | | | | | | | cause nothing relevant are in the services logs
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-0/+4
|\ \ \ | | |/ | |/|
| * | Support for CORS with simple requests in BaseHttpServerMarck2010-11-021-0/+4
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-2/+2
|\ \ \ | |/ /
| * | 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
| |\
| * | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-5/+5
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-2/+2
|\ \ \
| * | | * remove some spurious debug infoJonathan Freedman2010-10-201-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 lyfeJonathan Freedman2010-10-201-5/+5
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-161-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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-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 Ames2010-09-121-62/+59
| |
| * Fix build breakMelanie2010-09-051-4/+0
| |
* | Revert "Workaround for mono bug #312968"Melanie Thielker2010-09-061-1/+0
| | | | | | | | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead.
* | Workaround for mono bug #312968Melanie Thielker2010-09-061-0/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-0/+2
|\ \ | |/
| * Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-051-57/+54
| | | | | | | | on IDwellModule
| * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-031-0/+2
| |
* | Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-051-58/+51
| | | | | | | | on IDwellModule
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-2/+8
|\ \ | |/
| * minor: Add some method doc to BaseHttpServer.HandleRequest()Justin Clark-Casey (justincc)2010-08-301-2/+8
| |
| * Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-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 carryMelanie Thielker2010-08-251-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. AfterMelanie Thielker2010-08-251-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 carryMelanie Thielker2010-08-251-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-refactorMelanie2010-08-071-0/+7
|\ \ | |/
| * 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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-061-1/+1
|\ \ | |/
| * 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 the synchronousrestformsrequester so it will successfully handle a ↵Tom Grimshaw2010-07-101-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 Grimshaw2010-07-101-1/+1
| | | | | | | | webserver does not report a content length (-1), but the content is still valid
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-081-2/+13
|\ \ | |/
| * Handle a specific exception without spewing red ink.Melanie2010-07-081-2/+13
| |
* | Correct positioning of timeout modifier in the SynchronousRestObjectRequesterTom Grimshaw2010-07-041-1/+1
| |
* | Implement a timeout value in the SynchronousRestObjectRequester. Default is ↵Tom Grimshaw2010-07-031-1/+16
|/ | | | 100 seconds.
* fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
|