From 02244615e5bd44e22d2b338c94c610c9ad046de2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 2 Nov 2001 16:43:28 +0000 Subject: [PATCH] replaced a static buffer with wxString git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/http.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/common/http.cpp b/src/common/http.cpp index 52f6e362c7..4bcfd76870 100644 --- a/src/common/http.cpp +++ b/src/common/http.cpp @@ -147,8 +147,8 @@ bool wxHTTP::ParseHeaders() if (line.Length() == 0) break; - wxString left_str = line.BeforeFirst(':'); - wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both)); + wxString left_str = line.BeforeFirst(':'); + wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both)); left_str.MakeUpper(); m_headers.Append(left_str, (wxObject *) str); @@ -196,12 +196,6 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait)) bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) { wxChar *tmp_buf; - wxChar buf[200]; // 200 is arbitrary. - wxString tmp_str = path; - - // If there is no User-Agent defined, define it. - if (GetHeader(wxT("User-Agent")).IsNull()) - SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x")); switch (req) { case wxHTTP_GET: @@ -211,16 +205,22 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) return FALSE; } + // If there is no User-Agent defined, define it. + if (GetHeader(wxT("User-Agent")).IsNull()) + SetHeader(wxT("User-Agent"), wxT("wxWindows 2.x")); + SaveState(); SetFlags(wxSOCKET_NONE); Notify(FALSE); - wxSprintf(buf, wxT("%s %s HTTP/1.0\r\n"), tmp_buf, tmp_str.GetData()); + wxString buf; + buf.Printf(wxT("%s %s HTTP/1.0\r\n"), tmp_buf, path.c_str()); const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf); Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf)); SendHeaders(); Write("\r\n", 2); + wxString tmp_str; m_perr = GetLine(this, tmp_str); if (m_perr != wxPROTO_NOERR) { RestoreState(); @@ -243,7 +243,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req) token.NextToken(); tmp_str2 = token.NextToken(); - switch (tmp_str2[(unsigned int) 0]) { + switch (tmp_str2[0u]) { case wxT('1'): /* INFORMATION / SUCCESS */ break; -- 2.45.2