Applied patch [ 678788 ] Dialog command event propagation problem

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index fe883d2e2248205296be9c07536a7d012a4e1358..81318deed86a5c53cfbb06af4a3b40530eb15e49 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -20,7 +20,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>


@@ -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
 


@@ -47,25 +45,34 @@ wxHTTP::wxHTTP()
   m_read = FALSE;
   m_proxy_mode = FALSE;
 
   m_read = FALSE;
   m_proxy_mode = FALSE;
 

-  SetNotify(GSOCK_LOST_FLAG);
+  SetNotify(wxSOCKET_LOST_FLAG);

 }
 
 wxHTTP::~wxHTTP()
 }
 
 wxHTTP::~wxHTTP()

+{
+    ClearHeaders();
+
+    delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()

 {
   // wxString isn't a wxObject
 {
   // wxString isn't a wxObject

-  wxNode *node = m_headers.First();
+  wxNode *node = m_headers.GetFirst();

   wxString *string;
 
   while (node) {
   wxString *string;
 
   while (node) {

-    string = (wxString *)node->Data();
+    string = (wxString *)node->GetData();

     delete string;
     delete string;

-    node = node->Next();
+    node = node->GetNext();

   }
   }

+
+  m_headers.Clear();

 }
 
 wxString wxHTTP::GetContentType()
 {
 }
 
 wxString wxHTTP::GetContentType()
 {

-  return GetHeader(_T("Content-Type"));
+  return GetHeader(wxT("Content-Type"));

 }
 
 void wxHTTP::SetProxyMode(bool on)
 }
 
 void wxHTTP::SetProxyMode(bool on)


@@ -76,7 +83,7 @@ void wxHTTP::SetProxyMode(bool on)
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {
 void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
 {
   if (m_read) {

-    m_headers.Clear();
+    ClearHeaders();

     m_read = FALSE;
   }
 
     m_read = FALSE;
   }
 


@@ -85,7 +92,7 @@ void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
   if (!node)
     m_headers.Append(header, (wxObject *)(new wxString(h_data)));
   else {
   if (!node)
     m_headers.Append(header, (wxObject *)(new wxString(h_data)));
   else {

-    wxString *str = (wxString *)node->Data();
+    wxString *str = (wxString *)node->GetData();

     (*str) = h_data;
   }
 }
     (*str) = h_data;
   }
 }


@@ -96,29 +103,29 @@ wxString wxHTTP::GetHeader(const wxString& header)
   wxString upper_header;
 
   upper_header = header.Upper();
   wxString upper_header;
 
   upper_header = header.Upper();

-  
+

   node = m_headers.Find(upper_header);
   if (!node)
     return wxEmptyString;
 
   node = m_headers.Find(upper_header);
   if (!node)
     return wxEmptyString;
 

-  return *((wxString *)node->Data());
+  return *((wxString *)node->GetData());

 }
 
 void wxHTTP::SendHeaders()
 {
 }
 
 void wxHTTP::SendHeaders()
 {

-  wxNode *head = m_headers.First();
+  wxNode *head = m_headers.GetFirst();

 
   while (head)
   {
 
   while (head)
   {

-    wxString *str = (wxString *)head->Data();
+    wxString *str = (wxString *)head->GetData();

 
     wxString buf;
 
     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));
 
 
     const wxWX2MBbuf cbuf = buf.mb_str();
     Write(cbuf, strlen(cbuf));
 

-    head = head->Next();
+    head = head->GetNext();

   }
 }
 
   }
 }
 


@@ -127,10 +134,16 @@ bool wxHTTP::ParseHeaders()
   wxString line;
   wxStringTokenizer tokenzr;
 
   wxString line;
   wxStringTokenizer tokenzr;
 

-  m_headers.Clear();
+  ClearHeaders();

   m_read = TRUE;
 
   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;


@@ -138,13 +151,8 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
     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);
     left_str.MakeUpper();
 
     m_headers.Append(left_str, (wxObject *) str);


@@ -171,9 +179,11 @@ bool wxHTTP::Connect(const wxString& host)
     return FALSE;
   }
 
     return FALSE;
   }
 

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

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

+  SetHeader(wxT("Host"), host);
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -181,61 +191,77 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
   if (m_addr) {
     delete m_addr;
 {
   if (m_addr) {
     delete m_addr;

-    m_addr = NULL;

     Close();
   }
 
     Close();
   }
 

-  m_addr = (wxSockAddress *) addr.Clone();
+  m_addr = addr.Clone();
+
+  wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
+  if (ipv4addr)
+      SetHeader(wxT("Host"), ipv4addr->OrigHostname());
+

   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {

-  wxChar *tmp_buf;
-  wxChar buf[200]; // 200 is arbitrary.
-  wxString tmp_str = path;
+  const wxChar *request;

 
   switch (req) {
   case wxHTTP_GET:
 
   switch (req) {
   case wxHTTP_GET:

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

     break;
   default:
     return FALSE;
   }
 
     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();
   SaveState();

-  SetFlags(NONE);
+  SetFlags(wxSOCKET_NONE);

   Notify(FALSE);
 
   Notify(FALSE);
 

-  wxSprintf(buf, _T("%s %s HTTP/1.0\n\r"), tmp_buf, tmp_str.GetData());
-  const wxWX2MBbuf pathbuf = wxConvLibc.cWX2MB(buf);
-  Write(pathbuf, strlen(MBSTRINGCAST pathbuf));
+  wxString buf;
+  buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
+  const wxWX2MBbuf pathbuf = wxConvLocal.cWX2MB(buf);
+  Write(pathbuf, strlen(wxMBSTRINGCAST pathbuf));

   SendHeaders();
   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;
   }
 
   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.
     // 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[0u]) {
+  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 +274,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   return ret_value;
 }
 
   return ret_value;
 }
 

-class wxHTTPStream : public wxSocketInputStream {
+class wxHTTPStream : public wxSocketInputStream
+{

 public:
   wxHTTP *m_http;
   size_t m_httpsize;
 public:
   wxHTTP *m_http;
   size_t m_httpsize;


@@ -260,6 +287,8 @@ public:
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);
 
 protected:
   size_t OnSysRead(void *buffer, size_t bufsize);

+
+    DECLARE_NO_COPY_CLASS(wxHTTPStream)

 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 };
 
 size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)


@@ -277,16 +306,13 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
 
 bool wxHTTP::Abort(void)
 {
 
 bool wxHTTP::Abort(void)
 {

-  bool ret, connected;
-
-  ret = wxSocketClient::Close();
-
-  return ret;
+  return wxSocketClient::Close();

 }
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
 }
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {

-  wxHTTPStream *inp_stream = new wxHTTPStream(this);
+  wxHTTPStream *inp_stream;
+

   wxString new_path;
 
   m_perr = wxPROTO_CONNERR;
   wxString new_path;
 
   m_perr = wxPROTO_CONNERR;


@@ -294,24 +320,34 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     return NULL;
 
   // We set m_connected back to FALSE so wxSocketBase will know what to do.
     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;
   if (!wxProtocol::Connect(*m_addr))
     return NULL;

+#endif

 
   if (!BuildRequest(path, wxHTTP_GET))
     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")));
+  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);
   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;
 }
 
 
   return inp_stream;
 }
 

-#endif
-   // wxUSE_SOCKETS
+#endif // wxUSE_PROTOCOL_HTTP
+