wxSocekt now uses wxPostEvent.

[wxWidgets.git] / src / common / http.cpp

diff --git a/src/common/http.cpp b/src/common/http.cpp
index cb194e82d39564ebadb794ab80a7281a6d7802e6..26820e2f02a81f9acc36edd896ce2bc7447a28c8 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -32,10 +32,8 @@
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 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
 
 
 #define HTTP_BSIZE 2048
 


@@ -45,6 +43,7 @@ wxHTTP::wxHTTP()
 {
   m_addr = NULL;
   m_read = FALSE;
 {
   m_addr = NULL;
   m_read = FALSE;

+  m_proxy_mode = FALSE;

 
   SetNotify(GSOCK_LOST_FLAG);
 }
 
   SetNotify(GSOCK_LOST_FLAG);
 }


@@ -64,7 +63,12 @@ wxHTTP::~wxHTTP()
 
 wxString wxHTTP::GetContentType()
 {
 
 wxString wxHTTP::GetContentType()
 {

-  return GetHeader(_T("Content-Type"));
+  return GetHeader(wxT("Content-Type"));
+}
+
+void wxHTTP::SetProxyMode(bool on)
+{
+  m_proxy_mode = on;

 }
 
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 }
 
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)


@@ -86,7 +90,12 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 
 wxString wxHTTP::GetHeader(const wxString& header)
 {
 
 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;
 
   if (!node)
     return wxEmptyString;
 


@@ -102,7 +111,7 @@ void wxHTTP::SendHeaders()
     wxString *str = (wxString *)head->Data();
 
     wxString buf;
     wxString *str = (wxString *)head->Data();
 
     wxString buf;

-    buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
+    buf.Printf(wxT("%s: %s\n\r"), head->GetKeyString(), str->GetData());

 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));


@@ -119,7 +128,13 @@ bool wxHTTP::ParseHeaders()
   m_headers.Clear();
   m_read = TRUE;
 
   m_headers.Clear();
   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;
     m_perr = GetLine(this, line);
     if (m_perr != wxPROTO_NOERR)
       return FALSE;


@@ -134,6 +149,8 @@ bool wxHTTP::ParseHeaders()
     wxString left_str = tokenzr.GetNextToken();
     wxString *str = new wxString(tokenzr.GetNextToken());
 
     wxString left_str = tokenzr.GetNextToken();
     wxString *str = new wxString(tokenzr.GetNextToken());
 

+    left_str.MakeUpper();
+

     m_headers.Append(left_str, (wxObject *) str);
   }
   return TRUE;
     m_headers.Append(left_str, (wxObject *) str);
   }
   return TRUE;


@@ -143,7 +160,7 @@ bool wxHTTP::Connect(const wxString& host)
 {
   wxIPV4address *addr;
 
 {
   wxIPV4address *addr;
 

-  if (m_connected) {
+  if (m_addr) {

     delete m_addr;
     m_addr = NULL;
     Close();
     delete m_addr;
     m_addr = NULL;
     Close();


@@ -158,7 +175,7 @@ bool wxHTTP::Connect(const wxString& host)
     return FALSE;
   }
 
     return FALSE;
   }
 

-  if (!addr->Service(_T("http")))
+  if (!addr->Service(wxT("http")))

     addr->Service(80);
 
   return TRUE;
     addr->Service(80);
 
   return TRUE;


@@ -180,16 +197,15 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
   wxChar *tmp_buf;
   wxChar buf[200]; // 200 is arbitrary.
 {
   wxChar *tmp_buf;
   wxChar buf[200]; // 200 is arbitrary.

-#if wxUNICODE
-  wxWX2MBbuf pathbuf((size_t)200);
-#else
-  const wxWX2MBbuf pathbuf;
-#endif
-  wxString tmp_str;
+  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:
 
   switch (req) {
   case wxHTTP_GET:

-    tmp_buf = _T("GET");
+    tmp_buf = wxT("GET");

     break;
   default:
     return FALSE;
     break;
   default:
     return FALSE;


@@ -199,10 +215,9 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   SetFlags(NONE);
   Notify(FALSE);
 
   SetFlags(NONE);
   Notify(FALSE);
 

-  tmp_str = wxURL::ConvertToValidURI(path);
-  wxSprintf(buf, _T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData());
-  pathbuf = wxConvLibc.cWX2MB(buf);
-  Write(pathbuf, strlen(MBSTRINGCAST pathbuf));
+  wxSprintf(buf, wxT("%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);
 
   SendHeaders();
   Write("\n\r", 2);
 


@@ -212,23 +227,31 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     return FALSE;
   }
 
     return FALSE;
   }
 

-  if (!tmp_str.Contains(_T("HTTP/"))) {
+  if (!tmp_str.Contains(wxT("HTTP/"))) {

     // TODO: support HTTP v0.9 which can have no header.
     // 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(wxT("Content-Length"), wxT("-1"));
+    SetHeader(wxT("Content-Type"), wxT("none/none"));

     RestoreState();
     return TRUE;
   }
 
     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();
 
   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 wxT('1'):
+    /* INFORMATION / SUCCESS */
+    break;
+  case wxT('2'):
+    /* SUCCESS */
+    break;
+  case wxT('3'):
+    /* REDIRECTION */

     break;
   default:
     m_perr = wxPROTO_NOFILE;
     break;
   default:
     m_perr = wxPROTO_NOFILE;


@@ -248,7 +271,7 @@ public:
   unsigned long m_read_bytes;
 
   wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
   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:
   virtual ~wxHTTPStream(void) { m_http->Abort(); }
 
 protected:


@@ -270,32 +293,38 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 
 bool wxHTTP::Abort(void)
 {
 
 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);
 }
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
   wxHTTPStream *inp_stream = new wxHTTPStream(this);

+  wxString new_path;

 
 

-  if (!m_addr || m_connected) {
-    m_perr = wxPROTO_CONNERR;
+  m_perr = wxPROTO_CONNERR;
+  if (!m_addr)

     return NULL;
     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;
 
   if (!wxProtocol::Connect(*m_addr))
     return NULL;
 
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 

-  if (!GetHeader(_T("Content-Length")).IsEmpty())
-    inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length")));
+  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);
   else
     inp_stream->m_httpsize = (size_t)-1;
 
   inp_stream->m_read_bytes = 0;
 
   Notify(FALSE);

+  SetFlags(SPEED | WAITALL);

 
   return inp_stream;
 }
 
   return inp_stream;
 }