| Age | Commit message (Collapse) | Author |
|---|
|
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.
|
|
|
|
|
|
|
|
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
|
|
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-699_combo-merge --> release
QAR-699 - Combo merge for QAR-687, QAR-637, QAR-586
* QAR-687 - Test build with libs on S3
* QAR-637 Test dynamic sound throttle
* QAR-586 Test new http features branch
|
|
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
|
|
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.
|
|
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
|
|
|
|
|
