#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE)
+IMPLEMENT_PROTOCOL(wxHTTP, T("http"), T("80"), TRUE)
#endif
#define HTTP_BSIZE 2048
{
m_addr = NULL;
m_read = FALSE;
+ m_proxy_mode = FALSE;
- SetNotify(REQ_LOST);
+ SetNotify(GSOCK_LOST_FLAG);
}
wxHTTP::~wxHTTP()
wxString wxHTTP::GetContentType()
{
- return GetHeader(_T("Content-Type"));
+ return GetHeader(T("Content-Type"));
+}
+
+void wxHTTP::SetProxyMode(bool on)
+{
+ m_proxy_mode = on;
}
void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
wxString wxHTTP::GetHeader(const wxString& header)
{
- wxNode *node = m_headers.Find(header);
+ wxNode *node;
+ wxString upper_header;
+
+ upper_header = header.Upper();
+
+ node = m_headers.Find(upper_header);
if (!node)
return wxEmptyString;
wxString *str = (wxString *)head->Data();
wxString buf;
- buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
+ buf.Printf(T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
const wxWX2MBbuf cbuf = buf.mb_str();
Write(cbuf, strlen(cbuf));
m_read = TRUE;
while (1) {
- m_error = GetLine(this, line);
- if (m_error != wxPROTO_NOERR)
+ m_perr = GetLine(this, line);
+ if (m_perr != wxPROTO_NOERR)
return FALSE;
if (line.Length() == 0)
wxString left_str = tokenzr.GetNextToken();
wxString *str = new wxString(tokenzr.GetNextToken());
+ left_str.MakeUpper();
+
m_headers.Append(left_str, (wxObject *) str);
}
return TRUE;
{
wxIPV4address *addr;
- if (m_connected) {
+ if (m_addr) {
delete m_addr;
m_addr = NULL;
Close();
if (!addr->Hostname(host)) {
delete m_addr;
m_addr = NULL;
- m_error = wxPROTO_NETERR;
+ m_perr = wxPROTO_NETERR;
return FALSE;
}
- if (!addr->Service(_T("http")))
+ if (!addr->Service(T("http")))
addr->Service(80);
return TRUE;
bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
{
- struct sockaddr *raw_addr;
- size_t len;
-
- m_addr = (wxSockAddress *)(addr.GetClassInfo()->CreateObject());
-
- addr.Build(raw_addr, len);
- m_addr->Disassemble(raw_addr, len);
+ if (m_addr) {
+ delete m_addr;
+ m_addr = NULL;
+ Close();
+ }
+ m_addr = (wxSockAddress *) addr.Clone();
return TRUE;
}
bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
{
wxChar *tmp_buf;
- wxChar buf[200];
- wxWX2MBbuf pathbuf(200);
- wxString tmp_str;
+ wxChar buf[200]; // 200 is arbitrary.
+ wxString tmp_str = path;
+
+ // If there is no User-Agent defined, define it.
+ if (GetHeader(T("User-Agent")).IsNull())
+ SetHeader(T("User-Agent"), T("wxWindows 2.x"));
switch (req) {
case wxHTTP_GET:
- tmp_buf = _T("GET");
+ tmp_buf = T("GET");
break;
default:
return FALSE;
SetFlags(NONE);
Notify(FALSE);
- 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));
+ wxSprintf(buf, T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData());
+ const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
+ Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));
SendHeaders();
Write("\n\r", 2);
- m_error = GetLine(this, tmp_str);
- if (m_error != wxPROTO_NOERR) {
+ m_perr = GetLine(this, tmp_str);
+ if (m_perr != wxPROTO_NOERR) {
RestoreState();
return FALSE;
}
- if (!tmp_str.Contains(_T("HTTP/"))) {
+ if (!tmp_str.Contains(T("HTTP/"))) {
// TODO: support HTTP v0.9 which can have no header.
- SetHeader(_T("Content-Length"), _T("-1"));
- SetHeader(_T("Content-Type"), _T("none/none"));
+ // FIXME: tmp_str is not put back in the in-queue of the socket.
+ SetHeader(T("Content-Length"), T("-1"));
+ SetHeader(T("Content-Type"), T("none/none"));
RestoreState();
return TRUE;
}
- wxStringTokenizer token(tmp_str,_T(' '));
+ wxStringTokenizer token(tmp_str,T(' '));
wxString tmp_str2;
bool ret_value;
token.NextToken();
tmp_str2 = token.NextToken();
- switch (wxAtoi(tmp_str2)) {
- case 200:
+ switch (tmp_str2[(unsigned int) 0]) {
+ case T('1'):
+ /* INFORMATION / SUCCESS */
+ break;
+ case T('2'):
+ /* SUCCESS */
+ break;
+ case T('3'):
+ /* REDIRECTION */
break;
default:
- m_error = wxPROTO_NOFILE;
+ m_perr = wxPROTO_NOFILE;
RestoreState();
return FALSE;
}
public:
wxHTTP *m_http;
size_t m_httpsize;
+ unsigned long m_read_bytes;
wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
- size_t StreamSize() const { return m_httpsize; }
+ size_t GetSize() const { return m_httpsize; }
virtual ~wxHTTPStream(void) { m_http->Abort(); }
+
+protected:
+ size_t OnSysRead(void *buffer, size_t bufsize);
};
+size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
+{
+ size_t ret;
+
+ if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
+ return 0;
+
+ ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
+ m_read_bytes += ret;
+
+ return ret;
+}
+
bool wxHTTP::Abort(void)
{
- return wxSocketClient::Close();
+ bool ret;
+
+ ret = wxSocketClient::Close();
+
+ return ret;
}
wxInputStream *wxHTTP::GetInputStream(const wxString& path)
{
wxHTTPStream *inp_stream = new wxHTTPStream(this);
+ wxString new_path;
- if (!m_addr || m_connected) {
- m_error = wxPROTO_CONNERR;
+ m_perr = wxPROTO_CONNERR;
+ if (!m_addr)
return NULL;
- }
+ // We set m_connected back to FALSE so wxSocketBase will know what to do.
if (!wxProtocol::Connect(*m_addr))
return NULL;
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")));
+ if (!GetHeader(T("Content-Length")).IsEmpty())
+ inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(T("Content-Length")));
+ else
+ inp_stream->m_httpsize = (size_t)-1;
+
+ inp_stream->m_read_bytes = 0;
+
+ Notify(FALSE);
+ SetFlags(SPEED | WAITALL);
- SetFlags(WAITALL);
return inp_stream;
}
projects / wxWidgets.git / blobdiff