X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcc6dddd1f1da49f94767ff148eaa3f1d3ca9367..f9b1708cf57d57bc91f4e870a4646efd1f174c3d:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index dd848b7a05..80c8bf09e8 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -52,7 +52,7 @@ wxHTTP::wxHTTP() wxHTTP::~wxHTTP() { // wxString isn't a wxObject - wxNode *node = m_headers.First(); + wxNode *node = m_headers.First(); wxString *string; while (node) { @@ -88,7 +88,7 @@ wxString wxHTTP::GetHeader(const wxString& header) { wxNode *node = m_headers.Find(header); if (!node) - return (char *)NULL; + return wxEmptyString; return *((wxString *)node->Data()); } @@ -97,12 +97,14 @@ void wxHTTP::SendHeaders() { wxNode *head = m_headers.First(); - while (head) { + while (head) + { wxString *str = (wxString *)head->Data(); - char buf[100]; - sprintf(buf, "%s: %s\n\r", head->key.string, str->GetData()); - Write(buf, strlen(buf)); + wxString buf; + buf.Printf("%s: %s\n\r", head->GetKeyString(), str->GetData()); + + Write(buf, buf.Len()); head = head->Next(); } @@ -164,7 +166,7 @@ bool wxHTTP::Connect(const wxString& host) return TRUE; } -bool wxHTTP::Connect(wxSockAddress& addr) +bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) { struct sockaddr *raw_addr; size_t len;