#pragma hdrstop
#endif
+#if wxUSE_SOCKETS
+
#ifndef WX_PRECOMP
#endif
// Protocols list
wxProtoInfo *wxURL::g_protocols = NULL;
-wxHTTP wxURL::g_proxy;
+wxHTTP *wxURL::g_proxy;
/////////////////////////////////////////////////////////////////
// wxURL ////////////////////////////////////////////////////////
wxURL::wxURL(const wxString& url)
{
m_protocol = NULL;
- if (g_proxy.IsConnected()) {
- m_protocol = &g_proxy;
+ if (g_proxy->IsConnected()) {
+ m_protocol = g_proxy;
m_protoname = "proxy";
m_path = url;
return;
}
m_url = url;
m_error = wxURL_NOERR;
+ ParseURL();
}
bool wxURL::ParseURL()
bool wxURL::PrepHost(wxString& url)
{
+ wxString temp_url;
int pos, pos2;
if ((url.GetChar(0) != '/') || (url.GetChar(1) != '/'))
pos = url.Find('/');
if (pos == -1)
+ pos = url.Length();
+
+ if (pos == 0)
return FALSE;
- pos2 = url.Find(':');
+ temp_url = url(0, pos);
+ url = url(url.Find('/'), url.Length());
+
+ // Retrieve service number
+ pos2 = temp_url.Find(':', TRUE);
if (pos2 != -1 && pos2 < pos) {
- m_servname = url(pos2, pos);
+ m_servname = temp_url(pos2+1, pos);
if (!m_servname.IsNumber())
return FALSE;
- pos2 = pos;
+ temp_url = temp_url(0, pos2);
}
- m_hostname = url(0, pos);
+ // Retrieve user and password.
+ pos2 = temp_url.Find('@');
+ // Even if pos2 equals -1, this code is right.
+ m_hostname = temp_url(pos2+1, temp_url.Length());
- url = url(url.Find('/'), url.Length());
+ m_user = "";
+ m_password = "";
+
+ if (pos2 == -1)
+ return TRUE;
+
+ temp_url = temp_url(0, pos2);
+ pos2 = temp_url.Find(':');
+
+ if (pos2 == -1)
+ return FALSE;
+
+ m_user = temp_url(0, pos2);
+ m_password = temp_url(pos2+1, url.Length());
return TRUE;
}
}
m_error = wxURL_NOERR;
+ if (m_user != "") {
+ m_protocol->SetUser(m_user);
+ m_protocol->SetPassword(m_password);
+ }
+
if (m_protoinfo->m_needhost) {
if (!addr.Hostname(m_hostname)) {
m_error = wxURL_NOHOST;
addr.Service(m_servname);
- if (!m_protocol->Connect(addr)) {
+ if (!m_protocol->Connect(addr, TRUE)) // Watcom needs the 2nd arg for some reason
+ {
m_error = wxURL_CONNERR;
return NULL;
}
void wxURL::SetDefaultProxy(const wxString& url_proxy)
{
- g_proxy.Close();
+ g_proxy->Close();
if (url_proxy.IsNull())
return;
addr.Hostname(hostname);
addr.Service(port);
- g_proxy.Connect(addr);
+ g_proxy->Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
}
void wxURL::SetProxy(const wxString& url_proxy)
addr.Hostname(hostname);
addr.Service(port);
- m_proxy.Connect(addr);
+ m_proxy.Connect(addr, TRUE); // Watcom needs the 2nd arg for some reason
m_protocol = &m_proxy;
m_protoname = "proxy";
m_path = url_proxy;
}
+
+#endif
+ // wxUSE_SOCKETS