Removed 'interface' pragma for gcc 2.96

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index f9c7722269d8a2c66f09588d06dc676f658a8b40..db4eeb851f7fada7e3dabcdcdd6106fd4b48f4d0 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS && wxUSE_STREAMS
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,10 +32,8 @@
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE)
-#endif
+IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)
 
 #define HTTP_BSIZE 2048
 
@@ -47,7 +45,7 @@ wxHTTP::wxHTTP()
   m_read = FALSE;
   m_proxy_mode = FALSE;
 
-  SetNotify(GSOCK_LOST_FLAG);
+  SetNotify(wxSOCKET_LOST_FLAG);
 }
 
 wxHTTP::~wxHTTP()
@@ -61,11 +59,16 @@ wxHTTP::~wxHTTP()
     delete string;
     node = node->Next();
   }
+
+  if (m_addr) {
+      delete m_addr;
+      m_addr = NULL;
+  }
 }
 
 wxString wxHTTP::GetContentType()
 {
-  return GetHeader(_T("Content-Type"));
+  return GetHeader(wxT("Content-Type"));
 }
 
 void wxHTTP::SetProxyMode(bool on)
@@ -96,7 +99,7 @@ wxString wxHTTP::GetHeader(const wxString& header)
   wxString upper_header;
 
   upper_header = header.Upper();
-  
+
   node = m_headers.Find(upper_header);
   if (!node)
     return wxEmptyString;
@@ -113,7 +116,7 @@ void wxHTTP::SendHeaders()
     wxString *str = (wxString *)head->Data();
 
     wxString buf;
-    buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
+    buf.Printf(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData());
 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
@@ -130,7 +133,13 @@ bool wxHTTP::ParseHeaders()
   m_headers.Clear();
   m_read = TRUE;
 
-  while (1) {
+#if defined(__VISAGECPP__)
+// VA just can't stand while(1)
+    bool bOs2var = TRUE;
+    while(bOs2var) {
+#else
+    while (1) {
+#endif
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;
@@ -138,13 +147,8 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
-    tokenzr.SetString(line, " :\t\n\r");
-    if (!tokenzr.HasMoreTokens())
-      return FALSE;
-
-    wxString left_str = tokenzr.GetNextToken();
-    wxString *str = new wxString(tokenzr.GetNextToken());
-
+       wxString left_str = line.BeforeFirst(':');
+       wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
     left_str.MakeUpper();
 
     m_headers.Append(left_str, (wxObject *) str);
@@ -171,7 +175,7 @@ bool wxHTTP::Connect(const wxString& host)
     return FALSE;
   }
 
-  if (!addr->Service(_T("http")))
+  if (!addr->Service(wxT("http")))
     addr->Service(80);
 
   return TRUE;
@@ -196,26 +200,26 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   wxString tmp_str = path;
 
   // If there is no User-Agent defined, define it.
-  if (GetHeader(_T("User-Agent")).IsNull())
-    SetHeader(_T("User-Agent"), _T("wxWindows 2.x")); 
+  if (GetHeader(wxT("User-Agent")).IsNull())
+    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
 
   switch (req) {
   case wxHTTP_GET:
-    tmp_buf = _T("GET");
+    tmp_buf = wxT("GET");
     break;
   default:
     return FALSE;
   }
 
   SaveState();
-  SetFlags(NONE);
+  SetFlags(wxSOCKET_NONE);
   Notify(FALSE);
 
-  wxSprintf(buf, _T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData());
+  wxSprintf(buf, wxT("%s %s HTTP/1.0\r\n"), tmp_buf, tmp_str.GetData());
   const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
-  Write(pathbuf, strlen(MBSTRINGCAST pathbuf));
+  Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
-  Write("\n\r", 2);
+  Write("\r\n", 2);
 
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
@@ -223,16 +227,16 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     return FALSE;
   }
 
-  if (!tmp_str.Contains(_T("HTTP/"))) {
+  if (!tmp_str.Contains(wxT("HTTP/"))) {
     // TODO: support HTTP v0.9 which can have no header.
     // FIXME: tmp_str is not put back in the in-queue of the socket.
-    SetHeader(_T("Content-Length"), _T("-1"));
-    SetHeader(_T("Content-Type"), _T("none/none"));
+    SetHeader(wxT("Content-Length"), wxT("-1"));
+    SetHeader(wxT("Content-Type"), wxT("none/none"));
     RestoreState();
     return TRUE;
   }
 
-  wxStringTokenizer token(tmp_str,_T(' '));
+  wxStringTokenizer token(tmp_str,wxT(' '));
   wxString tmp_str2;
   bool ret_value;
 
@@ -240,13 +244,13 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   tmp_str2 = token.NextToken();
 
   switch (tmp_str2[(unsigned int) 0]) {
-  case _T('1'):
+  case wxT('1'):
     /* INFORMATION / SUCCESS */
     break;
-  case _T('2'):
+  case wxT('2'):
     /* SUCCESS */
     break;
-  case _T('3'):
+  case wxT('3'):
     /* REDIRECTION */
     break;
   default:
@@ -260,7 +264,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   return ret_value;
 }
 
-class wxHTTPStream : public wxSocketInputStream {
+class wxHTTPStream : public wxSocketInputStream
+{
 public:
   wxHTTP *m_http;
   size_t m_httpsize;
@@ -289,11 +294,7 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 
 bool wxHTTP::Abort(void)
 {
-  bool ret, connected;
-
-  ret = wxSocketClient::Close();
-
-  return ret;
+  return wxSocketClient::Close();
 }
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
@@ -312,15 +313,15 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 
-  if (!GetHeader(_T("Content-Length")).IsEmpty())
-    inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length")));
+  if (!GetHeader(wxT("Content-Length")).IsEmpty())
+    inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length")));
   else
     inp_stream->m_httpsize = (size_t)-1;
 
   inp_stream->m_read_bytes = 0;
 
   Notify(FALSE);
-  SetFlags(SPEED | WAITALL);
+  SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
   return inp_stream;
 }