(blind) fix for gcc 3.4 warning for an always true comparison in an assert

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 346896925a02c0f46e99276aa203550a196446cb..8e620d15d95d917484f05f619b066380fa8392e5 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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


@@ -38,12 +38,13 @@ 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);
 }
 
   SetNotify(wxSOCKET_LOST_FLAG);
 }


@@ -57,17 +58,7 @@ wxHTTP::~wxHTTP()
 
 void wxHTTP::ClearHeaders()
 {
 
 void wxHTTP::ClearHeaders()
 {

-  // wxString isn't a wxObject
-  wxNode *node = m_headers.GetFirst();
-  wxString *string;
-
-  while (node) {
-    string = (wxString *)node->GetData();
-    delete string;
-    node = node->GetNext();
-  }
-
-  m_headers.Clear();
+  m_headers.clear();

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


@@ -80,6 +71,30 @@ void wxHTTP::SetProxyMode(bool on)
   m_proxy_mode = on;
 }
 
   m_proxy_mode = on;
 }
 

+wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header)
+{
+    wxHeaderIterator it = m_headers.begin();
+    for ( wxHeaderIterator en = m_headers.end(); it != en; ++it )
+    {
+        if ( wxStricmp(it->first, header) == 0 )
+            break;
+    }
+
+    return it;
+}
+
+wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const
+{
+    wxHeaderConstIterator it = m_headers.begin();
+    for ( wxHeaderConstIterator en = m_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) {


@@ -87,45 +102,36 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
     m_read = FALSE;
   }
 
     m_read = FALSE;
   }
 

-  wxNode *node = m_headers.Find(header);
-
-  if (!node)
-    m_headers.Append(header.Upper(), (wxObject *)(new wxString(h_data)));
-  else {
-    wxString *str = (wxString *)node->GetData();
-    (*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;
+    wxHeaderConstIterator it = FindHeader(header);

 
 

-  upper_header = header.Upper();
-
-  node = m_headers.Find(upper_header);
-  if (!node)
-    return wxEmptyString;
+    return it == m_headers.end() ? wxGetEmptyString() : it->second;
+}

 
 

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

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

-  wxNode *head = m_headers.GetFirst();
+  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->GetData();
-
-    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->GetNext();

   }
 }
 
   }
 }
 


@@ -140,10 +146,11 @@ bool wxHTTP::ParseHeaders()
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)
     bool bOs2var = 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;


@@ -152,15 +159,12 @@ bool wxHTTP::ParseHeaders()
       break;
 
     wxString left_str = line.BeforeFirst(':');
       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);
+    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;
 


@@ -179,7 +183,8 @@ 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);
 
   SetHeader(wxT("Host"), host);
     addr->Service(80);
 
   SetHeader(wxT("Host"), host);


@@ -211,10 +216,15 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   case wxHTTP_GET:
     request = wxT("GET");
     break;
   case wxHTTP_GET:
     request = wxT("GET");
     break;

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

   default:
     return FALSE;
   }
 
   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"));
   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())
     SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x"));


@@ -230,6 +240,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   SendHeaders();
   Write("\r\n", 2);
 
   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) {
   wxString tmp_str;
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {


@@ -253,6 +268,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   token.NextToken();
   tmp_str2 = token.NextToken();
 
   token.NextToken();
   tmp_str2 = token.NextToken();
 

+  m_http_response = wxAtoi(tmp_str2);
+

   switch (tmp_str2[0u]) {
   case wxT('1'):
     /* INFORMATION / SUCCESS */
   switch (tmp_str2[0u]) {
   case wxT('1'):
     /* INFORMATION / SUCCESS */


@@ -332,7 +349,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);