fix for HP-UX

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index b9cbcb8634ec949bed83a6f155a54a10f2c340eb..1f5fb7adfd5af6e2d230cdbe849ff984148bf5dc 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -17,15 +17,16 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+  #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#include <wx/wx.h>
-#endif
+#if wxUSE_SOCKETS
 
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
+#include "wx/module.h"
+
+#include <stdlib.h>
 
 /////////////////////////////////////////////////////////////////
 // wxProtoInfo
@@ -37,7 +38,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;
@@ -108,3 +109,42 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
   return wxPROTO_NOERR;
 #undef PROTO_BSIZE
 }
+
+// ----------------------------------------------------------------------
+// Module
+// ----------------------------------------------------------------------
+
+class wxProtocolModule: public wxModule {
+  DECLARE_DYNAMIC_CLASS(wxProtocolModule)
+public:
+  wxProtocolModule() {}
+  bool OnInit();
+  void OnExit();
+};
+
+#if !USE_SHARED_LIBRARY
+IMPLEMENT_DYNAMIC_CLASS(wxProtocolModule, wxModule)
+#endif
+
+bool wxProtocolModule::OnInit()
+{
+  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);
+  
+  return TRUE;
+}
+
+void wxProtocolModule::OnExit()
+{
+  if (wxURL::g_proxy)
+    delete wxURL::g_proxy;
+  wxURL::g_proxy = NULL;
+}
+
+#endif
+  // wxUSE_SOCKETS