summaryrefslogtreecommitdiff
path: root/indra/llmessage/llurlrequest.cpp
AgeCommit message (Collapse)Author
2012-01-17add more exception handlings for llcurl fix.Xiaohong Bao
2012-01-12fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory ↵Xiaohong Bao
crashes.
2012-01-04fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and ↵Xiaohong Bao
LLBufferArray::copyIntoBuffers reviewed by vir
2011-11-21fix for sh-2601: [crashhunters] crash in LLBufferArray::countAfter()Xiaohong Bao
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
2011-10-14Merge backout of b782a75c99e6Dave Parks
2011-10-14Backed out changeset b782a75c99e6Dave Parks
2011-08-31MergeXiaohong Bao
2011-08-16Backed out changeset 694594710de2Logan Dethrow
2011-08-15Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.Logan Dethrow
2011-08-15LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was ↵Logan Dethrow
already being called.
2011-07-28MergeLogan Dethrow
2011-07-21SH-2031 Don't do network I/O from the main thread in llcurl.Dave Parks
Reviewed by Kelly
2011-07-21STORM-1112 Protected LLProxy members during cross-thread calls to ↵Logan Dethrow
LLProxy::applyProxySettings()
2011-07-19STORM-1112 Added LLProxy::applyProxySettings() to apply proxy settings to ↵Logan Dethrow
curl handles. Added call to that function everywhere curl handles are created in the viewer.
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-04-01VWR-25376 Enable compression for GET and POST for Inventory and other ↵Aaron Stone
capabilities.
2011-02-05Introduces a LLThreadLocalData class that can beAleric Inglewood
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.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-28EXT-7498 WIP Snapshot SharingAimee Linden
Reviewed by Tofu.
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-01-20DEV-35248: Allow NoVerifySSLCert to uniformly disable verificationNat Goodspeed
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.
2009-07-09DEV-34822Roxanne Skelly
svn merge -c120157 svn+ssh://svn.lindenlab.com/svn/linden/branches/giab-viewer/giab-viewer-2
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
QAR-1654 merge completed.
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(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
2009-02-06svn merge -r 108748:109731 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 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)
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk (for real)
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵Mark Palange
fixes) merge to trunk
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch ↵Kartic Krishnamurthy
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
2008-08-26merge -r94900 linden/branches/kelly/qar-825 to linden/releaseKelly Washington
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2008-05-13svn merge -r 87164:87466 ↵Josh Bell
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
2008-03-25svn merge -r 82869:83166 ↵Josh Bell
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
2008-03-21svn merge -r 82563:82869 ↵Josh Bell
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
2008-03-03svn merge -r81155:81167 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000-merge-0 Allow for a seperate HTTP proxy for the LLHTTPRequest HTTP client (QAR-318)
2008-02-29svn merge -r 81153:81152 .Bryan O'Sullivan
(Undo of previous merge)
2008-02-29svn merge -r80434:80633 svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000Bryan O'Sullivan
2008-02-28svn merge -r 80357:80990 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release Merge patches from 1.19.1 Server branch: * QAR-293 Fix for hardcoded TTLs in web dataservices * DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size * Bounce apache2 processes before starting backbone/dataserver/simulator * Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61. * Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak * Fixed minor, non user facing bug in multiagentchat * set-classified-stats: Rewrote to use new MDB2 query reformatting syntax * Fixed possible bad conversion of vivox data * DEV-550, caching changes to DirClassifieds Query * QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend * More mem leak fixes for multiagent-chat * QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP * DEV-10151: Sometimes group IMs appear to be person to person IMs * QAR-321 Changes to crash_reporter * DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars * DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY). Web service version of this, must use two named queries because we need to change the query based on input string length.
2008-02-14svn merge -r 79730:79944 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
2008-02-12svn merge -r 79680:79822 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-dpo-10.1 --> release QAR-251 - merge qa-dpo-10 (QAR-166) to release
2007-12-21svn merge -r74200:76302 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-01 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9aChristian Goetze