adding ContentScaleFactor support to dc - defaulting to 1.0

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 00b711b2ad247f3e2c9f48213d186fddb1b0f16b..556618aca517d6c48253be620a457cbb19c6cea5 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -1,329 +1,561 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        http.cpp
+// Name:        src/common/http.cpp

 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
 // 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
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-  #pragma implementation "http.h"
-#endif
-

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

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS
+#if wxUSE_PROTOCOL_HTTP

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

-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/app.h"
+#endif
+

 #include "wx/tokenzr.h"
 #include "wx/socket.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"
 #include "wx/tokenzr.h"
 #include "wx/socket.h"
 #include "wx/protocol/protocol.h"
 #include "wx/url.h"
 #include "wx/protocol/http.h"
 #include "wx/sckstrm.h"

+#include "wx/thread.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, _T("http"), _T("80"), TRUE)
-#endif

 
 

-#define HTTP_BSIZE 2048
+// ----------------------------------------------------------------------------
+// wxHTTP
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
+IMPLEMENT_PROTOCOL(wxHTTP, wxT("http"), wxT("80"), true)

 
 wxHTTP::wxHTTP()
 
 wxHTTP::wxHTTP()

-  : wxProtocol(),
-    m_headers(wxKEY_STRING)
+  : wxProtocol()

 {
 {

-  m_addr = NULL;
-  m_read = FALSE;
-  m_proxy_mode = FALSE;
+    m_addr = NULL;
+    m_read = false;
+    m_proxy_mode = false;
+    m_http_response = 0;

 
 

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

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

-  // wxString isn't a wxObject
-  wxNode *node = m_headers.First();
-  wxString *string;
-
-  while (node) {
-    string = (wxString *)node->Data();
-    delete string;
-    node = node->Next();
-  }
+    ClearHeaders();
+
+    delete m_addr;
+}
+
+void wxHTTP::ClearHeaders()
+{
+    m_headers.clear();

 }
 
 }
 

-wxString wxHTTP::GetContentType()
+void wxHTTP::ClearCookies()

 {
 {

-  return GetHeader(_T("Content-Type"));
+    m_cookies.clear();
+}
+
+wxString wxHTTP::GetContentType() const
+{
+    return GetHeader(wxT("Content-Type"));

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

-  m_proxy_mode = on;
+    m_proxy_mode = on;

 }
 
 }
 

-void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)
+wxHTTP::wxHeaderIterator wxHTTP::FindHeader(const wxString& header)

 {
 {

-  if (m_read) {
-    m_headers.Clear();
-    m_read = FALSE;
-  }
-
-  wxNode *node = m_headers.Find(header);
-
-  if (!node)
-    m_headers.Append(header, (wxObject *)(new wxString(h_data)));
-  else {
-    wxString *str = (wxString *)node->Data();
-    (*str) = h_data;
-  }
+    wxHeaderIterator it = m_headers.begin();
+    for ( wxHeaderIterator en = m_headers.end(); it != en; ++it )
+    {
+        if ( header.CmpNoCase(it->first) == 0 )
+            break;
+    }
+
+    return it;

 }
 
 }
 

-wxString wxHTTP::GetHeader(const wxString& header)
+wxHTTP::wxHeaderConstIterator wxHTTP::FindHeader(const wxString& header) const

 {
 {

-  wxNode *node;
-  wxString upper_header;
+    wxHeaderConstIterator it = m_headers.begin();
+    for ( wxHeaderConstIterator en = m_headers.end(); it != en; ++it )
+    {
+        if ( header.CmpNoCase(it->first) == 0 )
+            break;
+    }
+
+    return it;
+}

 
 

-  upper_header = header.Upper();
-  
-  node = m_headers.Find(upper_header);
-  if (!node)
-    return wxEmptyString;
+wxHTTP::wxCookieIterator wxHTTP::FindCookie(const wxString& cookie)
+{
+    wxCookieIterator it = m_cookies.begin();
+    for ( wxCookieIterator en = m_cookies.end(); it != en; ++it )
+    {
+        if ( cookie.CmpNoCase(it->first) == 0 )
+            break;
+    }
+
+    return it;
+}

 
 

-  return *((wxString *)node->Data());
+wxHTTP::wxCookieConstIterator wxHTTP::FindCookie(const wxString& cookie) const
+{
+    wxCookieConstIterator it = m_cookies.begin();
+    for ( wxCookieConstIterator en = m_cookies.end(); it != en; ++it )
+    {
+        if ( cookie.CmpNoCase(it->first) == 0 )
+            break;
+    }
+
+    return it;

 }
 
 }
 

-void wxHTTP::SendHeaders()
+void wxHTTP::SetHeader(const wxString& header, const wxString& h_data)

 {
 {

-  wxNode *head = m_headers.First();
+    if (m_read) {
+        ClearHeaders();
+        m_read = false;
+    }
+
+    wxHeaderIterator it = FindHeader(header);
+    if (it != m_headers.end())
+        it->second = h_data;
+    else
+        m_headers[header] = h_data;
+}

 
 

-  while (head)
-  {
-    wxString *str = (wxString *)head->Data();
+wxString wxHTTP::GetHeader(const wxString& header) const
+{
+    wxHeaderConstIterator it = FindHeader(header);

 
 

-    wxString buf;
-    buf.Printf(_T("%s: %s\n\r"), head->GetKeyString(), str->GetData());
+    return it == m_headers.end() ? wxGetEmptyString() : it->second;
+}

 
 

-    const wxWX2MBbuf cbuf = buf.mb_str();
-    Write(cbuf, strlen(cbuf));
+wxString wxHTTP::GetCookie(const wxString& cookie) const
+{
+    wxCookieConstIterator it = FindCookie(cookie);

 
 

-    head = head->Next();
-  }
+    return it == m_cookies.end() ? wxGetEmptyString() : it->second;

 }
 
 }
 

-bool wxHTTP::ParseHeaders()
+wxString wxHTTP::GenerateAuthString(const wxString& user, const wxString& pass) const

 {
 {

-  wxString line;
-  wxStringTokenizer tokenzr;
+    // TODO: Use wxBase64Encode() now that we have it instead of reproducing it

 
 

-  m_headers.Clear();
-  m_read = TRUE;
+    static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

 
 

-  while (1) {
-    m_perr = GetLine(this, line);
-    if (m_perr != wxPROTO_NOERR)
-      return FALSE;
+    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;
+}

 
 

-    if (line.Length() == 0)
-      break;
+void wxHTTP::SetPostBuffer(const wxString& post_buf)
+{
+    // Use To8BitData() for backwards compatibility in this deprecated method.
+    // The new code should use the other overload or SetPostText() and specify
+    // the encoding to use for the text explicitly.
+    wxScopedCharBuffer scb = post_buf.To8BitData();
+    if ( scb.length() )
+    {
+        m_postBuffer.Clear();
+        m_postBuffer.AppendData(scb.data(), scb.length());
+    }
+}

 
 

-    tokenzr.SetString(line, " :\t\n\r");
-    if (!tokenzr.HasMoreTokens())
-      return FALSE;
+bool
+wxHTTP::SetPostBuffer(const wxString& contentType,
+                      const wxMemoryBuffer& data)
+{
+    m_postBuffer = data;
+    m_contentType = contentType;

 
 

-    wxString left_str = tokenzr.GetNextToken();
-    wxString *str = new wxString(tokenzr.GetNextToken());
+    return !m_postBuffer.IsEmpty();
+}

 
 

-    left_str.MakeUpper();
+bool
+wxHTTP::SetPostText(const wxString& contentType,
+                    const wxString& data,
+                    const wxMBConv& conv)
+{
+#if wxUSE_UNICODE
+    wxScopedCharBuffer scb = data.mb_str(conv);
+    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();
+    m_postBuffer.AppendData(buf, len);
+    m_contentType = contentType;
+
+    return true;
+}

 
 

-    m_headers.Append(left_str, (wxObject *) str);
-  }
-  return TRUE;
+void wxHTTP::SendHeaders()
+{
+    typedef wxStringToStringHashMap::iterator iterator;
+    wxString buf;
+
+    for (iterator it = m_headers.begin(), en = m_headers.end(); it != en; ++it )
+    {
+        buf.Printf(wxT("%s: %s\r\n"), it->first.c_str(), it->second.c_str());
+
+        const wxWX2MBbuf cbuf = buf.mb_str();
+        Write(cbuf, strlen(cbuf));
+    }

 }
 
 }
 

-bool wxHTTP::Connect(const wxString& host)
+bool wxHTTP::ParseHeaders()

 {
 {

-  wxIPV4address *addr;
+    wxString line;
+    wxStringTokenizer tokenzr;
+
+    ClearHeaders();
+    ClearCookies();
+    m_read = true;
+
+    for ( ;; )
+    {
+        m_lastError = ReadLine(this, line);
+        if (m_lastError != wxPROTO_NOERR)
+            return false;
+
+        if ( line.empty() )
+            break;
+
+        wxString left_str = line.BeforeFirst(':');
+        if(!left_str.CmpNoCase("Set-Cookie"))
+        {
+            wxString cookieName = line.AfterFirst(':').Strip(wxString::both).BeforeFirst('=');
+            wxString cookieValue = line.AfterFirst(':').Strip(wxString::both).AfterFirst('=').BeforeFirst(';');
+            m_cookies[cookieName] = cookieValue;
+
+            // For compatibility
+            m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
+        }
+        else
+        {
+            m_headers[left_str] = line.AfterFirst(':').Strip(wxString::both);
+        }
+    }
+    return true;
+}

 
 

-  if (m_addr) {
-    delete m_addr;
-    m_addr = NULL;
-    Close();
-  }
+bool wxHTTP::Connect(const wxString& host, unsigned short port)
+{
+    wxIPV4address *addr;

 
 

-  m_addr = addr = new wxIPV4address();
+    if (m_addr) {
+        wxDELETE(m_addr);
+        Close();
+    }

 
 

-  if (!addr->Hostname(host)) {
-    delete m_addr;
-    m_addr = NULL;
-    m_perr = wxPROTO_NETERR;
-    return FALSE;
-  }
+    m_addr = addr = new wxIPV4address();
+
+    if (!addr->Hostname(host)) {
+        wxDELETE(m_addr);
+        m_lastError = wxPROTO_NETERR;
+        return false;
+    }

 
 

-  if (!addr->Service(_T("http")))
-    addr->Service(80);
+    if ( port )
+        addr->Service(port);
+    else if (!addr->Service(wxT("http")))
+        addr->Service(80);

 
 

-  return TRUE;
+    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 = NULL;
-    Close();
-  }
-
-  m_addr = (wxSockAddress *) addr.Clone();
-  return TRUE;
+    if (m_addr) {
+        delete m_addr;
+        Close();
+    }
+
+    m_addr = addr.Clone();
+
+    wxIPV4address *ipv4addr = wxDynamicCast(&addr, wxIPV4address);
+    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;

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

-  wxChar *tmp_buf;
-  wxChar buf[200]; // 200 is arbitrary.
-  wxString tmp_str = path;
-
-  // If there is no User-Agent defined, define it.
-  if (GetHeader(_T("User-Agent")).IsNull())
-    SetHeader(_T("User-Agent"), _T("wxWindows 2.x")); 
-
-  switch (req) {
-  case wxHTTP_GET:
-    tmp_buf = _T("GET");
-    break;
-  default:
-    return FALSE;
-  }
-
-  SaveState();
-  SetFlags(NONE);
-  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));
-  SendHeaders();
-  Write("\n\r", 2);
-
-  m_perr = GetLine(this, tmp_str);
-  if (m_perr != wxPROTO_NOERR) {
-    RestoreState();
-    return FALSE;
-  }
-
-  if (!tmp_str.Contains(_T("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.
-    SetHeader(_T("Content-Length"), _T("-1"));
-    SetHeader(_T("Content-Type"), _T("none/none"));
-    RestoreState();
-    return TRUE;
-  }
-
-  wxStringTokenizer token(tmp_str,_T(' '));
-  wxString tmp_str2;
-  bool ret_value;
-
-  token.NextToken();
-  tmp_str2 = token.NextToken();
-
-  switch (tmp_str2[(unsigned int) 0]) {
-  case _T('1'):
-    /* INFORMATION / SUCCESS */
-    break;
-  case _T('2'):
-    /* SUCCESS */
-    break;
-  case _T('3'):
-    /* REDIRECTION */
-    break;
-  default:
-    m_perr = wxPROTO_NOFILE;
+    const wxChar *request;
+
+    switch (req)
+    {
+        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;
+    }
+
+    m_http_response = 0;
+
+    // If there is no User-Agent defined, define it.
+    if ( GetHeader(wxT("User-Agent")).empty() )
+        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
+    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;
+    buf.Printf(wxT("%s %s HTTP/1.0\r\n"), request, path.c_str());
+    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());
+
+        m_postBuffer.Clear();
+    }
+
+    wxString tmp_str;
+    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();
+        return true;
+    }
+
+    wxStringTokenizer token(tmp_str,wxT(' '));
+    wxString tmp_str2;
+    bool ret_value;
+
+    token.NextToken();
+    tmp_str2 = token.NextToken();
+
+    m_http_response = wxAtoi(tmp_str2);
+
+    switch ( tmp_str2[0u].GetValue() )
+    {
+        case wxT('1'):
+            /* INFORMATION / SUCCESS */
+            break;
+
+        case wxT('2'):
+            /* SUCCESS */
+            break;
+
+        case wxT('3'):
+            /* REDIRECTION */
+            break;
+
+        default:
+            m_lastError = wxPROTO_NOFILE;
+            RestoreState();
+            return false;
+    }
+
+    m_lastError = wxPROTO_NOERR;
+    ret_value = ParseHeaders();

     RestoreState();
     RestoreState();

-    return FALSE;
-  }
+    return ret_value;
+}

 
 

-  ret_value = ParseHeaders();
-  RestoreState();
-  return ret_value;
+bool wxHTTP::Abort(void)
+{
+    return wxSocketClient::Close();

 }
 
 }
 

-class wxHTTPStream : public wxSocketInputStream {
+// ----------------------------------------------------------------------------
+// wxHTTPStream and wxHTTP::GetInputStream
+// ----------------------------------------------------------------------------
+
+class wxHTTPStream : public wxSocketInputStream
+{

 public:
 public:

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

 
 

-  wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
-  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(); }

 
 protected:
 
 protected:

-  size_t OnSysRead(void *buffer, size_t bufsize);
+    size_t OnSysRead(void *buffer, size_t bufsize);
+
+    wxDECLARE_NO_COPY_CLASS(wxHTTPStream);

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

-  size_t ret;
-
-  if (m_httpsize > 0 && m_read_bytes >= m_httpsize)
-    return 0;
-
-  ret = wxSocketInputStream::OnSysRead(buffer, bufsize);
-  m_read_bytes += ret;
-
-  return ret;
+    if (m_read_bytes >= m_httpsize)
+    {
+        m_lasterror = wxSTREAM_EOF;
+        return 0;
+    }
+
+    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;

 }
 
 }
 

-bool wxHTTP::Abort(void)
+wxInputStream *wxHTTP::GetInputStream(const wxString& path)

 {
 {

-  bool ret;
+    wxHTTPStream *inp_stream;

 
 

-  ret = wxSocketClient::Close();
+    wxString new_path;

 
 

-  return ret;
-}
+    m_lastError = wxPROTO_CONNERR;  // all following returns share this type of error
+    if (!m_addr)
+        return NULL;

 
 

-wxInputStream *wxHTTP::GetInputStream(const wxString& path)
-{
-  wxHTTPStream *inp_stream = new wxHTTPStream(this);
-  wxString new_path;
+    // We set m_connected back to false so wxSocketBase will know what to do.
+#ifdef __WXMAC__
+    wxSocketClient::Connect(*m_addr , false );
+    wxSocketClient::WaitOnConnect(10);

 
 

-  m_perr = wxPROTO_CONNERR;
-  if (!m_addr)
-    return NULL;
+    if (!wxSocketClient::IsConnected())
+        return NULL;
+#else
+    if (!wxProtocol::Connect(*m_addr))
+        return NULL;
+#endif

 
 

-  // We set m_connected back to FALSE so wxSocketBase will know what to do.
-  if (!wxProtocol::Connect(*m_addr))
-    return NULL;
+    if (!BuildRequest(path, m_postBuffer.IsEmpty() ? wxHTTP_GET : wxHTTP_POST))
+        return NULL;

 
 

-  if (!BuildRequest(path, wxHTTP_GET))
-    return NULL;
+    inp_stream = new wxHTTPStream(this);

 
 

-  if (!GetHeader(_T("Content-Length")).IsEmpty())
-    inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length")));
-  else
-    inp_stream->m_httpsize = (size_t)-1;
+    if (!GetHeader(wxT("Content-Length")).empty())
+        inp_stream->m_httpsize = wxAtoi(GetHeader(wxT("Content-Length")));
+    else
+        inp_stream->m_httpsize = (size_t)-1;

 
 

-  inp_stream->m_read_bytes = 0;
+    inp_stream->m_read_bytes = 0;

 
 

-  Notify(FALSE);
-  SetFlags(SPEED | WAITALL);
+    Notify(false);
+    SetFlags(wxSOCKET_BLOCK | wxSOCKET_WAITALL);

 
 

-  return inp_stream;
+    // no error; reset m_lastError
+    m_lastError = wxPROTO_NOERR;
+    return inp_stream;

 }
 
 }
 

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