#pragma hdrstop
#endif
-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP
#include <stdio.h>
#include <stdlib.h>
#include "wx/protocol/http.h"
#include "wx/sckstrm.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, T("http"), T("80"), TRUE)
-#endif
+IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), TRUE)
#define HTTP_BSIZE 2048
m_read = FALSE;
m_proxy_mode = FALSE;
- SetNotify(GSOCK_LOST_FLAG);
+ SetNotify(wxSOCKET_LOST_FLAG);
}
wxHTTP::~wxHTTP()
+{
+ ClearHeaders();
+
+ delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()
{
// wxString isn't a wxObject
wxNode *node = m_headers.First();
delete string;
node = node->Next();
}
+
+ m_headers.Clear();
}
wxString wxHTTP::GetContentType()
{
- return GetHeader(T("Content-Type"));
+ return GetHeader(wxT("Content-Type"));
}
void wxHTTP::SetProxyMode(bool on)
void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
{
if (m_read) {
- m_headers.Clear();
+ ClearHeaders();
m_read = FALSE;
}
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(wxT("%s: %s\r\n"), head->GetKeyString(), str->GetData());
const wxWX2MBbuf cbuf = buf.mb_str();
Write(cbuf, strlen(cbuf));
wxString line;
wxStringTokenizer tokenzr;
- m_headers.Clear();
+ ClearHeaders();
m_read = TRUE;
- while (1) {
+#if defined(__VISAGECPP__)
+// VA just can't stand while(1)
+ bool bOs2var = TRUE;
+ while(bOs2var) {
+#else
+ while (1) {
+#endif
m_perr = GetLine(this, line);
if (m_perr != wxPROTO_NOERR)
return FALSE;
if (line.Length() == 0)
break;
- tokenzr.SetString(line, " :\t\n\r");
- if (!tokenzr.HasMoreTokens())
- return FALSE;
-
- wxString left_str = tokenzr.GetNextToken();
- wxString *str = new wxString(tokenzr.GetNextToken());
-
+ wxString left_str = line.BeforeFirst(':');
+ wxString *str = new wxString(line.AfterFirst(':').Strip(wxString::both));
left_str.MakeUpper();
m_headers.Append(left_str, (wxObject *) str);
return FALSE;
}
- if (!addr->Service(T("http")))
+ if (!addr->Service(wxT("http")))
addr->Service(80);
+
+ SetHeader(wxT("Host"), host);
return TRUE;
}
{
if (m_addr) {
delete m_addr;
- m_addr = NULL;
Close();
}
- m_addr = (wxSockAddress *) addr.Clone();
+ m_addr = addr.Clone();
+
+ wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
+ if (ipv4addr)
+ SetHeader(wxT("Host"), ipv4addr->Hostname());
+
return TRUE;
}
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(T("User-Agent")).IsNull())
- SetHeader(T("User-Agent"), T("wxWindows 2.x"));
switch (req) {
case wxHTTP_GET:
- tmp_buf = T("GET(");
+ tmp_buf = wxT("GET");
break;
default:
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(NONE);
+ SetFlags(wxSOCKET_NONE);
Notify(FALSE);
- wxSprintf(buf, T("%s %s HTTP/1.0\n\r"), 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("\n\r", 2);
+ Write("\r\n", 2);
+ wxString tmp_str;
m_perr = GetLine(this, tmp_str);
if (m_perr != wxPROTO_NOERR) {
RestoreState();
return FALSE;
}
- if (!tmp_str.Contains(T("HTTP/"))) {
+ if (!tmp_str.Contains(wxT("HTTP/"))) {
// TODO: support HTTP v0.9 which can have no header.
// 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"));
+ SetHeader(wxT("Content-Length"), wxT("-1"));
+ SetHeader(wxT("Content-Type"), wxT("none/none"));
RestoreState();
return TRUE;
}
- wxStringTokenizer token(tmp_str,T(' '));
+ wxStringTokenizer token(tmp_str,wxT(' '));
wxString tmp_str2;
bool ret_value;
token.NextToken();
tmp_str2 = token.NextToken();
- switch (tmp_str2[(unsigned int) 0]) {
- case T('1'):
+ switch (tmp_str2[0u]) {
+ case wxT('1'):
/* INFORMATION / SUCCESS */
break;
- case T('2'):
+ case wxT('2'):
/* SUCCESS */
break;
- case T('3'):
+ case wxT('3'):
/* REDIRECTION */
break;
default:
return ret_value;
}
-class wxHTTPStream : public wxSocketInputStream {
+class wxHTTPStream : public wxSocketInputStream
+{
public:
wxHTTP *m_http;
size_t m_httpsize;
bool wxHTTP::Abort(void)
{
- bool ret;
-
- ret = wxSocketClient::Close();
-
- return ret;
+ return wxSocketClient::Close();
}
wxInputStream *wxHTTP::GetInputStream(const wxString& path)
{
- wxHTTPStream *inp_stream = new wxHTTPStream(this);
+ wxHTTPStream *inp_stream;
+
wxString new_path;
m_perr = wxPROTO_CONNERR;
return NULL;
// We set m_connected back to FALSE so wxSocketBase will know what to do.
+#ifdef __WXMAC__
+ wxSocketClient::Connect(*m_addr , FALSE );
+ wxSocketClient::WaitOnConnect(10);
+
+ if (!wxSocketClient::IsConnected())
+ return NULL;
+#else
if (!wxProtocol::Connect(*m_addr))
return NULL;
+#endif
if (!BuildRequest(path, wxHTTP_GET))
return NULL;
- if (!GetHeader(T("Content-Length")).IsEmpty())
- inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(T("Content-Length")));
+ inp_stream = new wxHTTPStream(this);
+
+ if (!GetHeader(wxT("Content-Length")).IsEmpty())
+ inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length")));
else
inp_stream->m_httpsize = (size_t)-1;
inp_stream->m_read_bytes = 0;
Notify(FALSE);
- SetFlags(SPEED | WAITALL);
+ SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
return inp_stream;
}
-#endif
- // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
+
projects / wxWidgets.git / blobdiff