fixed MSVC6 warning

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 3f5a86b4ae3d832cb96ed01bc321e93ee81d5505..990e08e276729ae20cb70d06dc5e8e1f7c481a94 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -33,7 +33,7 @@
 #include "wx/sckstrm.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 #include "wx/sckstrm.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)

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

 
 #define HTTP_BSIZE 2048
 
 
 #define HTTP_BSIZE 2048
 


@@ -41,9 +41,10 @@ wxHTTP::wxHTTP()
   : wxProtocol()
 {
   m_addr = NULL;
   : wxProtocol()
 {
   m_addr = NULL;

-  m_read = FALSE;
-  m_proxy_mode = FALSE;
+  m_read = false;
+  m_proxy_mode = false;

   m_post_buf = wxEmptyString;
   m_post_buf = wxEmptyString;

+  m_http_response = 0;

 
   SetNotify(wxSOCKET_LOST_FLAG);
 }
 
   SetNotify(wxSOCKET_LOST_FLAG);
 }


@@ -70,13 +71,22 @@ void wxHTTP::SetProxyMode(bool on)
   m_proxy_mode = on;
 }
 
   m_proxy_mode = on;
 }
 

-wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header) const
+wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header)

 {
 {

-    // we can't convert between const_iterator to iterator otherwise...
-    wxStringToStringHashMap& headers = (wxStringToStringHashMap&)m_headers;
+    wxHeaderIterator it = m_headers.begin();
+    for ( wxHeaderIterator en = m_headers.end(); it != en; ++it )
+    {
+        if ( wxStricmp(it->first, header) == 0 )
+            break;
+    }
+
+    return it;
+}

 
 

-    wxHeaderIterator it = headers.begin();
-    for ( wxHeaderIterator en = headers.end(); it != en; ++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;
     {
         if ( wxStricmp(it->first, header) == 0 )
             break;


@@ -89,7 +99,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {
     ClearHeaders();
 {
   if (m_read) {
     ClearHeaders();

-    m_read = FALSE;
+    m_read = false;

   }
 
   wxHeaderIterator it = FindHeader(header);
   }
 
   wxHeaderIterator it = FindHeader(header);


@@ -101,7 +111,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 
 wxString wxHTTP::GetHeader(const wxString& header) const
 {
 
 wxString wxHTTP::GetHeader(const wxString& header) const
 {

-    wxHeaderIterator it = FindHeader(header);
+    wxHeaderConstIterator it = FindHeader(header);

 
     return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }
 
     return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }


@@ -131,11 +141,11 @@ bool wxHTTP::ParseHeaders()
   wxStringTokenizer tokenzr;
 
   ClearHeaders();
   wxStringTokenizer tokenzr;
 
   ClearHeaders();

-  m_read = TRUE;
+  m_read = true;

 
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)
 
 #if defined(__VISAGECPP__)
 // VA just can't stand while(1)

-    bool bOs2var = TRUE;
+    bool bOs2var = true;

     while(bOs2var)
 #else
   while (1)
     while(bOs2var)
 #else
   while (1)


@@ -143,7 +153,7 @@ bool wxHTTP::ParseHeaders()
   {
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
   {
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)

-      return FALSE;
+      return false;

 
     if (line.Length() == 0)
       break;
 
     if (line.Length() == 0)
       break;


@@ -151,7 +161,7 @@ bool wxHTTP::ParseHeaders()
     wxString left_str = line.BeforeFirst(':');
     m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
   }
     wxString left_str = line.BeforeFirst(':');
     m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
   }

-  return TRUE;
+  return true;

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


@@ -170,7 +180,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
     delete m_addr;
     m_addr = NULL;
     m_perr = wxPROTO_NETERR;
     delete m_addr;
     m_addr = NULL;
     m_perr = wxPROTO_NETERR;

-    return FALSE;
+    return false;

   }
 
   if ( port ) addr->Service(port);
   }
 
   if ( port ) addr->Service(port);


@@ -179,7 +189,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
 
   SetHeader(wxT("Host"), host);
 
 
   SetHeader(wxT("Host"), host);
 

-  return TRUE;
+  return true;

 }
 
 bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 }
 
 bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))


@@ -195,7 +205,7 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
   if (ipv4addr)
       SetHeader(wxT("Host"), ipv4addr->OrigHostname());
 
   if (ipv4addr)
       SetHeader(wxT("Host"), ipv4addr->OrigHostname());
 

-  return TRUE;
+  return true;

 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)


@@ -208,18 +218,26 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     break;
   case wxHTTP_POST:
     request = wxT("POST");
     break;
   case wxHTTP_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:
     break;
   default:

-    return FALSE;
+    return false;

   }
 
   }
 

+  m_http_response = 0;
+

   // If there is no User-Agent defined, define it.
   if (GetHeader(wxT("User-Agent")).IsNull())
   // 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();
 
   SaveState();

-  SetFlags(wxSOCKET_NONE);
-  Notify(FALSE);
+#if wxUSE_THREADS
+  SetFlags( wxThread::IsMain() ? wxSOCKET_NONE : wxSOCKET_BLOCK );
+#else
+  SetFlags( wxSOCKET_NONE );
+#endif
+  Notify(false);

 
   wxString buf;
   buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
 
   wxString buf;
   buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());


@@ -229,7 +247,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   Write("\r\n", 2);
 
   if ( req == wxHTTP_POST ) {
   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;
   }
 
     m_post_buf = wxEmptyString;
   }
 


@@ -237,7 +255,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();
   m_perr = GetLine(this, tmp_str);
   if (m_perr != wxPROTO_NOERR) {
     RestoreState();

-    return FALSE;
+    return false;

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


@@ -246,7 +264,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     SetHeader(wxT("Content-Length"), wxT("-1"));
     SetHeader(wxT("Content-Type"), wxT("none/none"));
     RestoreState();
     SetHeader(wxT("Content-Length"), wxT("-1"));
     SetHeader(wxT("Content-Type"), wxT("none/none"));
     RestoreState();

-    return TRUE;
+    return true;

   }
 
   wxStringTokenizer token(tmp_str,wxT(' '));
   }
 
   wxStringTokenizer token(tmp_str,wxT(' '));


@@ -256,6 +274,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 */


@@ -269,7 +289,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   default:
     m_perr = wxPROTO_NOFILE;
     RestoreState();
   default:
     m_perr = wxPROTO_NOFILE;
     RestoreState();

-    return FALSE;
+    return false;

   }
 
   ret_value = ParseHeaders();
   }
 
   ret_value = ParseHeaders();


@@ -323,9 +343,9 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   if (!m_addr)
     return NULL;
 
   if (!m_addr)
     return NULL;
 

-  // We set m_connected back to FALSE so wxSocketBase will know what to do.
+  // We set m_connected back to false so wxSocketBase will know what to do.

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-        wxSocketClient::Connect(*m_addr , FALSE );
+        wxSocketClient::Connect(*m_addr , false );

         wxSocketClient::WaitOnConnect(10);
 
     if (!wxSocketClient::IsConnected())
         wxSocketClient::WaitOnConnect(10);
 
     if (!wxSocketClient::IsConnected())


@@ -347,7 +367,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 
   inp_stream->m_read_bytes = 0;
 
 
   inp_stream->m_read_bytes = 0;
 

-  Notify(FALSE);
+  Notify(false);

   SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
   return inp_stream;
   SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
   return inp_stream;