Commit Graph

23 Commits (cdfd470f2e8a03b976d8562c8c7f597c2f0233c0)

Author SHA1 Message Date
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 3c341a11ab SH-3468 WIP add memory tracking base class
more fixes for unit test crashes
added llcommon initialization/teardown for unit tests
that indirectly trigger lltrace
changed access of atomic refcount to use preincrement/decrement
operators to reflect desired semantics
always call apr_initialize in LLCommon::initClass, even
if already initialized...apr does internal reference counting
to keep things straight
2013-01-08 00:25:07 -08:00
Richard Linden 6841351502 SH-3468 WIP add memory tracking base class
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
2013-01-06 21:37:31 -08:00
Dave Parks 4924f0c99b b782a75c99e6 backout cleanup 2011-10-14 12:38:48 -05:00
Logan Dethrow 7d381c6596 LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy() 2011-09-08 10:43:07 -04:00
Logan Dethrow b8fddce34d Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface. 2011-09-07 16:40:40 -04:00
Logan Dethrow 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
Logan Dethrow 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
Logan Dethrow 6ab0bc8789 LLProxy start of code review cleanup. 2011-09-01 16:44:04 -04:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Logan Dethrow 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
Logan Dethrow 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
Logan Dethrow 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
Logan Dethrow 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
Logan Dethrow d2c72cb7e9 STORM-1112 Input sanitization of proxy options. 2011-07-29 15:38:20 -04:00
Logan Dethrow f15d28a636 Proxy cleanup in llstartup.cpp and llproxy.cpp. 2011-07-28 13:47:20 -04:00
Logan Dethrow 859dc52c30 STORM-1112 Protected LLProxy members during cross-thread calls to LLProxy::applyProxySettings() 2011-07-21 15:16:54 -04:00
Logan Dethrow 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
Logan Dethrow cb24dff9e3 Code cleanup for the SOCKS 5 proxy viewer. 2011-07-13 16:46:36 -04:00
Logan Dethrow f630f997c0 Changed lllog messages in llproxy.cpp to new macros. 2011-07-06 18:49:22 -04:00
Logan Dethrow 975975029d STORM-1112 Fixed crash on quit. Other minor fixes:
* Reordered HTTP proxy choices in settings dialog
* Now using setBlocking and setNonBlocking LLSocket methods during TCP handshakes.
* Made those LLSocket methods available outside the class.
2011-07-05 16:55:43 -04:00
Logan Dethrow 7717b6f647 STORM-1112 More cleanup of SOCKS 5 proxy code.
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-28 19:54:53 -04:00