a3e30250e8
merge
2012-01-04 09:59:57 -05:00
ec06aa129f
add mutex to protect curl_multi-init()
2011-12-20 15:02:21 -07:00
1620ad6d00
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
cfc6ac76e1
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
5affaf264d
SH-2738 Don't lock unless we really need to
2011-12-19 16:55:21 -06:00
43e3603cd7
SH-2738 Don't lock unless we really need to
2011-12-19 16:55:21 -06:00
58f9982fbc
SH-2738 Add comment documenting need to not make main thread wait on curl_multi_perform
2011-12-19 15:35:38 -06:00
efec138037
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
...
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
4ec112bfce
fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
...
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
642ea00a08
merge
2011-12-12 10:45:13 -05:00
50a57ba9fe
Backed out changeset fafd857891b1
2011-12-09 12:23:04 -06:00
1516e4c497
merge
2011-12-05 17:56:38 -06:00
78233d1bf9
SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while occlusion queries from previous frame are still pending and perform texture decode work.
2011-12-05 17:55:40 -06:00
09feaac844
fix for sh-2738: Texture fetching freezes due to LLcurl
2011-12-05 13:23:05 -07:00
3fc4c14464
fix a mac build error: a friend declaration issue.
2011-11-29 16:18:50 -07:00
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
4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
83732a7083
SH-2445 Potential fix for crash in LLCurl::Multi::~Multi -- lock sMultiMutex around curl_multi_ calls in LLCurl::Multi destructor
2011-09-19 16:39:16 -05:00
0a0ae2dd3f
STORM-1562 Potential fix for crash in LLCurl::run -- don't run curl_multi_perform from multiple threads simultaneously.
2011-09-13 12:45:28 -05:00
b8fddce34d
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
2011-09-07 16:40:40 -04:00
f73b795bb7
Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to prevent ambiguous name build error.
2011-09-06 17:33:18 -04:00
a8d49f7cf5
LLProxy code review fixes.
...
* Removed check_curl_code and check_curl_multi_code from the global namespace.
* Added comments documenting which thread the public methods of LLProxy should be called from.
* Corrected grammar in LLSingleton.h
* Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06 16:54:53 -04:00
6ab0bc8789
LLProxy start of code review cleanup.
2011-09-01 16:44:04 -04:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
4fb809eed5
Backed out revision cbc793dcd3db to disable libcurl verbose logging.
2011-08-18 16:10:49 -04:00
ff870e9770
Back out later: Turned on curl verbose logging for debugging purposes.
2011-08-15 13:22:23 -04:00
1fa2afbe20
merge
2011-08-08 18:09:11 -04:00
9883c33993
SH-2183 Thread local storage initialization is unreliable.
2011-08-02 12:47:35 -05:00
aa0e35142a
SH-2183 Only apply multi-threaded curl on the main thread.
2011-08-02 12:23:50 -05:00
fbd5bd7adc
SH-2183 Add a debug setting to control whether or not to use multiple threads in LLCurl
2011-08-01 17:50:43 -05:00
814a2d24dc
Merge
2011-07-28 10:41:59 -04:00
cd923af21f
SH-2183 Fix for multi-threaded curl not playing nice with mesh upload.
2011-07-28 00:26:30 -05:00
c07f55e605
merging latest viewer-development to mesh merge candidate.
2011-07-25 18:26:14 -04:00
26a9a6929c
SH-2031 Fix for sometimes deadlocking a curl thread.
2011-07-22 16:22:51 -05:00
e4a8ef4ce2
SH-2031 Cleanup from threaded curl implementation (remove errors/loops on shutdown).
2011-07-22 02:33:55 -05:00
7b6afd1eba
SH-2031 Followup to curl threading work -- don't start and stop the thread on every request, use a signal (cuts time spent in Pump IO down from 1-2 ms to 0.1ms)
2011-07-21 23:33:23 -05:00
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
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
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
cb24dff9e3
Code cleanup for the SOCKS 5 proxy viewer.
2011-07-13 16:46:36 -04:00
cfce3686de
STORM-1112 Fixed network buffers that need to have space for the SOCKS proxy header.
2011-07-13 11:40:50 -04:00
7717b6f647
STORM-1112 More cleanup of SOCKS 5 proxy code.
...
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-28 19:54:53 -04:00
20100ba38c
Refactored SOCKS 5 handshake to use existing LLSocket class.
2011-06-21 17:09:12 -04:00
aba4f7ddc8
fix for SH-1870: can not upload book_collection_1.dae when include textures
2011-06-20 14:01:32 -06:00
7cb18f5318
Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and socks5.h.
2011-06-08 15:17:19 -04:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
3063c1be41
EXP-772 -- Log in failure, keeps saying DNS cannot resolve hostname.
...
No real progress on this Jira yet but Mac build was not properly reporting the CURL error string.
This check-in fixes that.
So far, I have backed out URL related changes between 2.6.2 and 2.6.3 without any change in behavior.
Unsure how to proceed next although comparing libcares and libcurl builds between 2.6.2 and 2.6.3 seems
like it could be the next logical step.
Users experiencing the problem can go back to vewere 2.6.2 or adjust DNS settings to use the google free
DNS servers 8.8.8.8 and 8.8.4.4 which should allow them to work around the problem.
Reviewed by Richard.
2011-05-04 16:27:59 -07:00
74d9bf0d55
VWR-20801 Implement SOCKS 5 Proxy for the viewer
2011-03-28 11:20:06 +01:00
Brad Payne (Vir Linden)