/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "http.h"
+ #pragma implementation "http.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#endif
+#if wxUSE_SOCKETS
#include <stdio.h>
#include <stdlib.h>
#include "wx/tokenzr.h"
#include "wx/socket.h"
#include "wx/protocol/protocol.h"
+#include "wx/url.h"
#include "wx/protocol/http.h"
#include "wx/sckstrm.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE)
+IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE)
#endif
#define HTTP_BSIZE 2048
wxString wxHTTP::GetContentType()
{
- return GetHeader("Content-Type");
+ return GetHeader(_T("Content-Type"));
}
void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
{
wxNode *node = m_headers.Find(header);
if (!node)
- return (char *)NULL;
+ return wxEmptyString;
return *((wxString *)node->Data());
}
wxString *str = (wxString *)head->Data();
wxString buf;
- buf.Printf("%s: %s\n\r", head->GetKeyString(), str->GetData());
+ buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
- Write(buf, buf.Len());
+ const wxWX2MBbuf cbuf = buf.mb_str();
+ Write(cbuf, strlen(cbuf));
head = head->Next();
}
bool wxHTTP::ParseHeaders()
{
wxString line;
+ wxStringTokenizer tokenzr;
m_headers.Clear();
m_read = TRUE;
if (line.Length() == 0)
break;
- int pos = line.Find(':');
- if (pos == -1)
+ tokenzr.SetString(line, " :\t\n\r");
+ if (!tokenzr.HasMoreTokens())
return FALSE;
- wxString left_str = line(0, pos);
- wxString right_str = line(pos+1, line.Length());
-
- right_str = right_str.Strip(wxString::leading);
-
- wxString *str = new wxString(right_str);
+ wxString left_str = tokenzr.GetNextToken();
+ wxString *str = new wxString(tokenzr.GetNextToken());
m_headers.Append(left_str, (wxObject *) str);
}
return FALSE;
}
- if (!addr->Service("http"))
+ if (!addr->Service(_T("http")))
addr->Service(80);
return TRUE;
bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
{
- char *tmp_buf;
- char buf[HTTP_BSIZE];
+ wxChar *tmp_buf;
+ wxChar buf[200];
+ wxWX2MBbuf pathbuf(200);
+ wxString tmp_str;
switch (req) {
case wxHTTP_GET:
- tmp_buf = "GET";
+ tmp_buf = _T("GET");
break;
default:
return FALSE;
}
- sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char *)path);
- Write(buf, strlen(buf));
- SendHeaders();
- sprintf(buf, "\n\r");
- Write(buf, strlen(buf));
+ SaveState();
+ SetFlags(NONE);
+ Notify(FALSE);
- wxString tmp_str;
+ tmp_str = wxURL::ConvertToValidURI(path);
+ wxSprintf(buf, _T("%s %s\n\r"), tmp_buf, tmp_str.GetData());
+ pathbuf = wxConvLibc.cWX2MB(buf);
+ Write(pathbuf, strlen(pathbuf));
+ SendHeaders();
+ Write("\n\r", 2);
m_error = GetLine(this, tmp_str);
- if (m_error != wxPROTO_NOERR)
+ if (m_error != wxPROTO_NOERR) {
+ RestoreState();
return FALSE;
+ }
- if (!tmp_str.Contains("HTTP/")) {
+ if (!tmp_str.Contains(_T("HTTP/"))) {
// TODO: support HTTP v0.9 which can have no header.
- SetHeader("Content-Length", "-1");
- SetHeader("Content-Type", "none/none");
+ SetHeader(_T("Content-Length"), _T("-1"));
+ SetHeader(_T("Content-Type"), _T("none/none"));
+ RestoreState();
return TRUE;
}
- wxStringTokenizer token(tmp_str,' ');
+ wxStringTokenizer token(tmp_str,_T(' '));
wxString tmp_str2;
+ bool ret_value;
token.NextToken();
tmp_str2 = token.NextToken();
- switch (atoi(tmp_str2)) {
+ switch (wxAtoi(tmp_str2)) {
case 200:
break;
default:
m_error = wxPROTO_NOFILE;
+ RestoreState();
return FALSE;
}
- return ParseHeaders();
+ ret_value = ParseHeaders();
+ RestoreState();
+ return ret_value;
}
class wxHTTPStream : public wxSocketInputStream {
public:
wxHTTP *m_http;
+ size_t m_httpsize;
+
wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
+ size_t StreamSize() const { return m_httpsize; }
virtual ~wxHTTPStream(void) { m_http->Abort(); }
};
if (!BuildRequest(path, wxHTTP_GET))
return NULL;
+ wxPrintf(_T("Len = %s\n"), WXSTRINGCAST GetHeader(_T("Content-Length")));
+ if (!GetHeader(_T("Content-Length")).IsEmpty())
+ inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length")));
+
+ SetFlags(WAITALL);
return inp_stream;
}
+
+#endif
+ // wxUSE_SOCKETS