* Small fix in wxHTTP::BuildRequest

* Introduced wxURL::ConvertToValidURI (to be implemented)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/url.h b/include/wx/url.h
index aa224f7f3b56fc1bd62f1e7c65d5809349da05d0..f8f54af9633be54b14794a72c4c545cdce71ee49 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -68,6 +68,8 @@ public:
 
   static void SetDefaultProxy(const wxString& url_proxy);
   void SetProxy(const wxString& url_proxy);
 
   static void SetDefaultProxy(const wxString& url_proxy);
   void SetProxy(const wxString& url_proxy);

+
+  static wxString ConvertToValidURI(const wxString& uri);

 };
 
 #endif
 };
 
 #endif

diff --git a/src/common/http.cpp b/src/common/http.cpp
index 19b1edf023052df280bf08c481c4304284d89d40..041e5a5e01b7c415c8475fbb52ffbc0352085afe 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -129,7 +129,6 @@ bool wxHTTP::ParseHeaders()
     if (line.Length() == 0)
       break;
 
     if (line.Length() == 0)
       break;
 

-    printf("Header: %s\n", WXSTRINGCAST line);

     tokenzr.SetString(line, " :\t\n\r");
     if (!tokenzr.HasMoreToken())
       return FALSE;
     tokenzr.SetString(line, " :\t\n\r");
     if (!tokenzr.HasMoreToken())
       return FALSE;


@@ -198,7 +197,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   SetFlags(NONE);
   Notify(FALSE);
 
   SetFlags(NONE);
   Notify(FALSE);
 

-  sprintf(buf, "%s %s HTTP/1.0\n\r", tmp_buf, (const char*)pathbuf);
+  sprintf(buf, "%s %s\n\r", tmp_buf, pathbuf);

   Write(buf, strlen(buf));
   SendHeaders();
   sprintf(buf, "\n\r");
   Write(buf, strlen(buf));
   SendHeaders();
   sprintf(buf, "\n\r");

diff --git a/src/common/url.cpp b/src/common/url.cpp
index ef280923ab5553bd5b0ae68e3756127295731b90..89b1f889ccbe9566fe78b3da025573eec330df06 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -316,5 +316,10 @@ void wxURL::SetProxy(const wxString& url_proxy)
   m_path = url_proxy;
 }
 
   m_path = url_proxy;
 }
 

+wxString wxURL::ConvertToValidURI(const wxString& uri)
+{
+  return wxString(uri);
+}
+

 #endif
   // wxUSE_SOCKETS
 #endif
   // wxUSE_SOCKETS