Commented setsockopt as it doesn't work anywhere. I will use signals for timeout.

[wxWidgets.git] / src / common / protocol.cpp

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index d0da8f24265773886a23ce363f6e15199a63ab4e..c535c79258285876f35f85fb93801b39105e5980 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -17,17 +17,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #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"
 
 #endif
 
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 #include "wx/module.h"
 

+#include <stdlib.h>
+

 /////////////////////////////////////////////////////////////////
 // wxProtoInfo
 /////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 // wxProtoInfo
 /////////////////////////////////////////////////////////////////


@@ -38,7 +36,7 @@
  * --------------------------------------------------------------
  */
 
  * --------------------------------------------------------------
  */
 

-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;
                          const bool need_host1, wxClassInfo *info)
 {
   m_protoname = name;


@@ -53,13 +51,20 @@ wxProtoInfo::wxProtoInfo(const char *name, const char *serv,
 // wxProtocol ///////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 
 // wxProtocol ///////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////
 

+#if wxUSE_SOCKETS

 IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)
 IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxSocketClient)

+#else
+IMPLEMENT_ABSTRACT_CLASS(wxProtocol, wxObject)
+#endif

 
 wxProtocol::wxProtocol()
 
 wxProtocol::wxProtocol()

+#if wxUSE_SOCKETS

  : wxSocketClient()
  : wxSocketClient()

+#endif

 {
 }
 
 {
 }
 

+#if wxUSE_SOCKETS

 bool wxProtocol::Reconnect()
 {
   wxIPV4address addr;
 bool wxProtocol::Reconnect()
 {
   wxIPV4address addr;


@@ -109,6 +114,7 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }

+#endif

 
 // ----------------------------------------------------------------------
 // Module
 
 // ----------------------------------------------------------------------
 // Module


@@ -128,12 +134,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
 
 bool wxProtocolModule::OnInit()
 {
 
 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()
 {
   return TRUE;
 }
 
 void wxProtocolModule::OnExit()
 {

-  delete wxURL::g_proxy;
+#if wxUSE_SOCKETS
+  if (wxURL::g_proxy)
+    delete wxURL::g_proxy;

   wxURL::g_proxy = NULL;
   wxURL::g_proxy = NULL;

+#endif

 }
 }

+