Commit Graph

80 Commits (12e50e1fccef153e230f7fe91c1cedbc4e718d53)

Author SHA1 Message Date
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Brad Payne (Vir Linden) d4dc41dbd5 misc error detection, debug coloration for avatar meshes 2012-11-01 14:19:00 -04:00
simon@Simon-PC.lindenlab.com 58a73b4fc1 MAINT-1791 : Parcel media clear list crash. Reviewed by Kelly 2012-10-29 13:10:37 -07:00
Tank_Master 93d4b47252 Merge LL 3.4.1 beta 10 2012-10-26 09:59:19 -07:00
Dave Parks 5ec24ecd69 reapply a577ec5b3e5f: Fix for linux build (skip llhttpclient unit tests that post to google.com) 2012-09-20 10:13:45 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks 1d8f117069 Fix for linux build (skip llhttpclient unit tests that post to google.com) 2012-06-27 14:45:50 -05:00
Tank_Master 999bd2130e Merge LL 3.4.0 release 2012-09-13 15:19:30 -07:00
Tank_Master d9c7b9253d merge LL 3.4.0 viewer-beta 2012-08-31 00:18:30 -07:00
Xiaohong Bao 25c21c3761 add more exception handlings for llcurl fix. 2012-01-17 22:56:28 -07: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 94ad019ce3 fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
reviewed by vir
2012-01-04 14:14:23 -07:00
Ansariel b8de6ee1a5 Removing additional validation check in llurlrequest.cpp - it's checked in isValid() already 2012-01-22 14:35:55 +01:00
Ansariel 309f9dcfd1 add more exception handlings for llcurl fix. By Bao Linden 2012-01-22 14:30:04 +01:00
ziree f391ec3678 Fix crashes when curl runs out of handles. Proposed fix for FIRE-4772 FIRE-4773 2012-01-20 22:00:56 +01: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
Xiaohong Bao 0fff00ad6c fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
reviewed by vir
2012-01-04 14:14:23 -07:00
Liny 3bd5a8ddfc Quieting a sometimes noizy debug line. (Changed them into their "_ONCE" version to prevent spamming of the debug log) 2012-01-03 12:18:24 -08:00
Xiaohong Bao b4766d2fde fix for sh-2601: [crashhunters] crash in LLBufferArray::countAfter()
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
2011-11-21 14:42:21 -07:00
Dave Parks c0ca8e5e2e Merge backout of b782a75c99e6 2011-10-14 11:58:35 -05:00
Dave Parks 4331c112ab Backed out changeset b782a75c99e6 2011-10-14 11:52:40 -05:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Logan Dethrow 797b4df42a Backed out changeset 694594710de2 2011-08-16 17:35:16 -04:00
Logan Dethrow 61a7a874aa Backed out rev 42d5f5df0a6a. Code was apparently needed afterall. 2011-08-15 20:05:28 -04:00
Logan Dethrow 3743ec176c LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was already being called. 2011-08-15 13:21:33 -04:00
Logan Dethrow 814a2d24dc Merge 2011-07-28 10:41:59 -04:00
Dave Parks 764a13a196 SH-2031 Don't do network I/O from the main thread in llcurl.
Reviewed by Kelly
2011-07-21 17:35:04 -05:00
Logan Dethrow 859dc52c30 STORM-1112 Protected LLProxy members during cross-thread calls to LLProxy::applyProxySettings() 2011-07-21 15:16:54 -04: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
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Aaron Stone e6c0615b97 VWR-25376 Enable compression for GET and POST for Inventory and other capabilities. 2011-04-01 16:36:00 -07:00
Aleric Inglewood ef490e308c Introduces a LLThreadLocalData class that can be
accessed through the static LLThread::tldata().
Currently this object contains two (public) thread-local
objects: a LLAPRRootPool and a LLVolatileAPRPool.

The first is the general memory pool used by this thread
(and this thread alone), while the second is intended
for short lived memory allocations (needed for APR).
The advantages of not mixing those two is that the latter
is used most frequently, and as a result of it's nature
can be destroyed and reconstructed on a "regular" basis.

This patch adds LLAPRPool (completely replacing the old one),
which is a wrapper around apr_pool_t* and has complete
thread-safity checking.

Whenever an apr call requires memory for some resource,
a memory pool in the form of an LLAPRPool object can
be created with the same life-time as this resource;
assuring clean up of the memory no sooner, but also
not much later than the life-time of the resource
that needs the memory.

Many, many function calls and constructors had the
pool parameter simply removed (it is no longer the
concern of the developer, if you don't write code
that actually does an libapr call then you are no
longer bothered with memory pools at all).

However, I kept the notion of short-lived and
long-lived allocations alive (see my remark in
the jira here: https://jira.secondlife.com/browse/STORM-864?focusedCommentId=235356&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-235356
which requires that the LLAPRFile API needs
to allow the user to specify how long they
think a file will stay open. By choosing
'short_lived' as default for the constructor
that immediately opens a file, the number of
instances where this needs to be specified is
drastically reduced however (obviously, any
automatic LLAPRFile is short lived).

***

Addressed Boroondas remarks in https://codereview.secondlife.com/r/99/
regarding (doxygen) comments. This patch effectively only changes comments.

Includes some 'merge' stuff that ended up in llvocache.cpp
(while starting as a bug fix, now only resulting in a cleanup).

***

Added comment 'The use of apr_pool_t is OK here'.

Added this comment on every line where apr_pool_t
is correctly being used.

This should make it easier to spot (future) errors
where someone started to use apr_pool_t; you can
just grep all sources for 'apr_pool_t' and immediately
see where it's being used while LLAPRPool should
have been used.

Note that merging this patch is very easy:
If there are no other uses of apr_pool_t in the code
(one grep) and it compiles, then it will work.

***

Second Merge (needed to remove 'delete mCreationMutex'
from LLImageDecodeThread::~LLImageDecodeThread).

***

Added back #include <apr_pools.h>.

Apparently that is needed on libapr version 1.2.8.,
the version used by Linden Lab, for calls to
apr_queue_*. This is a bug in libapr (we also
include <apr_queue.h>, that is fixed in (at least) 1.3.7.

Note that 1.2.8 is VERY old. Even 1.3.x is old.

***

License fixes (GPL -> LGPL). And typo in comments.
Addresses merov's comments on the review board.

***

Added Merov's compile fixes for windows.
2011-02-05 15:58:07 +01:00
Xiaohong Bao 0979757c35 fix for sh-2601: [crashhunters] crash in LLBufferArray::countAfter()
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
2011-11-21 14:42:21 -07: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 8d9fba43b9 Firestorm merge catchup 2011-08-27 06:00:46 -04:00
Arrehn df2d7a0c6d Base opensim compatibility, by Armwin W/Kokua, used by permission 2011-08-21 23:45:18 -04:00
Tank_Master 50ce82a67d Enable CURLOPT_ENCODING for Inventory caps, which uses the LLURLRequest code path 2011-04-09 23:55:04 -07: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
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
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Nat Goodspeed df7e5dd1dc DEV-35248: Allow NoVerifySSLCert to uniformly disable verification
Introduce static LLCurl SSL verification flag, default 'true', accessed by
LLCurl::setSSLVerify() and getSSLVerify().
Make LLCurl::Easy::prepRequest() check LLCurl::getSSLVerify() instead of
unconditionally setting CURLOPT_SSL_VERIFYPEER 'true'. Also set
CURLOPT_SSL_VERIFYHOST to match.
Make LLXMLRPCTransaction::Impl::init() examine LLCurl::getSSLVerify(), instead
of directly examining gSavedSettings.getBOOL("NoVerifySSLCert").
Make LLURLRequest::checkRootCertificate() set CURLOPT_SSL_VERIFYHOST as well
as CURLOPT_SSL_VERIFYPEER.
Make request() in llhttpclient.cpp (used by LLHTTPClient::getByteRange(),
head(), get(), getHeaderOnly(), put(), post(), postRaw(), postFile(), del(),
move()) pass LLCurl::getSSLVerify() to checkRootCertificate(), rather than
constant 'true'.
Make LLAppViewer::mainLoop() call
    LLCurl::setSSLVerify(! gSavedSettings.getBOOL("NoVerifySSLCert"))
at the same time it calls LLCurl::setCAFile(), a comparable bit of static
setup.
2010-01-20 15:48:13 -05:00