Merge pull request #1681 from Red-F/post_refactor

Fix CCurlFile::Get()
xbmc · Oct 27, 2012 · 599a248 · 599a248
2 parents ed16a1e + 5a03f0b
commit 599a248
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp
@@ -732,18 +732,20 @@ void CCurlFile::ParseAndCorrectUrl(CURL &url2)
 
 bool CCurlFile::Post(const CStdString& strURL, const CStdString& strPostData, CStdString& strHTML)
 {
-  return Service(strURL, strPostData, strHTML);
+  m_postdata = strPostData;
+  m_postdataset = true;
+  return Service(strURL, strHTML);
 }
 
 bool CCurlFile::Get(const CStdString& strURL, CStdString& strHTML)
 {
-  return Service(strURL, "", strHTML);
+  m_postdata = "";
+  m_postdataset = false;
+  return Service(strURL, strHTML);
 }
 
-bool CCurlFile::Service(const CStdString& strURL, const CStdString& strPostData, CStdString& strHTML)
+bool CCurlFile::Service(const CStdString& strURL, CStdString& strHTML)
 {
-  m_postdata = strPostData;
-  m_postdataset = true;
   if (Open(strURL))
   {
     if (ReadData(strHTML))

diff --git a/xbmc/filesystem/CurlFile.h b/xbmc/filesystem/CurlFile.h
@@ -123,7 +123,7 @@ namespace XFILE
       void SetCommonOptions(CReadState* state);
       void SetRequestHeaders(CReadState* state);
       void SetCorrectHeaders(CReadState* state);
-      bool Service(const CStdString& strURL, const CStdString& strPostData, CStdString& strHTML);
+      bool Service(const CStdString& strURL, CStdString& strHTML);
 
     protected:
       CReadState*     m_state;