cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced a static buffer with wxString

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-11-02 16:43:28 +00:00
parent 4660d7e5d6
commit 02244615e5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/http.cpp
View File

@ -147,8 +147,8 @@ bool wxHTTP::ParseHeaders()
if (line.Length() == 0) if (line.Length() == 0)
break; break;
wxString left_str = line.BeforeFirst(':'); wxString left_str = line.BeforeFirst(':');
wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both)); wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
left_str.MakeUpper(); left_str.MakeUpper();
m_headers.Append(left_str, (wxObject *) str); 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) bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
{ {
wxChar *tmp_buf; 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) { switch (req) {
case wxHTTP_GET: case wxHTTP_GET:
@ -211,16 +205,22 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
return FALSE; 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(); SaveState();
SetFlags(wxSOCKET_NONE); SetFlags(wxSOCKET_NONE);
Notify(FALSE); 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); const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf)); Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
SendHeaders(); SendHeaders();
Write("\r\n", 2); Write("\r\n", 2);
wxString tmp_str;
m_perr = GetLine(this, tmp_str); m_perr = GetLine(this, tmp_str);
if (m_perr != wxPROTO_NOERR) { if (m_perr != wxPROTO_NOERR) {
RestoreState(); RestoreState();
@ -243,7 +243,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
token.NextToken(); token.NextToken();
tmp_str2 = token.NextToken(); tmp_str2 = token.NextToken();
switch (tmp_str2[(unsigned int) 0]) { switch (tmp_str2[0u]) {
case wxT('1'): case wxT('1'):
/* INFORMATION / SUCCESS */ /* INFORMATION / SUCCESS */
break; break;