From d29206bfbbf646c3048025a4155294ae73da07ae Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Dec 2008 17:03:20 +0000 Subject: [PATCH] fix wxURL::GetInputStream() for URLs with special characters in credentials (closes #10265) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@57545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 2 ++ src/common/url.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index a79288b4af..edb6fb9980 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -99,6 +99,8 @@ All: - Added Vietnamese translation (Tran Ngoc Quan). - Updated Slovenian translation (Martin Srebotnjak). - Corrected Serbian locale name (Cody Precord). +- Fix wxURL::GetInputStream() for URLs with special characters in credentials + (Robert Wruck). All (GUI): diff --git a/src/common/url.cpp b/src/common/url.cpp index 6bd227c2b5..c3fd8a2c15 100644 --- a/src/common/url.cpp +++ b/src/common/url.cpp @@ -242,11 +242,11 @@ wxInputStream *wxURL::GetInputStream() size_t dwPasswordPos = m_userinfo.find(':'); if (dwPasswordPos == wxString::npos) - m_protocol->SetUser(m_userinfo); + m_protocol->SetUser(Unescape(m_userinfo)); else { - m_protocol->SetUser(m_userinfo(0, dwPasswordPos)); - m_protocol->SetPassword(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1)); + m_protocol->SetUser(Unescape(m_userinfo(0, dwPasswordPos))); + m_protocol->SetPassword(Unescape(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1))); } }