Explain reasoning behind using wxSIZE_FORCE_EVENT

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 5a185bf899c0a7e8a1e53e8b943fcbfffb74595b..da25a7828b236a208c0be98541538d78cdab9846 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -32,6 +32,12 @@
 #include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 #include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"

+#include "wx/thread.h"
+
+
+// ----------------------------------------------------------------------------
+// wxHTTP
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)
 
 IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
 IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)


@@ -57,10 +63,10 @@ wxHTTP::~wxHTTP()
 
 void wxHTTP::ClearHeaders()
 {
 
 void wxHTTP::ClearHeaders()
 {

-  m_headers.clear();
+    m_headers.clear();

 }
 
 }
 

-wxString wxHTTP::GetContentType()
+wxString wxHTTP::GetContentType() const

 {
     return GetHeader(wxT("Content-Type"));
 }
 {
     return GetHeader(wxT("Content-Type"));
 }


@@ -176,8 +182,8 @@ bool wxHTTP::ParseHeaders()
 
     for ( ;; )
     {
 
     for ( ;; )
     {

-        m_perr = ReadLine(this, line);
-        if (m_perr != wxPROTO_NOERR)
+        m_lastError = ReadLine(this, line);
+        if (m_lastError != wxPROTO_NOERR)

             return false;
 
         if (line.length() == 0)
             return false;
 
         if (line.length() == 0)


@@ -204,7 +210,7 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
     if (!addr->Hostname(host)) {
         delete m_addr;
         m_addr = NULL;
     if (!addr->Hostname(host)) {
         delete m_addr;
         m_addr = NULL;

-        m_perr = wxPROTO_NETERR;
+        m_lastError = wxPROTO_NETERR;

         return false;
     }
 
         return false;
     }
 


@@ -215,10 +221,11 @@ bool wxHTTP::Connect(const wxString& host, unsigned short port)
 
     SetHeader(wxT("Host"), host);
 
 
     SetHeader(wxT("Host"), host);
 

+    m_lastError = wxPROTO_NOERR;

     return true;
 }
 
     return true;
 }
 

-bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
+bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))

 {
     if (m_addr) {
         delete m_addr;
 {
     if (m_addr) {
         delete m_addr;


@@ -231,6 +238,7 @@ bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
     if (ipv4addr)
         SetHeader(wxT("Host"), ipv4addr->OrigHostname());
 
     if (ipv4addr)
         SetHeader(wxT("Host"), ipv4addr->OrigHostname());
 

+    m_lastError = wxPROTO_NOERR;

     return true;
 }
 
     return true;
 }
 


@@ -285,8 +293,8 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     }
 
     wxString tmp_str;
     }
 
     wxString tmp_str;

-    m_perr = ReadLine(this, tmp_str);
-    if (m_perr != wxPROTO_NOERR) {
+    m_lastError = ReadLine(this, tmp_str);
+    if (m_lastError != wxPROTO_NOERR) {

         RestoreState();
         return false;
     }
         RestoreState();
         return false;
     }


@@ -294,6 +302,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     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.
     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.

+        m_lastError = wxPROTO_NOERR;

         SetHeader(wxT("Content-Length"), wxT("-1"));
         SetHeader(wxT("Content-Type"), wxT("none/none"));
         RestoreState();
         SetHeader(wxT("Content-Length"), wxT("-1"));
         SetHeader(wxT("Content-Type"), wxT("none/none"));
         RestoreState();


@@ -324,16 +333,26 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
             break;
 
         default:
             break;
 
         default:

-            m_perr = wxPROTO_NOFILE;
+            m_lastError = wxPROTO_NOFILE;

             RestoreState();
             return false;
     }
 
             RestoreState();
             return false;
     }
 

+    m_lastError = wxPROTO_NOERR;

     ret_value = ParseHeaders();
     RestoreState();
     return ret_value;
 }
 
     ret_value = ParseHeaders();
     RestoreState();
     return ret_value;
 }
 

+bool wxHTTP::Abort(void)
+{
+    return wxSocketClient::Close();
+}
+
+// ----------------------------------------------------------------------------
+// wxHTTPStream and wxHTTP::GetInputStream
+// ----------------------------------------------------------------------------
+

 class wxHTTPStream : public wxSocketInputStream
 {
 public:
 class wxHTTPStream : public wxSocketInputStream
 {
 public:


@@ -368,24 +387,19 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
         // which is equivalent to getting a READ_ERROR, for clients however this
         // must be translated into EOF, as it is the expected way of signalling
         // end end of the content
         // which is equivalent to getting a READ_ERROR, for clients however this
         // must be translated into EOF, as it is the expected way of signalling
         // end end of the content

-        m_lasterror = wxSTREAM_EOF ;
+        m_lasterror = wxSTREAM_EOF;

     }
 
     return ret;
 }
 
     }
 
     return ret;
 }
 

-bool wxHTTP::Abort(void)
-{
-    return wxSocketClient::Close();
-}
-

 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
     wxHTTPStream *inp_stream;
 
     wxString new_path;
 
 wxInputStream *wxHTTP::GetInputStream(const wxString& path)
 {
     wxHTTPStream *inp_stream;
 
     wxString new_path;
 

-    m_perr = wxPROTO_CONNERR;
+    m_lastError = wxPROTO_CONNERR;  // all following returns share this type of error

     if (!m_addr)
         return NULL;
 
     if (!m_addr)
         return NULL;
 


@@ -416,6 +430,8 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
     Notify(false);
     SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 
     Notify(false);
     SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
 

+    // no error; reset m_lastError
+    m_lastError = wxPROTO_NOERR;

     return inp_stream;
 }
 
     return inp_stream;
 }