Make mouse capture checking asserts stronger and more detailed.

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 49f08f6dfb55e5702cc261a4ec06f376da5b1eae..0ecde88c77ce897fd5cd43d388e2c64afdcc6385 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by: Simo Virokannas (authentication, Dec 2005)
 // Created:     August 1997
 // Author:      Guilhem Lavaux
 // Modified by: Simo Virokannas (authentication, Dec 2005)
 // Created:     August 1997

-// RCS-ID:      $Id$

 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -218,12 +217,20 @@ wxHTTP::SetPostText(const wxString& contentType,
                     const wxString& data,
                     const wxMBConv& conv)
 {
                     const wxString& data,
                     const wxMBConv& conv)
 {

+#if wxUSE_UNICODE

     wxScopedCharBuffer scb = data.mb_str(conv);
     wxScopedCharBuffer scb = data.mb_str(conv);

-    if ( !scb.length() )
+    const size_t len = scb.length();
+    const char* const buf = scb.data();
+#else // !wxUSE_UNICODE
+    const size_t len = data.length();
+    const char* const buf = data.mb_str(conv);
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+
+    if ( !len )

         return false;
 
     m_postBuffer.Clear();
         return false;
 
     m_postBuffer.Clear();

-    m_postBuffer.AppendData(scb.data(), scb.length());
+    m_postBuffer.AppendData(buf, len);

     m_contentType = contentType;
 
     return true;
     m_contentType = contentType;
 
     return true;


@@ -333,37 +340,23 @@ bool wxHTTP::Connect(const wxSockAddress& addr, bool WXUNUSED(wait))
     return true;
 }
 
     return true;
 }
 

-bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
+bool wxHTTP::BuildRequest(const wxString& path, const wxString& method)

 {
 {

-    const wxChar *request;
-
-    switch (req)
+    // Use the data in the post buffer, if any.
+    if ( !m_postBuffer.IsEmpty() )

     {
     {

-        case wxHTTP_GET:
-            request = wxT("GET");
-            break;
-
-        case wxHTTP_POST:
-            request = wxT("POST");
-            // Content length must be correct, so always set, possibly
-            // overriding the value set explicitly by a previous call to
-            // SetHeader("Content-Length").
-            if ( !m_postBuffer.IsEmpty() )
-            {
-                wxString len;
-                len << m_postBuffer.GetDataLen();
-
-                SetHeader(wxS("Content-Length"), len);
-            }
-
-            // However if the user had explicitly set the content type, don't
-            // override it with the content type passed to SetPostText().
-            if ( !m_contentType.empty() && GetContentType().empty() )
-                SetHeader(wxS("Content-Type"), m_contentType);
-            break;
-
-        default:
-            return false;
+        wxString len;
+        len << m_postBuffer.GetDataLen();
+
+        // Content length must be correct, so always set, possibly
+        // overriding the value set explicitly by a previous call to
+        // SetHeader("Content-Length").
+        SetHeader(wxS("Content-Length"), len);
+
+        // However if the user had explicitly set the content type, don't
+        // override it with the content type passed to SetPostText().
+        if ( !m_contentType.empty() && GetContentType().empty() )
+            SetHeader(wxS("Content-Type"), m_contentType);

     }
 
     m_http_response = 0;
     }
 
     m_http_response = 0;


@@ -380,20 +373,22 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     SaveState();
 
     // we may use non blocking sockets only if we can dispatch events from them
     SaveState();
 
     // we may use non blocking sockets only if we can dispatch events from them

-    SetFlags( wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
-                                                             : wxSOCKET_BLOCK );
+    int flags = wxIsMainThread() && wxApp::IsMainLoopRunning() ? wxSOCKET_NONE
+                                                               : wxSOCKET_BLOCK;
+    // and we must use wxSOCKET_WAITALL to ensure that all data is sent
+    flags |= wxSOCKET_WAITALL;
+    SetFlags(flags);

     Notify(false);
 
     wxString buf;
     Notify(false);
 
     wxString buf;

-    buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
+    buf.Printf(wxT("%s %s HTTP/1.0\r\n"), method, path);

     const wxWX2MBbuf pathbuf = buf.mb_str();
     Write(pathbuf, strlen(pathbuf));
     SendHeaders();
     Write("\r\n", 2);
 
     const wxWX2MBbuf pathbuf = buf.mb_str();
     Write(pathbuf, strlen(pathbuf));
     SendHeaders();
     Write("\r\n", 2);
 

-    if ( req == wxHTTP_POST ) {
-        if ( !m_postBuffer.IsEmpty() )
-            Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen());
+    if ( !m_postBuffer.IsEmpty() ) {
+        Write(m_postBuffer.GetData(), m_postBuffer.GetDataLen());

 
         m_postBuffer.Clear();
     }
 
         m_postBuffer.Clear();
     }


@@ -466,7 +461,13 @@ public:
     size_t m_httpsize;
     unsigned long m_read_bytes;
 
     size_t m_httpsize;
     unsigned long m_read_bytes;
 

-    wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
+    wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http)
+    {
+        m_http = http;
+        m_httpsize = 0;
+        m_read_bytes = 0;
+    }
+

     size_t GetSize() const { return m_httpsize; }
     virtual ~wxHTTPStream(void) { m_http->Abort(); }
 
     size_t GetSize() const { return m_httpsize; }
     virtual ~wxHTTPStream(void) { m_http->Abort(); }
 


@@ -521,7 +522,13 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
         return NULL;
 #endif
 
         return NULL;
 #endif
 

-    if (!BuildRequest(path, m_postBuffer.IsEmpty() ? wxHTTP_GET : wxHTTP_POST))
+    // Use the user-specified method if any or determine the method to use
+    // automatically depending on whether we have anything to post or not.
+    wxString method = m_method;
+    if (method.empty())
+        method = m_postBuffer.IsEmpty() ? wxS("GET"): wxS("POST");
+
+    if (!BuildRequest(path, method))

         return NULL;
 
     inp_stream = new wxHTTPStream(this);
         return NULL;
 
     inp_stream = new wxHTTPStream(this);