fix Borland bug http://news.gmane.org/find-root.php?message_id=%3c43A0B07F.8010204...

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

diff --git a/src/common/http.cpp b/src/common/http.cpp
index b2b5a42767942b523987632e6b02415f8ab76389..600cef4d47e0f7a0ce3bdfe058560e5c72348b90 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -9,10 +9,6 @@
 // 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"
 
@@ -146,15 +142,9 @@ bool wxHTTP::ParseHeaders()
     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;
 
@@ -258,7 +248,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
     }
 
     wxString tmp_str;
-    m_perr = GetLine(this, tmp_str);
+    m_perr = ReadLine(this, tmp_str);
     if (m_perr != wxPROTO_NOERR) {
         RestoreState();
         return false;
@@ -335,6 +325,15 @@ size_t wxHTTPStream::OnSysRead(void *buffer, size_t bufsize)
     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;
 }