Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't use m_useProxy if !wxUSE_PROTOCOL_HTTP (see #10815)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-20 23:02:21 +00:00
parent c475468896
commit 283965f0b3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/url.h
View File

@@ -78,6 +78,7 @@ protected:
static wxHTTP *ms_proxyDefault; static wxHTTP *ms_proxyDefault;
static bool ms_useDefaultProxy; static bool ms_useDefaultProxy;
wxHTTP *m_proxy; wxHTTP *m_proxy;
bool m_useProxy;
#endif // wxUSE_PROTOCOL_HTTP #endif // wxUSE_PROTOCOL_HTTP
#if wxUSE_URL_NATIVE #if wxUSE_URL_NATIVE
@@ -87,13 +88,13 @@ protected:
// Creates on the heap and returns a native // Creates on the heap and returns a native
// implementation object for the current platform. // implementation object for the current platform.
static wxURLNativeImp *CreateNativeImpObject(); static wxURLNativeImp *CreateNativeImpObject();
#endif #endif // wxUSE_URL_NATIVE
wxProtoInfo *m_protoinfo; wxProtoInfo *m_protoinfo;
wxProtocol *m_protocol; wxProtocol *m_protocol;
wxURLError m_error; wxURLError m_error;
wxString m_url; wxString m_url;
bool m_useProxy;
void Init(const wxString&); void Init(const wxString&);
bool ParseURL(); bool ParseURL();

10
src/common/url.cpp
View File

@@ -267,7 +267,11 @@ wxInputStream *wxURL::GetInputStream()
wxIPV4address addr; wxIPV4address addr;
// m_protoinfo is NULL when we use a proxy // m_protoinfo is NULL when we use a proxy
if (!m_useProxy && m_protoinfo->m_needhost) if (
#if wxUSE_PROTOCOL_HTTP
!m_useProxy &&
#endif // wxUSE_PROTOCOL_HTTP
m_protoinfo->m_needhost )
{ {
if (!addr.Hostname(m_server)) if (!addr.Hostname(m_server))
{ {
@@ -283,13 +287,15 @@ wxInputStream *wxURL::GetInputStream()
return NULL; return NULL;
} }
} }
#endif #endif // wxUSE_SOCKETS
wxString fullPath; wxString fullPath;
#if wxUSE_PROTOCOL_HTTP
// When we use a proxy, we have to pass the whole URL to it. // When we use a proxy, we have to pass the whole URL to it.
if (m_useProxy) if (m_useProxy)
fullPath += m_url; fullPath += m_url;
#endif // wxUSE_PROTOCOL_HTTP
if(m_path.empty()) if(m_path.empty())
fullPath += wxT("/"); fullPath += wxT("/");