Warning fix.

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index b2b5a42767942b523987632e6b02415f8ab76389..24b6904e2e59be6559100342d99d9f3a3bc84f37 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -2,17 +2,13 @@
 // Name:        http.cpp
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
 // Name:        http.cpp
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux

-// Modified by:
+// Modified by: Simo Virokannas (authentication, Dec 2005)

 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "http.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -119,6 +115,38 @@ wxString wxHTTP::GetHeader(const wxString& header) const
     return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }
 
     return it == m_headers.end() ? wxGetEmptyString() : it->second;
 }
 

+wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const
+{
+    static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    wxString buf;
+    wxString toencode;
+
+    buf.Printf(wxT("Basic "));
+
+    toencode.Printf(wxT("%s:%s"),user.c_str(),pass.c_str());
+
+    size_t len = toencode.Length();
+    const wxChar *from = toencode.c_str();
+    while (len >= 3) { // encode full blocks first
+        buf << wxString::Format(wxT("%c%c"), base64[(from[0] >> 2) & 0x3f], base64[((from[0] << 4) & 0x30) | ((from[1] >> 4) & 0xf)]);
+        buf << wxString::Format(wxT("%c%c"), base64[((from[1] << 2) & 0x3c) | ((from[2] >> 6) & 0x3)], base64[from[2] & 0x3f]);
+        from += 3;
+        len -= 3;
+    }
+    if (len > 0) { // pad the remaining characters
+        buf << wxString::Format(wxT("%c"), base64[(from[0] >> 2) & 0x3f]);
+        if (len == 1) {
+            buf << wxString::Format(wxT("%c="), base64[(from[0] << 4) & 0x30]);
+        } else {
+            buf << wxString::Format(wxT("%c%c"), base64[(from[0] << 4) & 0x30] + ((from[1] >> 4) & 0xf), base64[(from[1] << 2) & 0x3c]);
+        }
+        buf << wxString::Format(wxT("="));
+    }
+
+    return buf;
+}
+

 void wxHTTP::SetPostBuffer(const wxString& post_buf)
 {
     m_post_buf = post_buf;
 void wxHTTP::SetPostBuffer(const wxString& post_buf)
 {
     m_post_buf = post_buf;


@@ -146,15 +174,9 @@ bool wxHTTP::ParseHeaders()
     ClearHeaders();
     m_read = true;
 
     ClearHeaders();
     m_read = true;
 

-#if defined(__VISAGECPP__)
-// VA just can't stand while(1)
-    bool bOs2var = true;
-    while(bOs2var)
-#else
-    while (1)
-#endif
+    for ( ;; )

     {
     {

-        m_perr = GetLine(this, line);
+        m_perr = ReadLine(this, line);

         if (m_perr != wxPROTO_NOERR)
             return false;
 
         if (m_perr != wxPROTO_NOERR)
             return false;
 


@@ -238,6 +260,11 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     if (GetHeader(wxT("User-Agent")).IsNull())
         SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 
     if (GetHeader(wxT("User-Agent")).IsNull())
         SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
 

+    // Send authentication information
+    if (m_username.Length()>0 || m_password.Length()>0) {
+        SetHeader(wxT("Authorization"), GenerateAuthString(m_username, m_password));
+    }
+

     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


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

-    m_perr = GetLine(this, tmp_str);
+    m_perr = ReadLine(this, tmp_str);

     if (m_perr != wxPROTO_NOERR) {
         RestoreState();
         return false;
     if (m_perr != wxPROTO_NOERR) {
         RestoreState();
         return false;


@@ -335,6 +362,15 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
     size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
     m_read_bytes += ret;
 
     size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
     m_read_bytes += ret;
 

+    if (m_httpsize==(size_t)-1 && m_lasterror == wxSTREAM_READ_ERROR )
+    {
+        // if m_httpsize is (size_t) -1 this means read until connection closed
+        // 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 ;
+    }
+

     return ret;
 }
 
     return ret;
 }