fix for last commit

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

diff --git a/src/common/protocol.cpp b/src/common/protocol.cpp
index 64939970e69828cf3d18d7a190911f0d2ac9f769..2203ac231f4ee76b6f1c05f5ab67fb767c1f6c24 100644 (file)
--- a/src/common/protocol.cpp
+++ b/src/common/protocol.cpp
@@ -43,8 +43,8 @@ wxProtoInfo::wxProtoInfo(const wxChar *name, const wxChar *serv,
   m_servname = serv;
   m_cinfo = info;
   m_needhost = need_host1;
   m_servname = serv;
   m_cinfo = info;
   m_needhost = need_host1;

-  next = wxURL::g_protocols;
-  wxURL::g_protocols = this;
+  next = wxURL::ms_protocols;
+  wxURL::ms_protocols = this;

 }
 
 /////////////////////////////////////////////////////////////////
 }
 
 /////////////////////////////////////////////////////////////////


@@ -69,7 +69,8 @@ bool wxProtocol::Reconnect()
 {
   wxIPV4address addr;
 
 {
   wxIPV4address addr;
 

-  if (!GetPeer(addr)) {
+  if (!GetPeer(addr))
+  {

     Close();
     return FALSE;
   }
     Close();
     return FALSE;
   }


@@ -77,9 +78,60 @@ bool wxProtocol::Reconnect()
     return FALSE;
   if (!Connect(addr))
     return FALSE;
     return FALSE;
   if (!Connect(addr))
     return FALSE;

+

   return TRUE;
 }
 
   return TRUE;
 }
 

+// ----------------------------------------------------------------------------
+// Read a line from socket
+// ----------------------------------------------------------------------------
+
+// TODO ReadLine() should use buffers private to wxProtocol for efficiency!
+
+// static
+wxProtocolError wxProtocol::ReadLine(wxSocketBase *socket, wxString& result)
+{
+    result.Empty();
+    char ch, chLast = '\0';
+    while ( !socket->Read(&ch, sizeof(ch)).Error() )
+    {
+        switch ( ch )
+        {
+            case '\r':
+                // remember it, if the following is '\n', we're done
+                chLast = '\r';
+                break;
+
+            case '\n':
+                // only ends line if the previous character was '\r'
+                if ( chLast == '\r' )
+                {
+                    // EOL found
+                    return wxPROTO_NOERR;
+                }
+                //else: fall through
+
+            default:
+                // normal char
+                if ( chLast )
+                {
+                    result += chLast;
+                    chLast = '\0';
+                }
+
+                result += ch;
+        }
+    }
+
+    return wxPROTO_NETERR;
+}
+
+wxProtocolError wxProtocol::ReadLine(wxString& result)
+{
+    return ReadLine(this, result);
+}
+
+// old function which only chops '\n' and not '\r\n'

 wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
 #define PROTO_BSIZE 2048
   size_t avail, size;
 wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
 #define PROTO_BSIZE 2048
   size_t avail, size;


@@ -88,7 +140,7 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
   bool found;
 
   avail = sock->Read(tmp_buf, PROTO_BSIZE).LastCount();
   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);
     return wxPROTO_NETERR;
 
   memcpy(tmp_str, tmp_buf, avail);


@@ -115,44 +167,3 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result) {
 #undef PROTO_BSIZE
 }
 #endif
 #undef PROTO_BSIZE
 }
 #endif

-
-// ----------------------------------------------------------------------
-// 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()
-{
-#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()
-{
-#if wxUSE_SOCKETS
-  if (wxURL::g_proxy)
-    delete wxURL::g_proxy;
-  wxURL::g_proxy = NULL;
-#endif
-}
-