X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1759ff9e918d43734793c67328af21203924931f..5701b057fb4b5bf672da2fb19230d179f7f3e251:/src/common/http.cpp

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 779472541d..18beaf43cf 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -10,27 +10,25 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation "http.h"
+  #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_SOCKETS
 
-#ifndef WX_PRECOMP
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include "wx/string.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"
 
@@ -48,7 +46,7 @@ wxHTTP::wxHTTP()
   m_addr = NULL;
   m_read = FALSE;
 
-  SetNotify(REQ_LOST);
+  SetNotify(GSOCK_LOST_FLAG);
 }
 
 wxHTTP::~wxHTTP()
@@ -122,15 +120,15 @@ bool wxHTTP::ParseHeaders()
   m_read = TRUE;
 
   while (1) {
-    m_error = GetLine(this, line);
-    if (m_error != wxPROTO_NOERR)
+    m_perr = GetLine(this, line);
+    if (m_perr != wxPROTO_NOERR)
       return FALSE;
 
     if (line.Length() == 0)
       break;
 
     tokenzr.SetString(line, " :\t\n\r");
-    if (!tokenzr.HasMoreToken())
+    if (!tokenzr.HasMoreTokens())
       return FALSE;
 
     wxString left_str = tokenzr.GetNextToken();
@@ -156,7 +154,7 @@ bool wxHTTP::Connect(const wxString& host)
   if (!addr->Hostname(host)) {
     delete m_addr;
     m_addr = NULL;
-    m_error = wxPROTO_NETERR;
+    m_perr = wxPROTO_NETERR;
     return FALSE;
   }
 
@@ -168,26 +166,25 @@ bool wxHTTP::Connect(const wxString& host)
 
 bool wxHTTP::Connect(wxSockAddress& addr, bool WXUNUSED(wait))
 {
-  struct sockaddr *raw_addr;
-  size_t len;
-
-  m_addr = (wxSockAddress *)(addr.GetClassInfo()->CreateObject());
-
-  addr.Build(raw_addr, len);
-  m_addr->Disassemble(raw_addr, len);
+  if (m_addr) {
+    delete m_addr;
+    m_addr = NULL;
+    Close();
+  }
 
+  m_addr = (wxSockAddress *) addr.Clone();
   return TRUE;
 }
 
 bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
 {
-  char *tmp_buf;
-  char buf[HTTP_BSIZE];
-  const wxWX2MBbuf pathbuf = path.mb_str();
+  wxChar *tmp_buf;
+  wxChar buf[200]; // 200 is arbitrary.
+  wxString tmp_str;
 
   switch (req) {
   case wxHTTP_GET:
-    tmp_buf = "GET";
+    tmp_buf = _T("GET");
     break;
   default:
     return FALSE;
@@ -197,16 +194,15 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   SetFlags(NONE);
   Notify(FALSE);
 
-  sprintf(buf, "%s %s\n\r", tmp_buf, (const char*) pathbuf);
-  Write(buf, strlen(buf));
+  tmp_str = wxURL::ConvertToValidURI(path);
+  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();
-  sprintf(buf, "\n\r");
-  Write(buf, strlen(buf));
-
-  wxString tmp_str;
+  Write("\n\r", 2);
 
-  m_error = GetLine(this, tmp_str);
-  if (m_error != wxPROTO_NOERR) {
+  m_perr = GetLine(this, tmp_str);
+  if (m_perr != wxPROTO_NOERR) {
     RestoreState();
     return FALSE;
   }
@@ -230,7 +226,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   case 200:
     break;
   default:
-    m_error = wxPROTO_NOFILE;
+    m_perr = wxPROTO_NOFILE;
     RestoreState();
     return FALSE;
   }
@@ -244,12 +240,29 @@ class wxHTTPStream : public wxSocketInputStream {
 public:
   wxHTTP *m_http;
   size_t m_httpsize;
+  unsigned long m_read_bytes;
 
   wxHTTPStream(wxHTTP *http) : wxSocketInputStream(*http), m_http(http) {}
   size_t StreamSize() const { return m_httpsize; }
   virtual ~wxHTTPStream(void) { m_http->Abort(); }
+
+protected:
+  size_t 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;
+}
+
 bool wxHTTP::Abort(void)
 {
   return wxSocketClient::Close();
@@ -260,7 +273,7 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   wxHTTPStream *inp_stream = new wxHTTPStream(this);
 
   if (!m_addr || m_connected) {
-    m_error = wxPROTO_CONNERR;
+    m_perr = wxPROTO_CONNERR;
     return NULL;
   }
 
@@ -270,11 +283,15 @@ wxInputStream *wxHTTP::GetInputStream(const wxString& path)
   if (!BuildRequest(path, wxHTTP_GET))
     return NULL;
 
-  wxPrintf(_T("Len = %s\n"), WXSTRINGCAST GetHeader(_T("Content-Length")));
   if (!GetHeader(_T("Content-Length")).IsEmpty())
     inp_stream->m_httpsize = wxAtoi(WXSTRINGCAST GetHeader(_T("Content-Length")));
+  else
+    inp_stream->m_httpsize = (size_t)-1;
+
+  inp_stream->m_read_bytes = 0;
+
+  Notify(FALSE);
 
-  SetFlags(WAITALL);
   return inp_stream;
 }