#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
+ #pragma hdrstop
#endif
#include "wx/protocol/protocol.h"
#include "wx/url.h"
#include "wx/module.h"
+#include <stdlib.h>
+
/////////////////////////////////////////////////////////////////
// wxProtoInfo
/////////////////////////////////////////////////////////////////
* --------------------------------------------------------------
*/
-wxProtoInfo::wxProtoInfo(const char *name, const char *serv,
+wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
const bool need_host1, wxClassInfo *info)
{
m_protoname = name;
// wxProtocol ///////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
+#if wxUSE_SOCKETS
IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)
+#else
+IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject)
+#endif
wxProtocol::wxProtocol()
+#if wxUSE_SOCKETS
: wxSocketClient()
+#endif
{
}
+#if wxUSE_SOCKETS
bool wxProtocol::Reconnect()
{
wxIPV4address addr;
- if (!GetPeer(addr)) {
+ if (!GetPeer(addr))
+ {
Close();
return FALSE;
}
return FALSE;
if (!Connect(addr))
return FALSE;
+
return TRUE;
}
bool found;
avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
- if (sock->LastError() != 0 || avail == 0)
+ if (sock->Error() || avail == 0)
return wxPROTO_NETERR;
memcpy(tmp_str, tmp_buf, avail);
result = result.Left(result.Length()-1);
size = ret-tmp_str+1;
- sock->CreatePushbackBefore(&tmp_buf[size], avail-size);
+ sock->Unread(&tmp_buf[size], avail-size);
return wxPROTO_NOERR;
#undef PROTO_BSIZE
}
+#endif
// ----------------------------------------------------------------------
// Module
void OnExit();
};
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
-#endif
bool wxProtocolModule::OnInit()
{
- wxURL::g_proxy = new wxHTTP();
+#if wxUSE_SOCKETS
+ char *env_http_prox;
+
+ wxURL::g_proxy = NULL;
+ // Initialize the proxy when HTTP_PROXY is defined
+ env_http_prox = getenv("HTTP_PROXY");
+ if (env_http_prox)
+ wxURL::SetDefaultProxy(env_http_prox);
+#endif
+
return TRUE;
}
void wxProtocolModule::OnExit()
{
- delete wxURL::g_proxy;
+#if wxUSE_SOCKETS
+ if (wxURL::g_proxy)
+ delete wxURL::g_proxy;
wxURL::g_proxy = NULL;
+#endif
}
+