aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-073-1/+1140
|\
| * * Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows...teravus2013-02-072-1/+11
| |\
| * | This is the final commit that enables the Websocket handlerteravus2013-02-072-2/+1095
| * | We're not really done here.. but we're getting there. Socket Read is work...teravus2013-02-051-1/+37
* | | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ \ | | |/ | |/|
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| |/
* | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\ \ | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-232-5/+15
| |\
| * | Add additional return statusBlueWall2013-01-232-4/+23
* | | Merge branch 'master' into careminsterMelanie2013-01-192-4/+14
|\ \ \ | | |/ | |/|
| * | Explicitly stop PollServiceRequestManager() rather than relying on its destru...Justin Clark-Casey (justincc)2013-01-192-5/+15
| |/
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-164-0/+294
|\ \ | |/
| * Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-154-0/+294
* | Merge branch 'master' into careminsterMelanie2012-12-071-1/+1
|\ \ | |/
| * In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather tha...Justin Clark-Casey (justincc)2012-12-051-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-251-53/+0
|\ \ | |/
| * Delete unused BaseHttpServer.HandleAgentRequest()Justin Clark-Casey (justincc)2012-11-231-53/+0
* | Merge branch 'master' into careminsterMelanie2012-11-201-2/+5
|\ \ | |/
| * minor: If logging full incoming HTTP data, don't deceptively print ... at the...Justin Clark-Casey (justincc)2012-11-201-2/+5
* | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminsterMelanie2012-11-201-1/+2
|\ \
| * | * Prep work switching the GetMeshModule over to a poll service.teravus2012-11-091-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ \ | | |/ | |/|
| * | A few more AssemblyInfos in a few more dlls.Diva Canto2012-11-141-0/+33
* | | Merge branch 'master' into careminsterMelanie2012-10-231-9/+3
|\ \ \ | |/ /
| * | minor: Get content type handler logger to log "unset" for the content type in...Justin Clark-Casey (justincc)2012-10-231-1/+1
| * | minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data wh...Justin Clark-Casey (justincc)2012-10-231-8/+2
| * | If we're avoiding printing a long request warning for a GetTexture CAP call, ...Justin Clark-Casey (justincc)2012-10-181-1/+1
| * | Allow setting max connections for an endpointMelanie2012-09-301-1/+1
| * | Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-303-4/+0
| * | Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-303-0/+4
* | | Merge branch 'master' into careminsterMelanie2012-09-291-3/+3
|\ \ \ | |/ /
| * | Fix bug where debug http level 6 could not be specified. Also converts newli...Justin Clark-Casey (justincc)2012-09-291-3/+3
* | | Merge branch 'avination' into careminsterMelanie2012-09-273-38/+38
|\ \ \ | | |/ | |/|
| * | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| * | just remove the damm thingUbitUmarov2012-09-263-25/+3
| * | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-262-3/+10
| * | keep watchdog happy using it to kill his threadsUbitUmarov2012-09-261-9/+1
| * | more changes to PollServiceUbitUmarov2012-09-262-24/+18
| * | Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-231-7/+38
| * | Catch a nullref in the code to suppress GetTexture warnign spam we can'tMelanie2012-09-161-1/+1
| * | Sequence/throttle asset retrievals.Melanie2012-09-141-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-09-242-106/+146
|\ \ \ | | |/ | |/|
| * | Make BaseHttpServer throws say something useful.Diva Canto2012-09-221-2/+2
| * | Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-212-84/+84
| * | Add request number counting to incoming HTTP requests in the same way that th...Justin Clark-Casey (justincc)2012-09-211-18/+41
| * | Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ...Justin Clark-Casey (justincc)2012-09-201-15/+32
| * | Add ability to turn on/off logging of outgoing HTTP requests flowing through ...Justin Clark-Casey (justincc)2012-09-201-5/+5
* | | Merge branch 'avination' into careminsterMelanie2012-09-163-18/+37
|\ \ \ | | |/ | |/|
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-143-17/+36
| * | Allow setting max connections for an endpointMelanie2012-09-141-1/+1