compilation fix

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 71db1b5e851f2a393ee6412783e6955fd0fb8fef..0e7d3a33469e578d1646faa53ed8c0ce66373812 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
   #pragma implementation "http.h"
 #endif
 
@@ -44,6 +44,7 @@ wxHTTP::wxHTTP()
   m_read = FALSE;
   m_proxy_mode = FALSE;
   m_post_buf = wxEmptyString;
+  m_http_response = 0;
 
   SetNotify(wxSOCKET_LOST_FLAG);
 }
@@ -70,6 +71,30 @@ void wxHTTP::SetProxyMode(bool 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) {
@@ -77,26 +102,23 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
     m_read = FALSE;
   }
 
-  wxStringToStringHashMap::iterator it = m_headers.find(header);
+  wxHeaderIterator it = FindHeader(header);
   if (it != m_headers.end())
-    it->second = h_data;  
+    it->second = h_data;
   else
-    m_headers[header.Upper()] = h_data;
+    m_headers[header] = h_data;
 }
 
-wxString wxHTTP::GetHeader(const wxString& header)
+wxString wxHTTP::GetHeader(const wxString& header) const
 {
-  wxStringToStringHashMap::iterator it = m_headers.find(header.Upper());
-
-  if (it == m_headers.end())
-    return wxEmptyString;
+    wxHeaderConstIterator it = FindHeader(header);
 
-  return it->second;
+    return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }
 
 void wxHTTP::SetPostBuffer(const wxString& post_buf)
 {
-  m_post_buf = post_buf;
+    m_post_buf = post_buf;
 }
 
 void wxHTTP::SendHeaders()
@@ -124,10 +146,11 @@ bool wxHTTP::ParseHeaders()
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)
     bool bOs2var = TRUE;
-    while(bOs2var) {
+    while(bOs2var)
 #else
-    while (1) {
+  while (1)
 #endif
+  {
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;
@@ -136,8 +159,6 @@ bool wxHTTP::ParseHeaders()
       break;
 
     wxString left_str = line.BeforeFirst(':');
-    left_str.MakeUpper();
-
     m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
   }
   return TRUE;
@@ -196,18 +217,26 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     request = wxT("GET");
     break;
   case wxHTTP_POST:
-    tmp_buf = wxT("POST");
+    request = wxT("POST");
+    if ( GetHeader( wxT("Content-Length") ).IsNull() )
+      SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
     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"));
+    SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
   SaveState();
-  SetFlags(wxSOCKET_NONE);
+#if wxUSE_THREADS
+  SetFlags( wxThread::IsMain() ? wxSOCKET_NONE : wxSOCKET_BLOCK );
+#else
+  SetFlags( wxSOCKET_NONE );
+#endif
   Notify(FALSE);
 
   wxString buf;
@@ -218,7 +247,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   Write("\r\n", 2);
 
   if ( req == wxHTTP_POST ) {
-    Write(m_post_buf, m_post_buf.Len());
+    Write(m_post_buf.mbc_str(), m_post_buf.Len());
     m_post_buf = wxEmptyString;
   }
 
@@ -245,6 +274,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   token.NextToken();
   tmp_str2 = token.NextToken();
 
+  m_http_response = wxAtoi(tmp_str2);
+
   switch (tmp_str2[0u]) {
   case wxT('1'):
     /* INFORMATION / SUCCESS */