conversion warning gcc 3.3 mac

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index c8f8b79a04427ed11892820a63d402a1a698b51d..63e0fb4fb99f249b104a1e4fa9d098a3417848bd 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -6,22 +6,21 @@
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "http.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+  #pragma implementation "http.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#endif
+#if wxUSE_PROTOCOL_HTTP

 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>


@@ -29,123 +28,138 @@
 #include "wx/tokenzr.h"
 #include "wx/socket.h"
 #include "wx/protocol/protocol.h"
 #include "wx/tokenzr.h"
 #include "wx/socket.h"
 #include "wx/protocol/protocol.h"

+#include "wx/url.h"

 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)

-IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE)
-#endif
+IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)

 
 #define HTTP_BSIZE 2048
 
 wxHTTP::wxHTTP()
 
 #define HTTP_BSIZE 2048
 
 wxHTTP::wxHTTP()

-  : wxProtocol(),
-    m_headers(wxKEY_STRING)
+  : wxProtocol()

 {
   m_addr = NULL;
   m_read = FALSE;
 {
   m_addr = NULL;
   m_read = FALSE;

+  m_proxy_mode = FALSE;
+  m_post_buf = wxEmptyString;
+  m_http_response = 0;

 
 

-  SetNotify(REQ_LOST);
+  SetNotify(wxSOCKET_LOST_FLAG);

 }
 
 wxHTTP::~wxHTTP()
 {
 }
 
 wxHTTP::~wxHTTP()
 {

-  // wxString isn't a wxObject
-  wxNode *node = m_headers.First();
-  wxString *string;
-
-  while (node) {
-    string = (wxString *)node->Data();
-    delete string;
-    node = node->Next();
-  }
+    ClearHeaders();
+
+    delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()
+{
+  m_headers.clear();

 }
 
 wxString wxHTTP::GetContentType()
 {
 }
 
 wxString wxHTTP::GetContentType()
 {

-  return GetHeader("Content-Type");
+  return GetHeader(wxT("Content-Type"));
+}
+
+void wxHTTP::SetProxyMode(bool on)
+{
+  m_proxy_mode = on;
+}
+
+wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) const
+{
+    // we can't convert between const_iterator to iterator otherwise...
+    wxStringToStringHashMap& headers = (wxStringToStringHashMap&)m_headers;
+
+    wxHeaderIterator it = headers.begin();
+    for ( wxHeaderIterator en = headers.end(); it != en; ++it )
+    {
+        if ( wxStricmp(it->first, header) == 0 )
+            break;
+    }
+
+    return it;

 }
 
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {
 }
 
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {

-    m_headers.Clear();
+    ClearHeaders();

     m_read = FALSE;
   }
 
     m_read = FALSE;
   }
 

-  wxNode *node = m_headers.Find(header);
-
-  if (!node)
-    m_headers.Append(header, (wxObject *)(new wxString(h_data)));
-  else {
-    wxString *str = (wxString *)node->Data();
-    (*str) = h_data;
-  }
+  wxHeaderIterator it = FindHeader(header);
+  if (it != m_headers.end())
+    it->second = h_data;
+  else
+    m_headers[header] = h_data;

 }
 
 }
 

-wxString wxHTTP::GetHeader(const wxString& header)
+wxString wxHTTP::GetHeader(const wxString& header) const

 {
 {

-  wxNode *node = m_headers.Find(header);
-  if (!node)
-    return (char *)NULL;
+    wxHeaderIterator it = FindHeader(header);
+
+    return it == m_headers.end() ? wxGetEmptyString() : it->second;
+}

 
 

-  return *((wxString *)node->Data());
+void wxHTTP::SetPostBuffer(const wxString& post_buf)
+{
+    m_post_buf = post_buf;

 }
 
 void wxHTTP::SendHeaders()
 {
 }
 
 void wxHTTP::SendHeaders()
 {

-  wxNode *head = m_headers.First();
+  typedef wxStringToStringHashMap::iterator iterator;
+  wxString buf;

 
 

-  while (head)
+  for (iterator it = m_headers.begin(), en = m_headers.end(); it != en; ++it )

   {
   {

-    wxString *str = (wxString *)head->Data();
-
-    wxString buf;
-    buf.Printf("%s: %s\n\r", head->GetKeyString(), str->GetData());
+    buf.Printf(wxT("%s: %s\r\n"), it->first.c_str(), it->second.c_str());

 
 

-    Write(buf, buf.Len());
-
-    head = head->Next();
+    const wxWX2MBbuf cbuf = buf.mb_str();
+    Write(cbuf, strlen(cbuf));

   }
 }
 
 bool wxHTTP::ParseHeaders()
 {
   wxString line;
   }
 }
 
 bool wxHTTP::ParseHeaders()
 {
   wxString line;

+  wxStringTokenizer tokenzr;

 
 

-  m_headers.Clear();
+  ClearHeaders();

   m_read = TRUE;
 
   m_read = TRUE;
 

-  while (1) {
-    m_error = GetLine(this, line);
-    if (m_error != wxPROTO_NOERR)
+#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;
 
     if (line.Length() == 0)
       break;
 
       return FALSE;
 
     if (line.Length() == 0)
       break;
 

-    int pos = line.Find(':');
-    if (pos == -1)
-      return FALSE;
-
-    wxString left_str = line(0, pos);
-    wxString right_str = line(pos+1, line.Length());
-
-    right_str = right_str.Strip(wxString::leading);
-
-    wxString *str = new wxString(right_str);
-
-    m_headers.Append(left_str, (wxObject *) str);
+    wxString left_str = line.BeforeFirst(':');
+    m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);

   }
   return TRUE;
 }
 
   }
   return TRUE;
 }
 

-bool wxHTTP::Connect(const wxString& host)
+bool wxHTTP::Connect(const wxString& host, unsigned short port)

 {
   wxIPV4address *addr;
 
 {
   wxIPV4address *addr;
 

-  if (m_connected) {
+  if (m_addr) {

     delete m_addr;
     m_addr = NULL;
     Close();
     delete m_addr;
     m_addr = NULL;
     Close();


@@ -156,85 +170,149 @@ bool wxHTTP::Connect(const wxString& host)
   if (!addr->Hostname(host)) {
     delete m_addr;
     m_addr = NULL;
   if (!addr->Hostname(host)) {
     delete m_addr;
     m_addr = NULL;

-    m_error = wxPROTO_NETERR;
+    m_perr = wxPROTO_NETERR;

     return FALSE;
   }
 
     return FALSE;
   }
 

-  if (!addr->Service("http"))
+  if ( port ) addr->Service(port);
+  else if (!addr->Service(wxT("http")))

     addr->Service(80);
 
     addr->Service(80);
 

+  SetHeader(wxT("Host"), host);
+

   return TRUE;
 }
 
 bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   return TRUE;
 }
 
 bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {

-  struct sockaddr *raw_addr;
-  size_t len;
+  if (m_addr) {
+    delete m_addr;
+    Close();
+  }

 
 

-  m_addr = (wxSockAddress *)(addr.GetClassInfo()->CreateObject());
+  m_addr = addr.Clone();

 
 

-  addr.Build(raw_addr, len);
-  m_addr->Disassemble(raw_addr, len);
+  wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
+  if (ipv4addr)
+      SetHeader(wxT("Host"), ipv4addr->OrigHostname());

 
   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
 
   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {

-  char *tmp_buf;
-  char buf[HTTP_BSIZE];
+  const wxChar *request;

 
   switch (req) {
   case wxHTTP_GET:
 
   switch (req) {
   case wxHTTP_GET:

-    tmp_buf = "GET";
+    request = wxT("GET");
+    break;
+  case wxHTTP_POST:
+    request = wxT("POST");

     break;
   default:
     return FALSE;
   }
 
     break;
   default:
     return FALSE;
   }
 

-  sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char *)path);
-  Write(buf, strlen(buf));
+  m_http_response = 0;
+
+  // If there is no User-Agent defined, define it.
+  if (GetHeader(wxT("User-Agent")).IsNull())
+    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
+
+  SaveState();
+  SetFlags(wxSOCKET_NONE);
+  Notify(FALSE);
+
+  wxString buf;
+  buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
+  const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf);
+  Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));

   SendHeaders();
   SendHeaders();

-  sprintf(buf, "\n\r");
-  Write(buf, strlen(buf));
+  Write("\r\n", 2);

 
 

-  wxString tmp_str;
+  if ( req == wxHTTP_POST ) {
+    Write(m_post_buf, m_post_buf.Len());
+    m_post_buf = wxEmptyString;
+  }

 
 

-  m_error = GetLine(this, tmp_str);
-  if (m_error != wxPROTO_NOERR)
+  wxString tmp_str;
+  m_perr = GetLine(this, tmp_str);
+  if (m_perr != wxPROTO_NOERR) {
+    RestoreState();

     return FALSE;
     return FALSE;

+  }

 
 

-  if (!tmp_str.Contains("HTTP/")) {
+  if (!tmp_str.Contains(wxT("HTTP/"))) {

     // TODO: support HTTP v0.9 which can have no header.
     // TODO: support HTTP v0.9 which can have no header.

-    SetHeader("Content-Length", "-1");
-    SetHeader("Content-Type", "none/none");
+    // FIXME: tmp_str is not put back in the in-queue of the socket.
+    SetHeader(wxT("Content-Length"), wxT("-1"));
+    SetHeader(wxT("Content-Type"), wxT("none/none"));
+    RestoreState();

     return TRUE;
   }
 
     return TRUE;
   }
 

-  wxStringTokenizer token(tmp_str,' ');
+  wxStringTokenizer token(tmp_str,wxT(' '));

   wxString tmp_str2;
   wxString tmp_str2;

+  bool ret_value;

 
   token.NextToken();
   tmp_str2 = token.NextToken();
 
 
   token.NextToken();
   tmp_str2 = token.NextToken();
 

-  switch (atoi(tmp_str2)) {
-  case 200:
+  m_http_response = wxAtoi(tmp_str2);
+
+  switch (tmp_str2[0u]) {
+  case wxT('1'):
+    /* INFORMATION / SUCCESS */
+    break;
+  case wxT('2'):
+    /* SUCCESS */
+    break;
+  case wxT('3'):
+    /* REDIRECTION */

     break;
   default:
     break;
   default:

-    m_error = wxPROTO_NOFILE;
+    m_perr = wxPROTO_NOFILE;
+    RestoreState();

     return FALSE;
   }
 
     return FALSE;
   }
 

-  return ParseHeaders();
+  ret_value = ParseHeaders();
+  RestoreState();
+  return ret_value;

 }
 
 }
 

-class wxHTTPStream : public wxSocketInputStream {
+class wxHTTPStream : public wxSocketInputStream
+{

 public:
   wxHTTP *m_http;
 public:
   wxHTTP *m_http;

+  size_t m_httpsize;
+  unsigned long m_read_bytes;
+

   wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
   wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}

+  size_t GetSize() const { return m_httpsize; }

   virtual ~wxHTTPStream(void) { m_http->Abort(); }
   virtual ~wxHTTPStream(void) { m_http->Abort(); }

+
+protected:
+  size_t OnSysRead(void *buffer, size_t bufsize);
+
+    DECLARE_NO_COPY_CLASS(wxHTTPStream)

 };
 
 };
 

+size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
+{
+    if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
+    {
+        m_lasterror = wxSTREAM_EOF;
+        return 0;
+    }
+
+    size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
+    m_read_bytes += ret;
+
+    return ret;
+}
+

 bool wxHTTP::Abort(void)
 {
   return wxSocketClient::Close();
 bool wxHTTP::Abort(void)
 {
   return wxSocketClient::Close();


@@ -242,18 +320,43 @@ bool wxHTTP::Abort(void)
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {

-  wxHTTPStream *inp_stream = new wxHTTPStream(this);
+  wxHTTPStream *inp_stream;

 
 

-  if (!m_addr || m_connected) {
-    m_error = wxPROTO_CONNERR;
+  wxString new_path;
+
+  m_perr = wxPROTO_CONNERR;
+  if (!m_addr)

     return NULL;
     return NULL;

-  }

 
 

+  // We set m_connected back to FALSE so wxSocketBase will know what to do.
+#ifdef __WXMAC__
+        wxSocketClient::Connect(*m_addr , FALSE );
+        wxSocketClient::WaitOnConnect(10);
+
+    if (!wxSocketClient::IsConnected())
+        return NULL;
+#else

   if (!wxProtocol::Connect(*m_addr))
     return NULL;
   if (!wxProtocol::Connect(*m_addr))
     return NULL;

+#endif

 
 

-  if (!BuildRequest(path, wxHTTP_GET))
+  if (!BuildRequest(path, m_post_buf.IsEmpty() ? wxHTTP_GET : wxHTTP_POST))

     return NULL;
 
     return NULL;
 

+  inp_stream = new wxHTTPStream(this);
+
+  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(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
+

   return inp_stream;
 }
   return inp_stream;
 }

+
+#endif // wxUSE_PROTOCOL_HTTP
+