Commit Graph

71 Commits (839fe0fa1231d8edcaeb96cb32937fb9498f2d44)

Author SHA1 Message Date
Kitty Barnett 839fe0fa12 Merged with default tip (Revision ffde74743e89)
--HG--
branch : RLVa
2015-05-09 00:53:24 +02: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
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
Kitty Barnett c4d557d529 Merged with default tip (Revision aeab2661776f)
--HG--
branch : RLVa
2014-10-29 21:45:12 +02:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04: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
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
Kitty Barnett fd7e737a9b Merged with default tip (Revision 4798c4f76be3)
--HG--
branch : RLVa
2013-11-06 13:46:33 +00: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
Kitty Barnett 10a289598b Merged with default tip (Revision 74cc289067c8)
--HG--
branch : RLVa
2013-07-21 22:33:04 +02: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
Kitty Barnett 9177903931 Merged with Appearance-MixedViewers tip
--HG--
branch : .RLVa
2013-04-29 15:39:42 +02: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
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
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
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
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Aimee Linden 81f5c02414 EXT-7498 WIP Snapshot Sharing
Reviewed by Tofu.
2010-06-28 16:30:08 +01:00
Lynx Linden fbc95fe7e7 EXT-7855 FIXED Memory leak in llmessage/llhttpclient.cpp
We now free the fileBuffer when we're done in VFileInjector::process_impl()
2010-06-14 17:29:22 +01:00
Roxie Linden 2fd59393fc Automated Merge 2010-05-10 15:25:49 -07:00
James Cook 9d23a40c85 DEV-49633 WIP LLHTTPClient calls responders with headers _before_ body 2010-05-04 11:42:17 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxanne Skelly e65b6d9695 DEV-34822
svn merge -c120157 svn+ssh://svn.lindenlab.com/svn/linden/branches/giab-viewer/giab-viewer-2
2009-07-09 21:45:04 +00:00
Don Kjer 76d05a7e50 svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk
QAR-1863: Merge 525 changes from 1.27 -> 1.30 -> trunk

1.27 Changes:
* QAR-1721: Vivox Recurring Billing (ViRB)
* QAR-1743: 525 AO Classifieds
* DEV-37701: Fix cleanup_indra nightly script so that it doesn't fail, and so that we know if it does
* DEV-37926 - Fairmarket key roll 8/12/2009
* QAR-1744: 525 Landstore
* QAR-1797: disable web services for find_people
* QAR-1758: OpenID and Backup/recovery.
* QAR-1794: ViRB proc fix - proc/recurring_billing/GetLocaleCountryByPackageId.php
* Changing parameter name so the module signal could be used properly in the function below
* QAR-1808 : Self-Reported First Name and Self-Reported Last Name have duplicate entries in the registration table
* DEV-30204 : Moved the registration table from sequence to indra_aux.
* removed dungeon from banned keyword list
* DEV-30204 : Moved the registration table from sequence to indra_aux.  Reviewed by kelly, cg, jarv
* Merging new streambase dwell nightly to server-1.27
* Add update_parcel_dwell.py to serial_maintenance rule in the nightly.make Makefile, removing the dwell rule, since we don't want it running in parallel with other expensive nightly scripts.

1.30 Changes:
* DEV-27476: version-manager only works in Firefox
* DEV-27472: version-manager appears to load javascript from third party site.
* mulib r92 that supports If-Modified-Since header and prevents arbitrary
  filesystem access through host:12107/manager/mochi/..
* Trivial conductor change that prevents a traceback when no regions are
  available to start.
* Fixing "Out of Connections" error when running tests via SCUT
* DEV-37554 - farm_deploy should get its ssh timeout from farm.ini
* undo two lines of debugging changes that accidentally were checked in to farm
* Adding MochiKit to MANIFEST for version-manager.
* revised files for new parcel dwell process
* Changing vault from an 'http' svn extern to a 'svn+ssh' svn extern.
* DEV-38504 RPS map item queries are too verbose
* added --skip-grid-mode-prompt to main in farm
* DEV-38607: Region Presence Service includes disabled regions in estate responses, resulting in high slave query rate.
* DEV-34781 - enable use_space_server_for_map_items and set map_item_request throttle settings in simulator.xml
* DEV-38351 changes to ip_blacklist.xml file never get automatically picked up by the simulator
* DEV-35443 Region border crossing issues.
* DEV-35443 revert overzealous validity checking on neighbor messages.
* DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix
* QAR-1822 CPU Overrides update to indra.xml
* DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix
* DEV-34026 Update LLAgentInfo::forwardViewerStats() to make all viewer statistics
* DEV-38906 Teleport throttle blocks prematurely when agent teleports back and forth between 2 regions
* DEV-38861 Intra-region TP is blocked by inter-region TP throttl
* DEV-38504 RPS map item queries are too verbose
* initial import of deploy_to_dev_grid.sh
2009-09-04 02:27:28 +00:00
Aaron Brashears 6df2755ba6 Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462 2009-05-18 23:38:35 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Dave Simmons 24b26d71ee svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
2009-03-20 20:00:47 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Christian Goetze a86aa7d8b0 QAR-963 svn merge -r101685:101752 svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge 2008-11-18 21:20:05 +00:00
Brian McGroarty 72f2542fb9 DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will be replaced later with final code, but we need to unblock release 2008-10-17 17:48:05 +00:00
Aaron Brashears 66739da164 Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824 2008-09-29 17:41:54 +00:00
Kelly Washington 2336b76f0d merge -r94900 linden/branches/kelly/qar-825 to linden/release
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
2008-08-26 17:15:20 +00:00
Dave Hiller 9a7d68cfce svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00