X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..56fae7b8f5671814fdb2cdc9ae79dbecf078c68d:/src/common/http.cpp diff --git a/src/common/http.cpp b/src/common/http.cpp index 81318deed8..346896925a 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -6,7 +6,7 @@ // Created: August 1997 // RCS-ID: $Id$ // Copyright: (c) 1997, 1998 Guilhem Lavaux -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -90,7 +90,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data) wxNode *node = m_headers.Find(header); if (!node) - m_headers.Append(header, (wxObject *)(new wxString(h_data))); + m_headers.Append(header.Upper(), (wxObject *)(new wxString(h_data))); else { wxString *str = (wxString *)node->GetData(); (*str) = h_data; @@ -293,15 +293,16 @@ protected: size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize) { - size_t ret; + if (m_httpsize > 0 && m_read_bytes >= m_httpsize) + { + m_lasterror = wxSTREAM_EOF; + return 0; + } - if (m_httpsize > 0 && m_read_bytes >= m_httpsize) - return 0; + size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize); + m_read_bytes += ret; - ret = wxSocketInputStream::OnSysRead(buffer, bufsize); - m_read_bytes += ret; - - return ret; + return ret; } bool wxHTTP::Abort(void)