Commit Graph

90 Commits (19c9bbae355dcacbbcd78eebd6604dfd83006a73)

Author SHA1 Message Date
Ansariel ebf54d4b2d Merge with Viewer-VMM 2015-07-15 14:23:19 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Merov Linden d631f2fd4d Pull merge from lindenlab/viewer-tools-update (includes viewer-release) 2015-04-14 13:46:01 -07:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Merov Linden 8952e81775 Merge lindenlab/viewer-tools-update 2015-04-09 16:51:02 -07:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Merov Linden 9c792f03b4 Pull merge from lindenlab/viewer-release 2014-06-17 09:50:48 -07:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Merov Linden c780f730fe DD-92 : pull merge lindenlab/sunshine-external to get AISv3 work 2014-05-30 15:29:27 -07:00
Merov Linden 68b62747ed Pull merge from lindenlab/viewer-release 2014-05-30 14:19:53 -07:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Merov Linden d24ff0bf0a DD-22 : WIP : Implement putRaw() on LLHTTPClient 2014-05-05 15:58:15 -07:00
Stinson Linden 582c10cc47 MAINT-4009: Ensuring to delete array data with the array delete in the RawInjector destructor. 2014-04-25 23:30:53 +01:00
Ansariel 3659e91bbb Fix attribution for 55799d8f7b99, cf9e0847adcc and 8882db725f44 that were originally done by Drake Arconis (Sovereign Engineer) 2014-08-29 08:42:14 +02:00
Ansariel 1477167584 Fix mem leak in RawInjector; found by Cinder Roxley 2014-08-26 20:37:31 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Don Kjer 7866356d77 Merge viewer-release => sunshine-internal 2013-10-29 13:20:18 +00:00
Techwolf Lupindo 1e0069b88d Fix bug exposed by GCC 4.7.
Some compilers will happly convert time_t to a bool, therefore time_t if_modified_since gets passed as bool follow_redirects
instead of time_t if_modified_since.
Result of this bug is all files are download with each startup of the client, causing increased server load.
2014-01-03 01:39:09 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Don Kjer a85fa3b10a Adding support for COPY methods to httpclient. Implementing viewer-side use of AISv3 COPY library folder operation. (SH-4304) 2013-07-11 15:15:04 -07:00
Merov Linden 7da4c65191 Pull merge from lindenlab/viewer-release 2013-06-19 14:06:06 -07:00
Brad Payne (Vir Linden) 6c56c77ec5 SH-4027 WIP - initial implementation of item update via AIS. 2013-05-24 08:53:21 -04:00
Don Kjer 3a351c4ee5 Adding follow_redirects parameter to LLHTTPClient get/head variants. Not following redirects for facebook connect requests. 2013-05-08 05:51:28 +00:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Don Kjer beeefb4526 Renaming HTTP_HEADER_* into HTTP_IN_HEADER_* and HTTP_OUT_HEADER_* to make it more clear which header strings should be used for incoming vs outgoing situations.
Using constants for commonly used llhttpnode context strings.
2013-04-04 21:50:45 +00:00
Don Kjer 6232fdbbf3 Merging sunshine-stable -> sunshine-internal 2013-03-13 19:26:18 +00:00
Don Kjer f945415210 Large changes to the LLCurl::Responder API, as well as pulling in some changes to common libraries from the server codebase:
* Additional error checking in http handlers.
* Uniform log spam for http errors.
* Switch to using constants for http heads and status codes.
* Fixed bugs in incorrectly checking if parsing LLSD xml resulted in an error.
* Reduced spam regarding LLSD parsing errors in the default completedRaw http handler.  It should not longer be necessary to short-circuit completedRaw to avoid spam.
* Ported over a few bug fixes from the server code.
* Switch mode http status codes to use S32 instead of U32.
* Ported LLSD::asStringRef from server code; avoids copying strings all over the place.
* Ported server change to LLSD::asBinary; this always returns a reference now instead of copying the entire binary blob.
* Ported server pretty notation format (and pretty binary format) to llsd serialization.

* The new LLCurl::Responder API no longer has two error handlers to choose from.  Overriding the following methods have been deprecated:
** error - use httpFailure
** errorWithContent - use httpFailure
** result - use httpSuccess
** completed - use httpCompleted
** completedHeader - no longer necessary; call getResponseHeaders() from a completion method to obtain these headers.

* In order to 'catch' a completed http request, override one of these methods:
** httpSuccess - Called for any 2xx status code.
** httpFailure - Called for any non-2xx status code.
** httpComplete - Called for all status codes.  Default implementation is to call either httpSuccess or httpFailure.
* It is recommended to keep these methods protected/private in order to avoid triggering of these methods without using a 'push' method (see below).

* Uniform error handling should followed whenever possible by calling a variant of this during httpFailure:
** llwarns << dumpResponse() << llendl;
* Be sure to include LOG_CLASS(your_class_name) in your class in order for the log entry to give more context.

* In order to 'push' a result into the responder, you should no longer call error, errorWithContent, result, or completed.
* Nor should you directly call httpSuccess/Failure/Completed (unless passing a message up to a parent class).
* Instead, you can set the internal content of a responder and trigger a corresponding method using the following methods:
** successResult - Sets results and calls httpSuccess
** failureResult - Sets results and calls httpFailure
** completedResult - Sets results and calls httpCompleted

* To obtain information about a the response from a reponder method, use the following getters:
** getStatus - HTTP status code
** getReason - Reason string
** getContent - Content (Parsed body LLSD)
** getResponseHeaders - Response Headers (LLSD map)
** getHTTPMethod - HTTP method of the request
** getURL - URL of the request

* It is still possible to override completeRaw if you want to manipulate data directly out of LLPumpIO.

* See indra/llmessage/llcurl.h for more information.
2013-03-13 06:26:25 +00:00
Brad Payne (Vir Linden) 45838b8b07 fix for build failure 2013-03-13 11:19:21 -04:00
Don Kjer 7405554290 Fixed potential memory leak in LLHTTPClient. Fixed potential hanging http requests in LLHTTPClient. Fixed munging of "Pragma" headers in LLHTTPClientAdapter 2013-03-13 08:49:26 +00:00
Tank_Master 33922af1fa Merge LL release 2013-11-01 19:52:14 -07:00
Tank_Master 0a1a351b86 Merge Viewer-Share 2013-10-21 23:51:34 -07:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Tank_Master 23bc05082a Backed out changeset: 519f1f0aa02f - prep for merge with LL 2013-05-15 16:23:09 -07:00
Kitty Barnett 9177903931 Merged with Appearance-MixedViewers tip
--HG--
branch : .RLVa
2013-04-29 15:39:42 +02:00
Tank_Master f1ebde1820 Merge SSA push 5 (part 2, post CHUI stuff) 2013-03-20 17:19:19 -07:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Richard Linden 2ed1de224a Automated merge with http://hg.secondlife.com/viewer-development 2012-02-06 15:28:45 -08:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Xiaohong Bao f082de03ff fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory crashes. 2012-01-12 16:36:56 -07:00
Xiaohong Bao beff8c323e fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory crashes. 2012-01-12 16:36:56 -07:00
Logan Dethrow 792667ff8e STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to curl handles.
Added call to that function everywhere curl handles are created in the viewer.
2011-07-19 14:20:21 -04:00
Tank_Master 205747903f Reintroduce Socks5 support with latest LL code from v-dev (Work done by Log Linden) 2011-09-03 00:49:31 -07:00
Arrehn df2d7a0c6d Base opensim compatibility, by Armwin W/Kokua, used by permission 2011-08-21 23:45:18 -04:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00