Made funcs extern...

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 52f6e362c748fde47da55555d1aad5eee0f14425..63e0fb4fb99f249b104a1e4fa9d098a3417848bd 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -6,10 +6,10 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

   #pragma implementation "http.h"
 #endif
 
   #pragma implementation "http.h"
 #endif
 


@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_SOCKETS && wxUSE_STREAMS
+#if wxUSE_PROTOCOL_HTTP

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


@@ -38,32 +38,27 @@ 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_proxy_mode = FALSE;
 {
   m_addr = NULL;
   m_read = FALSE;
   m_proxy_mode = FALSE;

+  m_post_buf = wxEmptyString;
+  m_http_response = 0;

 
   SetNotify(wxSOCKET_LOST_FLAG);
 }
 
 wxHTTP::~wxHTTP()
 {
 
   SetNotify(wxSOCKET_LOST_FLAG);
 }
 
 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();

 
 

-  if (m_addr) {
-      delete m_addr;
-      m_addr = NULL;
-  }
+    delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()
+{
+  m_headers.clear();

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


@@ -76,52 +71,58 @@ void wxHTTP::SetProxyMode(bool on)
   m_proxy_mode = 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;
-  wxString upper_header;
-
-  upper_header = header.Upper();
+    wxHeaderIterator it = FindHeader(header);

 
 

-  node = m_headers.Find(upper_header);
-  if (!node)
-    return wxEmptyString;
+    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(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData());
+    buf.Printf(wxT("%s: %s\r\n"), it->first.c_str(), it->second.c_str());

 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));

-
-    head = head->Next();

   }
 }
 
   }
 }
 


@@ -130,16 +131,17 @@ bool wxHTTP::ParseHeaders()
   wxString line;
   wxStringTokenizer tokenzr;
 
   wxString line;
   wxStringTokenizer tokenzr;
 

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

   m_read = TRUE;
 
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)
     bool bOs2var = TRUE;
   m_read = TRUE;
 
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)
     bool bOs2var = TRUE;

-    while(bOs2var) {
+    while(bOs2var)

 #else
 #else

-    while (1) {
+  while (1)

 #endif
 #endif

+  {

     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;


@@ -147,16 +149,13 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
     if (line.Length() == 0)
       break;
 

-       wxString left_str = line.BeforeFirst(':');
-       wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
-    left_str.MakeUpper();
-
-    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;
 


@@ -175,9 +174,12 @@ bool wxHTTP::Connect(const wxString& host)
     return FALSE;
   }
 
     return FALSE;
   }
 

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

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

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

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -185,42 +187,56 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   if (m_addr) {
     delete m_addr;
 {
   if (m_addr) {
     delete m_addr;

-    m_addr = NULL;

     Close();
   }
 
     Close();
   }
 

-  m_addr = (wxSockAddress *) addr.Clone();
+  m_addr = addr.Clone();
+
+  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)
 {

-  wxChar *tmp_buf;
-  wxChar buf[200]; // 200 is arbitrary.
-  wxString tmp_str = path;
-
-  // If there is no User-Agent defined, define it.
-  if (GetHeader(wxT("User-Agent")).IsNull())
-    SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));
+  const wxChar *request;

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

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

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

+  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);
 
   SaveState();
   SetFlags(wxSOCKET_NONE);
   Notify(FALSE);
 

-  wxSprintf(buf, wxT("%s %s HTTP/1.0\r\n"), tmp_buf, tmp_str.GetData());
-  const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
+  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();
   Write("\r\n", 2);
 
   Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
   SendHeaders();
   Write("\r\n", 2);
 

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

   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();


@@ -243,7 +259,9 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   token.NextToken();
   tmp_str2 = token.NextToken();
 
   token.NextToken();
   tmp_str2 = token.NextToken();
 

-  switch (tmp_str2[(unsigned int) 0]) {
+  m_http_response = wxAtoi(tmp_str2);
+
+  switch (tmp_str2[0u]) {

   case wxT('1'):
     /* INFORMATION / SUCCESS */
     break;
   case wxT('1'):
     /* INFORMATION / SUCCESS */
     break;


@@ -277,19 +295,22 @@ public:
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);

+
+    DECLARE_NO_COPY_CLASS(wxHTTPStream)

 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {
 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 {

-  size_t ret;
-
-  if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
-    return 0;
+    if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
+    {
+        m_lasterror = wxSTREAM_EOF;
+        return 0;
+    }

 
 

-  ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
-  m_read_bytes += ret;
+    size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
+    m_read_bytes += ret;

 
 

-  return ret;
+    return ret;

 }
 
 bool wxHTTP::Abort(void)
 }
 
 bool wxHTTP::Abort(void)


@@ -319,7 +340,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     return NULL;
 #endif
 
     return NULL;
 #endif
 

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

     return NULL;
 
   inp_stream = new wxHTTPStream(this);
     return NULL;
 
   inp_stream = new wxHTTPStream(this);


@@ -337,5 +358,5 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   return inp_stream;
 }
 
   return inp_stream;
 }
 

-#endif
-   // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
+