m_addr = NULL;
m_read = false;
m_proxy_mode = false;
- m_post_buf = wxEmptyString;
m_http_response = 0;
SetNotify(wxSOCKET_LOST_FLAG);
void wxHTTP::SetPostBuffer(const wxString& post_buf)
{
- m_post_buf = post_buf;
+ // Use To8BitData() for backwards compatibility in this deprecated method.
+ // The new code should use the other overload or SetPostText() and specify
+ // the encoding to use for the text explicitly.
+ wxScopedCharBuffer scb = post_buf.To8BitData();
+ if ( scb.length() )
+ {
+ m_postBuffer.Clear();
+ m_postBuffer.AppendData(scb.data(), scb.length());
+ }
+}
+
+bool
+wxHTTP::SetPostBuffer(const wxString& contentType,
+ const wxMemoryBuffer& data)
+{
+ m_postBuffer = data;
+ m_contentType = contentType;
+
+ return !m_postBuffer.IsEmpty();
+}
+
+bool
+wxHTTP::SetPostText(const wxString& contentType,
+ const wxString& data,
+ const wxMBConv& conv)
+{
+#if wxUSE_UNICODE
+ wxScopedCharBuffer scb = data.mb_str(conv);
+ const size_t len = scb.length();
+ const char* const buf = scb.data();
+#else // !wxUSE_UNICODE
+ const size_t len = data.length();
+ const char* const buf = data.mb_str(conv);
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+
+ if ( !len )
+ return false;
+
+ m_postBuffer.Clear();
+ m_postBuffer.AppendData(buf, len);
+ m_contentType = contentType;
+
+ return true;
}
void wxHTTP::SendHeaders()
case wxHTTP_POST:
request = wxT("POST");
- if ( GetHeader( wxT("Content-Length") ).empty() )
- SetHeader( wxT("Content-Length"), wxString::Format( wxT("%lu"), (unsigned long)m_post_buf.Len() ) );
+ // Content length must be correct, so always set, possibly
+ // overriding the value set explicitly by a previous call to
+ // SetHeader("Content-Length").
+ if ( !m_postBuffer.IsEmpty() )
+ {
+ wxString len;
+ len << m_postBuffer.GetDataLen();
+
+ SetHeader(wxS("Content-Length"), len);
+ }
+
+ // However if the user had explicitly set the content type, don't
+ // override it with the content type passed to SetPostText().
+ if ( !m_contentType.empty() && GetContentType().empty() )
+ SetHeader(wxS("Content-Type"), m_contentType);
break;
default:
SaveState();
// we may use non blocking sockets only if we can dispatch events from them
- SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
- : wxSOCKET_BLOCK );
+ int flags = wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
+ : wxSOCKET_BLOCK;
+ // and we must use wxSOCKET_WAITALL to ensure that all data is sent
+ flags |= wxSOCKET_WAITALL;
+ SetFlags(flags);
Notify(false);
wxString buf;
Write("\r\n", 2);
if ( req == wxHTTP_POST ) {
- // 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;
+ if ( !m_postBuffer.IsEmpty() )
+ Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen());
+
+ m_postBuffer.Clear();
}
wxString tmp_str;
return NULL;
#endif
- if (!BuildRequest(path, m_post_buf.empty() ? wxHTTP_GET : wxHTTP_POST))
+ if (!BuildRequest(path, m_postBuffer.IsEmpty() ? wxHTTP_GET : wxHTTP_POST))
return NULL;
inp_stream = new wxHTTPStream(this);