- Jan 04, 2012
-
-
Xiaohong Bao authored
fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers reviewed by vir
-
- Nov 21, 2011
-
-
Xiaohong Bao authored
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
-
- Oct 14, 2011
-
-
David Parks authored
-
- Aug 16, 2011
-
-
Logan Dethrow authored
-
- Aug 15, 2011
-
-
Logan Dethrow authored
-
Logan Dethrow authored
-
- Jul 21, 2011
-
-
David Parks authored
Reviewed by Kelly
-
Logan Dethrow authored
-
- Jul 19, 2011
-
-
Logan Dethrow authored
Added call to that function everywhere curl handles are created in the viewer.
-
- Apr 01, 2011
-
-
Aaron Stone authored
-
- Feb 05, 2011
-
-
Aleric Inglewood authored
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.
-
- Sep 21, 2010
-
-
Brad Payne (Vir Linden) authored
-
- Aug 24, 2010
-
-
Tofu Linden authored
back-out the back-out for this branch. yay.
-
Tofu Linden authored
Backing out this merge that I pushed (prematurely) to the wrong place.
-
- Aug 13, 2010
-
-
Oz Linden authored
-
- Jun 28, 2010
-
-
Aimee Linden authored
Reviewed by Tofu.
-
Aimee Linden authored
Reviewed by Tofu.
-
- Apr 07, 2010
-
-
Roxie Linden authored
-
Tofu Linden authored
-
- Feb 02, 2010
-
-
Mark Palange (Mani) authored
-
- Jan 20, 2010
-
-
Nat Goodspeed authored
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.
-
- Jul 09, 2009
-
-
Roxanne Skelly authored
svn merge -c120157 svn+ssh://svn.lindenlab.com/svn/linden/branches/giab-viewer/giab-viewer-2
-
- Jun 30, 2009
-
-
svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze authored
QAR-1654 merge completed.
-
- May 18, 2009
-
-
Aaron Brashears authored
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
-
- Feb 18, 2009
-
-
Brad Kittenbrink authored
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
-
- Feb 06, 2009
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25Robert Knop authored
Merge server 1.25 back to trunk Conflicts: C indra/llcommon/llversionserver.h : svn reverted C indra/tools/bill/MoneyMachine.pm : one conflict, only difference was a blank line. C indra/newsim/lllslmanager.cpp : kept merge-right, in consultation C indra/newsim/lllslmanager.h : with babbage C indra/newsim/llagentinfo.cpp : (runNested, not runSpecial) C indra/test/test_entity_query.py : Kept merge-right C indra/test/test_agent_linden_dollar.py : Kept merge-right --> Kartic fixed these testes in server-1.25 C indra/test/template/httpd.tmpl : Kept merge-right (the IfModule version)
-
- Jan 07, 2009
-
-
Aaron Brashears authored
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
-
- Oct 07, 2008
-
-
Mark Palange authored
merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes) merge to trunk (for real)
-
Mark Palange authored
-
Mark Palange authored
-
- Sep 16, 2008
-
-
Kartic Krishnamurthy authored
QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release Related Jiras: 1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id 2. DEV-17937 null asset id not handled correctly in ais inventory fetch 3. OPSRT-1097 Update python-indra package on the system images 4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log. 5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim 6. DEV-20335 QAR-751 AIS bans are missing from message.xml svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 . Miscellaneous commit: 1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port
-
- Aug 26, 2008
-
-
Kelly Washington authored
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
-
- Jun 25, 2008
-
-
Steven Bennetts authored
dataserver-is-deprecated
-
- Jun 02, 2008
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-mergeBryan O'Sullivan authored
dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
-
- May 13, 2008
-
-
Josh Bell authored
svn merge -r 87164:87466 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release Land store (already deployed to agni as 1.21 patches) * Increased the available purchase area in the land store. * Modified select pool query to take a simulator status. Now generating a new uuid for each insert into the fulfill lock table. * Checking to make sure put-simstate returns a uuid region_id. Other stuff (going out soon or already out) * svn merge -r87339 svn/linden/branches/havok4/havok4-6 (Block creation of mega prims.) * Fix for the mega prim fix to also block 0 scale prims. * svn merge -r 84565:86084 svn+ssh://svn.lindenlab.com/svn/linden/branches/single-ref-attach-again --> Branch_1-21-Server (Slipstream QAR-518 single ref attachments) * Switched off indra.known_address in favor of indra_aux.known_address * DEV-15151 check_group_land.py kills the database * DEV-14662 - Change the current model of PREPARE/EXECUTE to directly execute the SQL (QAR-580) * DEV-15167 Random failure with set-classified-stats The secret word is: dataserver-is-deprecated
-
- Mar 25, 2008
-
-
Josh Bell authored
svn merge -r 82869:83166 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release Includes: DEV-12492 "new" regAPI fails on php-framework-2 DEV-11540 Show browser HUD for A/B test users coming from SL.com. DEV-11730 LLSD parser changes PHP logs to syslog DEV-12146 php llsd_UUID does not pass the IsUUID() validation function DEV-12356 oldstyle FetchInventoryDescendents should be TEMPLATE not LLSD steve's fix to setting the proxy option in curl
-
- Mar 20, 2008
-
-
Josh Bell authored
svn merge -r 82563:82869 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release DEV-12326 DEV-12232 fix for strange string crashes. web dataservices: fixed issue with non-selects not returning affected rows, also cleaned up log messages and unit tests DEV-12232 fix for crash bug. DEV-12105 Setting a music URL which is too long creates many problems Adding streambase log message for login failures. Changed URL for FetchInventoryDescendents to use new webservice when we're ready. DEV-12140 - Mapserver crashes in 1.19.2 Server QAR-390 - Add log_viewer_stats syslog writes need to deploy vault_control.pl central services, for reg DEV-11104 - Don't chew up memory profiling everything in pay-stipends.pl web dataservices: minor changes: logging added, mailer host changed to localhost per Ops
-
- Mar 03, 2008
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000-merge-0Bryan O'Sullivan authored
Allow for a seperate HTTP proxy for the LLHTTPRequest HTTP client (QAR-318)
-
- Feb 29, 2008
-
-
Bryan O'Sullivan authored
(Undo of previous merge)
-