Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index c4a6c05dce6bb59eb03d4f738f0d9a330a628bb0..e238364ece6c0d5fa72ac3609bae3f44ad5247e5 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -225,7 +225,7 @@ bool wxHTTP::ParseHeaders()
         if (m_lastError != wxPROTO_NOERR)
             return false;
 
-        if (line.length() == 0)
+        if ( line.empty() )
             break;
 
         wxString left_str = line.BeforeFirst(':');
@@ -251,16 +251,14 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
     wxIPV4address *addr;
 
     if (m_addr) {
-        delete m_addr;
-        m_addr = NULL;
+        wxDELETE(m_addr);
         Close();
     }
 
     m_addr = addr = new wxIPV4address();
 
     if (!addr->Hostname(host)) {
-        delete m_addr;
-        m_addr = NULL;
+        wxDELETE(m_addr);
         m_lastError = wxPROTO_NETERR;
         return false;
     }
@@ -314,7 +312,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 
         case wxHTTP_POST:
             request = wxT("POST");
-            if ( GetHeader( wxT("Content-Length") ).IsNull() )
+            if ( GetHeader( wxT("Content-Length") ).empty() )
                 SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
             break;
 
@@ -325,7 +323,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     m_http_response = 0;
 
     // If there is no User-Agent defined, define it.
-    if (GetHeader(wxT("User-Agent")).IsNull())
+    if ( GetHeader(wxT("User-Agent")).empty() )
         SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
     // Send authentication information
@@ -348,7 +346,17 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     Write("\r\n", 2);
 
     if ( req == wxHTTP_POST ) {
-        Write(m_post_buf.mbc_str(), m_post_buf.Len());
+        // Post data can be arbitrary binary data when the "binary" content
+        // transfer encoding is used so don't assume it's ASCII only or
+        // NUL-terminated.
+        {
+            const wxScopedCharBuffer buf(m_post_buf.To8BitData());
+            Write(buf, buf.length());
+        } // delete the buffer before modifying the string it points to, it
+          // wouldn't really be a problem here even if we didn't do this
+          // because we won't use this buffer again but this will avoid any
+          // nasty surprises in the future if this code changes
+
         m_post_buf = wxEmptyString;
     }