/////////////////////////////////////////////////////////////////////////////
-// Name: http.cpp
+// Name: src/common/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
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "http.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_PROTOCOL_HTTP
#include <stdlib.h>
#ifndef WX_PRECOMP
-#include "wx/string.h"
-#include "wx/app.h"
+ #include "wx/string.h"
+ #include "wx/app.h"
#endif
#include "wx/tokenzr.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)
void wxHTTP::ClearHeaders()
{
- m_headers.clear();
+ m_headers.clear();
}
-wxString wxHTTP::GetContentType()
+wxString wxHTTP::GetContentType() const
{
return GetHeader(wxT("Content-Type"));
}
wxHeaderIterator it = m_headers.begin();
for ( wxHeaderIterator en = m_headers.end(); it != en; ++it )
{
- if ( wxStricmp(it->first, header) == 0 )
+ if ( header.CmpNoCase(it->first) == 0 )
break;
}
wxHeaderConstIterator it = m_headers.begin();
for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it )
{
- if ( wxStricmp(it->first, header) == 0 )
+ if ( header.CmpNoCase(it->first) == 0 )
break;
}
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 << wxT("=");
+ }
+
+ return buf;
+}
+
void wxHTTP::SetPostBuffer(const wxString& post_buf)
{
m_post_buf = post_buf;
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);
- if (m_perr != wxPROTO_NOERR)
+ m_lastError = ReadLine(this, line);
+ if (m_lastError != wxPROTO_NOERR)
return false;
- if (line.Length() == 0)
+ if (line.length() == 0)
break;
wxString left_str = line.BeforeFirst(':');
if (!addr->Hostname(host)) {
delete m_addr;
m_addr = NULL;
- m_perr = wxPROTO_NETERR;
+ m_lastError = wxPROTO_NETERR;
return false;
}
else if (!addr->Service(wxT("http")))
addr->Service(80);
- SetHeader(wxT("Host"), host);
+ wxString hostHdr = host;
+ if ( port && port != 80 )
+ hostHdr << wxT(":") << port;
+ SetHeader(wxT("Host"), hostHdr);
+ m_lastError = wxPROTO_NOERR;
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;
m_addr = addr.Clone();
wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
- if (ipv4addr)
- SetHeader(wxT("Host"), ipv4addr->OrigHostname());
+ if ( ipv4addr )
+ {
+ wxString hostHdr = ipv4addr->OrigHostname();
+ unsigned short port = ipv4addr->Service();
+ if ( port && port != 80 )
+ hostHdr << wxT(":") << port;
+ SetHeader(wxT("Host"), hostHdr);
+ }
+ m_lastError = wxPROTO_NOERR;
return true;
}
if (GetHeader(wxT("User-Agent")).IsNull())
SetHeader(wxT("User-Agent"), wxT("wxWidgets 2.x"));
+ // Send authentication information
+ if (!m_username.empty() || !m_password.empty()) {
+ SetHeader(wxT("Authorization"), GenerateAuthString(m_username, m_password));
+ }
+
SaveState();
// we may use non blocking sockets only if we can dispatch events from them
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));
+ const wxWX2MBbuf pathbuf = buf.mb_str();
+ Write(pathbuf, strlen(pathbuf));
SendHeaders();
Write("\r\n", 2);
}
wxString tmp_str;
- m_perr = GetLine(this, tmp_str);
- if (m_perr != wxPROTO_NOERR) {
+ m_lastError = ReadLine(this, tmp_str);
+ if (m_lastError != wxPROTO_NOERR) {
RestoreState();
return false;
}
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();
m_http_response = wxAtoi(tmp_str2);
- switch (tmp_str2[0u])
+ switch ( tmp_str2[0u].GetValue() )
{
case wxT('1'):
/* INFORMATION / SUCCESS */
break;
default:
- m_perr = wxPROTO_NOFILE;
+ m_lastError = wxPROTO_NOFILE;
RestoreState();
return false;
}
+ m_lastError = wxPROTO_NOERR;
ret_value = ParseHeaders();
RestoreState();
return ret_value;
}
+bool wxHTTP::Abort(void)
+{
+ return wxSocketClient::Close();
+}
+
+// ----------------------------------------------------------------------------
+// wxHTTPStream and wxHTTP::GetInputStream
+// ----------------------------------------------------------------------------
+
class wxHTTPStream : public wxSocketInputStream
{
public:
protected:
size_t OnSysRead(void *buffer, size_t bufsize);
- DECLARE_NO_COPY_CLASS(wxHTTPStream)
+ wxDECLARE_NO_COPY_CLASS(wxHTTPStream);
};
size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
size_t ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
m_read_bytes += ret;
- return 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;
+ }
-bool wxHTTP::Abort(void)
-{
- return wxSocketClient::Close();
+ return ret;
}
wxInputStream *wxHTTP::GetInputStream(const wxString& path)
wxString new_path;
- m_perr = wxPROTO_CONNERR;
+ m_lastError = wxPROTO_CONNERR; // all following returns share this type of error
if (!m_addr)
return NULL;
inp_stream = new wxHTTPStream(this);
if (!GetHeader(wxT("Content-Length")).empty())
- inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(wxT("Content-Length")));
+ inp_stream->m_httpsize = wxAtoi(GetHeader(wxT("Content-Length")));
else
inp_stream->m_httpsize = (size_t)-1;
Notify(false);
SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);
+ // no error; reset m_lastError
+ m_lastError = wxPROTO_NOERR;
return inp_stream;
}
#endif // wxUSE_PROTOCOL_HTTP
-
projects / wxWidgets.git / blobdiff