Patch #1222244: Fixes for bug #1212853 with unit test.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/changes.txt

@@ -7,7 +7,8 @@ wxWidgets Change Log - For more verbose changes, see the manual
 
 All:
 
-- Fixed wxScopeGuard to work with VC++, documented it
+- Fixed wxScopeGuard to work with VC++, documented it.
+- Fixed proxy handling in wxURL.
 
 wxMSW:
 
@@ -17,6 +18,7 @@ wxUniv:
 
 - Window creation now honours wxVSCROLL.
 
+
 2.6.1
 -----
 

src/common/url.cpp

@@ -284,16 +284,16 @@ wxInputStream *wxURL::GetInputStream()
     }
 #endif
 
-  // When we use a proxy, we have to pass the whole URL to it.
+    wxString fullPath;
-  wxInputStream *the_i_stream;
 
-  if (!m_useProxy)
+    // When we use a proxy, we have to pass the whole URL to it.
-  {
+    if (m_useProxy)
-      the_i_stream = m_protocol->GetInputStream(m_url);
+        fullPath += m_url;
-  }
+
+    if(m_path.empty())
+        fullPath += wxT("/");
     else
-  {
+        fullPath += m_path;
-      wxString fullPath = m_path;
 
     if (HasQuery())
         fullPath += wxT("?") + m_query;
@@ -301,8 +301,7 @@ wxInputStream *wxURL::GetInputStream()
     if (HasFragment())
         fullPath += wxT("#") + m_fragment;
 
-      the_i_stream = m_protocol->GetInputStream(fullPath);
+    wxInputStream *the_i_stream = m_protocol->GetInputStream(fullPath);
-  }
 
     if (!the_i_stream)
     {
@@ -442,4 +441,3 @@ void wxURLModule::OnExit()
 #endif // wxUSE_SOCKETS
 
 #endif // wxUSE_URL
-

tests/uris/uris.cpp

@@ -377,8 +377,12 @@ void URITestCase::URLProxy()
 {
     wxURL url(wxT("http://www.asite.com/index.html"));
     url.SetProxy(wxT("pserv:3122"));
+
+    wxURL::SetDefaultProxy(wxT("fol.singnet.com.sg:8080"));
+    wxURL url2(wxT("http://server-name/path/to/file?query_data=value"));
+    wxInputStream *data = url2.GetInputStream();
+    CPPUNIT_ASSERT(data != NULL);
 }
 #endif // wxUSE_PROTOCOL_HTTP
 
 #endif // TEST_URL
-