4fd9a53115
Merge STORM-959
2011-10-26 01:42:26 +01:00
53ce47fc1c
merge changes for STORM-1654
2011-10-18 17:40:04 -04: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
7ffa6ba854
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
2011-10-05 13:01:57 -07: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
758b936dea
Trying to fix Mac build issue
2011-09-14 13:24:31 -04: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
7d381c6596
LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()
2011-09-08 10:43:07 -04: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
797b4df42a
Backed out changeset 694594710de2
2011-08-16 17:35:16 -04:00
61a7a874aa
Backed out rev 42d5f5df0a6a. Code was apparently needed afterall.
2011-08-15 20:05:28 -04:00
ff870e9770
Back out later: Turned on curl verbose logging for debugging purposes.
2011-08-15 13:22:23 -04:00
3743ec176c
LLProxy: Removed unneeded call to LLProxy::applyProxySettings, since it was already being called.
2011-08-15 13:21:33 -04:00
f73ec6a037
merge
2011-08-12 14:24:00 -04:00
53efce5b5a
merge changes for storm-1186
2011-08-09 10:18:43 -04:00
1fa2afbe20
merge
2011-08-08 18:09:11 -04:00
5915da89f0
LLProxy cleanup.
...
Made the socks proxy start first in llstartup.cpp
Moved initialization of the proxy to before the HTTP table fetch
Added Doxygen comments to LLProxy methods.
Removed call to applyProxySettings in llxmlrpctransaction.cpp since the ctor of LLCurlEasyRequest will apply the proxy settings.
2011-08-08 15:53:06 -04:00
37f8847085
LLProxy: Added another attempt to download gpu and feature tables after successfully setting up a proxy.
...
Other minor changes:
Clarified why we are using SOCKS5 as the "grid" argument to store proxy credentials.
Added class wide logging to the LLProxy class.
2011-08-04 11:17:03 -04:00
d3b4cc34a8
LLProxy cleanup.
...
* Removed early returns in LLStartup::handleSocksProxy
* Corrected some cases that would result in handleSocksProxy not being called again during login if settings changed
* Allowed for short replies in tcp_handshake in LLProxy.cpp
* Renamed LLProxy::isEnabled() to LLProxy::isSocksProxyEnabled() to clarify its use.
2011-08-02 17:18:54 -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
97bedac2a1
Proxy: Improved mutex usage in LLProxy. Introduced an LLAtomic member to track the status of the http proxy that can be checked without locking a mutex.
2011-08-02 11:08:07 -04: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
3a82169e2e
STORM-1186 FIXED Removed the "no mCurrentRMessageTemplate" warning message.
...
The mCurrentRMessageTemplate member seems to only be non-NULL for a short while
after an incoming message was validated and parsed, thus there is no
guarantee that we can obtain name of the last received message at any given
time. So if we can't we'll simply return an empty string without spamming the
log with warnings.
2011-08-01 21:33:11 +03:00
d2c72cb7e9
STORM-1112 Input sanitization of proxy options.
2011-07-29 15:38:20 -04:00
f15d28a636
Proxy cleanup in llstartup.cpp and llproxy.cpp.
2011-07-28 13:47:20 -04: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
859dc52c30
STORM-1112 Protected LLProxy members during cross-thread calls to LLProxy::applyProxySettings()
2011-07-21 15:16:54 -04: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
dd3069127b
merge
2011-07-13 14:57:23 -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
b750a5afb7
merge
2011-07-12 13:59:26 -04:00
961d5b1d65
merge
2011-07-09 11:05:29 -04:00
02cfd17236
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-09 10:57:22 -04:00
43616131dc
CHOP-661: Fix HTTPServer usage to turn off allow_reuse_address.
...
Turns out that BaseHTTPServer.HTTPServer turns on that flag by default, which
causes freeport() to fail (on Windows only?), happily instantiating multiple
servers on the same port. Change known instances, fix freeport() docstring to
highlight the issue. Add freeport() unit tests to verify expected behavior.
2011-07-07 22:21:59 -04:00
niel@nirvana-win7hp.planescape.home