From c08a36538a825d9afdf9151a57e69af542de8e82 Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Fri, 5 Nov 2004 08:50:30 +0000 Subject: [PATCH] fix for [ 1060093 ] wxURI && wxStringBufferLength part 2 - query and fragment not appended to URL in getinputstream git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/url.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/common/url.cpp b/src/common/url.cpp index fc8187bd3c..653d15d187 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -285,9 +285,24 @@ wxInputStream *wxURL::GetInputStream() #endif // When we use a proxy, we have to pass the whole URL to it. - wxInputStream *the_i_stream = - (m_useProxy) ? m_protocol->GetInputStream(m_url) : - m_protocol->GetInputStream(m_path); + wxInputStream *the_i_stream; + + if (m_useProxy != NULL) + { + the_i_stream = m_protocol->GetInputStream(m_url); + } + else + { + wxString fullPath = m_path; + + if (HasQuery()) + fullPath += wxT("?") + m_query; + + if (HasFragment()) + fullPath += wxT("#") + m_fragment; + + the_i_stream = m_protocol->GetInputStream(fullPath); + } if (!the_i_stream) { -- 2.45.2