rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -35,7 +35,6 @@
 		BDB15ED310B2EC6D00003DFA /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BD2C94DF10AE0A8C008D4692 /* libcurl.a */; };
 		BDB15ED410B2EC7500003DFA /* librholib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C7162970F8B7EEC0096B6AA /* librholib.a */; };
 		BDB15ED510B2EC8700003DFA /* librhorubylib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F59F16000E9449B8004103B4 /* librhorubylib.a */; };
-		BDB15ED610B2EC8E00003DFA /* libtcmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C12568C0F7CEA9200C87274 /* libtcmalloc.a */; };
 		BDB373661144220F006EA6DA /* SimpleMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = BDB373651144220F006EA6DA /* SimpleMainView.m */; };
 		BDB373C511444A8F006EA6DA /* Rhodes.m in Sources */ = {isa = PBXBuildFile; fileRef = BDB373C411444A8F006EA6DA /* Rhodes.m */; };
 		BDE35A7A107F900A009941C7 /* RhoFileImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = BDE35A79107F900A009941C7 /* RhoFileImpl.m */; };
@@ -66,20 +65,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		5C12568B0F7CEA9200C87274 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D2AAC046055464E500DB518D;
-			remoteInfo = tcmalloc;
-		};
-		5C1256A80F7CEC8100C87274 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = D2AAC045055464E500DB518D;
-			remoteInfo = tcmalloc;
-		};
 		5C7162960F8B7EEC0096B6AA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 5C7162920F8B7EEC0096B6AA /* RhoLib.xcodeproj */;
@@ -171,7 +156,6 @@
 		46B007061033776600D0C2F4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		46C25E39103240A400A26428 /* RhoDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoDelegate.h; sourceTree = "<group>"; };
 		46C25E3A103240A400A26428 /* RhoDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoDelegate.m; sourceTree = "<group>"; };
-		5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = tcmalloc.xcodeproj; path = tcmalloc/tcmalloc.xcodeproj; sourceTree = "<group>"; };
 		5C5333790FC1B20000F268F0 /* NetRequestImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetRequestImpl.m; path = rho/net/NetRequestImpl.m; sourceTree = "<group>"; };
 		5C5335C40FC2F44500F268F0 /* RhoClassFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoClassFactory.cpp; path = rho/common/RhoClassFactory.cpp; sourceTree = "<group>"; };
 		5C5335C50FC2F44500F268F0 /* RhoClassFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoClassFactory.h; path = rho/common/RhoClassFactory.h; sourceTree = "<group>"; };
@@ -188,7 +172,6 @@
 		BD97AC201160EE8F006960F9 /* RhoAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoAlert.m; sourceTree = "<group>"; };
 		BD97AC3D1160F8A5006960F9 /* RingtoneManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RingtoneManager.h; sourceTree = "<group>"; };
 		BD97AC3E1160F8A5006960F9 /* RingtoneManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RingtoneManager.m; sourceTree = "<group>"; };
-		BD97ACA511610666006960F9 /* DateTimePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTimePicker.h; sourceTree = "<group>"; };
 		BD97ACA611610666006960F9 /* DateTimePicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateTimePicker.m; sourceTree = "<group>"; };
 		BD9E5DF81185D2E10053049C /* NavBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavBar.h; sourceTree = "<group>"; };
 		BD9E5DF91185D2E10053049C /* NavBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavBar.m; sourceTree = "<group>"; };
@@ -248,7 +231,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BDB15ED610B2EC8E00003DFA /* libtcmalloc.a in Frameworks */,
 				BDB15ED510B2EC8700003DFA /* librhorubylib.a in Frameworks */,
 				BDB15ED410B2EC7500003DFA /* librholib.a in Frameworks */,
 				BDB15ED310B2EC6D00003DFA /* libcurl.a in Frameworks */,
@@ -321,7 +303,6 @@
 				5C7162920F8B7EEC0096B6AA /* RhoLib.xcodeproj */,
 				F563D53B0EA8240D0062DA57 /* rhosynclib.xcodeproj */,
 				F59F15F90E9449B8004103B4 /* rhorubylib.xcodeproj */,
-				5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				BD72CCE4112D629F003B7D27 /* Info.plist */,
@@ -367,7 +348,6 @@
 				46056D211031EDA900C21967 /* DateTimePickerDelegate.m */,
 				46B005F51033690F00D0C2F4 /* DateTime.h */,
 				46B005F61033690F00D0C2F4 /* DateTime.m */,
-				BD97ACA511610666006960F9 /* DateTimePicker.h */,
 				BD97ACA611610666006960F9 /* DateTimePicker.m */,
 			);
 			name = DateTimePicker;
@@ -393,14 +373,6 @@
 			name = NativeBar;
 			sourceTree = "<group>";
 		};
-		5C1256880F7CEA9200C87274 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				5C12568C0F7CEA9200C87274 /* libtcmalloc.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		5C5332610FBD6AC700F268F0 /* rho */ = {
 			isa = PBXGroup;
 			children = (
@@ -612,7 +584,6 @@
 			dependencies = (
 				F59F16040E9449E5004103B4 /* PBXTargetDependency */,
 				F563D5610EA8257A0062DA57 /* PBXTargetDependency */,
-				5C1256A90F7CEC8100C87274 /* PBXTargetDependency */,
 				5C7162C90F8B817F0096B6AA /* PBXTargetDependency */,
 				F5F0652F102B9CA0006CFD39 /* PBXTargetDependency */,
 				BD2C94F310AE0BC3008D4692 /* PBXTargetDependency */,
@@ -653,10 +624,6 @@
 					ProductGroup = F563D5410EA8240E0062DA57 /* Products */;
 					ProjectRef = F563D53B0EA8240D0062DA57 /* rhosynclib.xcodeproj */;
 				},
-				{
-					ProductGroup = 5C1256880F7CEA9200C87274 /* Products */;
-					ProjectRef = 5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */;
-				},
 			);
 			projectRoot = "";
 			targets = (
@@ -666,13 +633,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		5C12568C0F7CEA9200C87274 /* libtcmalloc.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libtcmalloc.a;
-			remoteRef = 5C12568B0F7CEA9200C87274 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		5C7162970F8B7EEC0096B6AA /* librholib.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -824,11 +784,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		5C1256A90F7CEC8100C87274 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = tcmalloc;
-			targetProxy = 5C1256A80F7CEC8100C87274 /* PBXContainerItemProxy */;
-		};
 		5C7162C90F8B817F0096B6AA /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = RhoLib;

data/platform/shared/common/PosixThreadImpl.cpp

@@ -14,6 +14,7 @@ namespace common
 IMPLEMENT_LOGCLASS(CPosixThreadImpl, "RhoThread");
 
 CPosixThreadImpl::CPosixThreadImpl()
+    :m_started(false)
 {}
 
 void *runProc(void *pv)
@@ -27,6 +28,13 @@ void *runProc(void *pv)
 
 void CPosixThreadImpl::start(IRhoRunnable *pRunnable, IRhoRunnable::EPriority ePriority)
 {
+    {
+        common::CMutexLock lock(m_mxSync);
+        if (m_started)
+            return;
+        m_started = true;
+    }
+
 #if defined(OS_ANDROID)
     // Android has no pthread_condattr_xxx API
     pthread_cond_init(&m_condSync, NULL);

data/platform/shared/common/PosixThreadImpl.h

@@ -25,6 +25,7 @@ private:
     pthread_cond_t m_condSync;
     common::CMutex m_mxSync;
     pthread_t m_thread;
+    bool m_started;
 };
 
 } // namespace common

data/platform/shared/common/RhoThread.cpp

@@ -7,6 +7,7 @@ namespace common {
 CRhoThread::CRhoThread(IRhoClassFactory* factory)
 {
     m_isInWaitState = false;
+    m_bStop = false;
     m_pImpl = factory->createThreadImpl();
 }
 

data/platform/shared/common/RhoThread.h

@@ -11,17 +11,19 @@ class CRhoThread : public IRhoRunnable
 {
     CAutoPtr<IRhoThreadImpl> m_pImpl;
     bool m_isInWaitState;
-
+    bool m_bStop;
 public:
 
     CRhoThread(IRhoClassFactory* factory);
     virtual ~CRhoThread(void){}
 
     virtual void start(EPriority ePriority);
-    virtual void stop(unsigned int nTimeoutToKill){ m_pImpl->stop(nTimeoutToKill); }
+    virtual void stop(unsigned int nTimeoutToKill){ m_bStop = true; m_pImpl->stop(nTimeoutToKill); }
     virtual void wait(unsigned int nTimeout){ m_isInWaitState = true; m_pImpl->wait(nTimeout); m_isInWaitState = false; }
     virtual void stopWait(){ if (m_isInWaitState) m_pImpl->stopWait(); }
     virtual void sleep(unsigned int nTimeout){ m_pImpl->sleep(nTimeout); }
+
+    bool isStopped(){return m_bStop;}
 };
 
 }

data/platform/shared/curl/include/curl/curl.h

@@ -180,8 +180,12 @@ typedef int (*curl_progress_callback)(void *clientp,
      Windows, while 16K for some odd reason performed a lot better.
      We do the ifndef check to allow this value to easier be changed at build
      time for those who feel adventurous. */
+#if defined(OS_ANDROID) || defined(__APPLE__)
+#define CURL_MAX_WRITE_SIZE 200*1024
+#else
 #define CURL_MAX_WRITE_SIZE 16384
 #endif
+#endif
 
 #ifndef CURL_MAX_HTTP_HEADER
 /* The only reason to have a max limit for this is to avoid the risk of a bad

data/platform/shared/db/DBAdapter.cpp

@@ -140,7 +140,7 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer
     //id INTEGER PRIMARY KEY, REMOVE
         LOG(INFO) + "Migrate database from " + dbVer.m_strRhoVer + " to " + strRhoDBVer;
 
-        CDBAdapter db;
+        CDBAdapter db(m_strDbPartition.c_str());
         db.open( m_strDbPath, m_strDbVer, true );
         DBResult( res, db.executeSQL( "ALTER TABLE sources ADD priority INTEGER" ));
         DBResult( res1, db.executeSQL( "ALTER TABLE sources ADD backend_refresh_time int default 0" ));
@@ -335,7 +335,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
     CRhoFile::deleteFile((dbNewName+"-journal").c_str());
     CRhoFile::deleteFile((dbNewName+".version").c_str());
 
-    CDBAdapter db;
+    CDBAdapter db(m_strDbPartition.c_str());
     db.open( dbNewName, m_strDbVer, true );
 
     //Copy all tables
@@ -352,21 +352,7 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
         if (destroyTableName(tableName, arIncludeTables, arExcludeTables)  )
             continue;
 
-        String strSelect = "SELECT * from " + tableName;
-        DBResult( res , executeSQL( strSelect.c_str() ) );
-		String strInsert = "";
-        int rc = 0;
-	    for ( ; !res.isEnd(); res.next() )
-	    {
-	    	sqlite3_stmt* stInsert = createInsertStatement(res, tableName, db, strInsert);
-
-            if (stInsert)
-            {
-                rc = sqlite3_step(stInsert);
-                checkDbError(rc);
-                sqlite3_finalize(stInsert);
-            }
-	    }
+        copyTable(tableName, *this, db );
     }
 
     db.endTransaction();
@@ -382,55 +368,50 @@ void CDBAdapter::destroy_tables(const rho::Vector<rho::String>& arIncludeTables,
     open( dbOldName, m_strDbVer, false );
 }
 
+void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbTo)
+{
+    String strSelect = "SELECT * from " + tableName;
+    DBResult( res , dbFrom.executeSQL( strSelect.c_str() ) );
+	String strInsert = "";
+    int rc = 0;
+    for ( ; !res.isEnd(); res.next() )
+    {
+    	sqlite3_stmt* stInsert = createInsertStatement(res, tableName, dbTo, strInsert);
+
+        if (stInsert)
+        {
+            rc = sqlite3_step(stInsert);
+            checkDbError(rc);
+            sqlite3_finalize(stInsert);
+        }
+    }
+}
+
 void CDBAdapter::setBulkSyncDB(String fDataName)
 {
-    CDBAdapter db;
+    CDBAdapter db(m_strDbPartition.c_str());
     db.open( fDataName, m_strDbVer, true );
     db.createTriggers();
 
     db.startTransaction();
 
-    //copy client_info
-	{
-		DBResult( res, executeSQL("SELECT * from client_info") );
-		String strInsert = "";
-		int rc = 0;
-	    for ( ; !res.isEnd(); res.next() )
-	    {
-	    	sqlite3_stmt* stInsert = createInsertStatement(res, "client_info", db, strInsert);
+    copyTable("client_info", *this, db );
 
-            if (stInsert)
-            {
-                rc = sqlite3_step(stInsert);
-                checkDbError(rc);
-                sqlite3_finalize(stInsert);
-            }
-	    }
-	}
-    //copy sources
-	{
-        String tableName = "sources";
-        String strSelect = "SELECT * from " + tableName;
-        DBResult( res , executeSQL( strSelect.c_str() ) );
-		String strInsert = "";
-        int rc = 0;
-	    for ( ; !res.isEnd(); res.next() )
-	    {
-            String strName = res.getStringByIdx(1);
-            DBResult( res2, db.executeSQL("SELECT name from sources where name=?", strName) );
-            if (!res2.isEnd())
-                continue;
-
-	    	sqlite3_stmt* stInsert = createInsertStatement(res, tableName, db, strInsert);
+    //update User partition
+    if ( m_strDbPartition.compare(USER_PARTITION_NAME())==0 )
+    {
+        //copy all NOT user sources from current db to bulk db
+        executeSQL("DELETE FROM sources WHERE partition=?", m_strDbPartition);
+        copyTable("sources", *this, db );
+    }else
+    {
+        //remove all m_strDbPartition sources from user db
+        //copy all sources from bulk db to user db
+        CDBAdapter& dbUser  = getDB(USER_PARTITION_NAME());
+        dbUser.executeSQL("DELETE FROM sources WHERE partition=?", m_strDbPartition);
 
-            if (stInsert)
-            {
-                rc = sqlite3_step(stInsert);
-                checkDbError(rc);
-                sqlite3_finalize(stInsert);
-            }
-	    }
-	}
+        copyTable("sources", db, dbUser );
+    }
 
     db.endTransaction();
     db.close();
@@ -694,7 +675,7 @@ void CDBAdapter::rollback()
 
 /*static*/ CDBAdapter& CDBAdapter::getUserDB()
 {
-    return *getDBPartitions().get("user");
+    return *getDBPartitions().get(USER_PARTITION_NAME());
 }
 
 /*static*/ CDBAdapter& CDBAdapter::getDB(const char* szPartition)
@@ -721,7 +702,7 @@ void CDBAdapter::rollback()
             return *(it->second);
     }
 
-    return *getDBPartitions().get("user");
+    return *getDBPartitions().get(USER_PARTITION_NAME());
 }
 
 }
@@ -737,7 +718,7 @@ int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB)
     CDBAdapter* pDB = CDBAdapter::getDBPartitions().get(szDBPartition);
     if ( !pDB )
     {
-        pDB = new CDBAdapter();
+        pDB = new CDBAdapter(szDBPartition);
         CDBAdapter::getDBPartitions().put(szDBPartition, pDB);
     }
 
@@ -812,6 +793,12 @@ void* rho_db_user_get_handle()
     return db.getDbHandle();
 }
 
+void* rho_db_user_get_adapter()
+{
+    rho::db::CDBAdapter& db = rho::db::CDBAdapter::getUserDB();
+    return &db;
+}
+
 int rho_db_prepare_statement(void* pDB, const char* szSql, int nByte, sqlite3_stmt **ppStmt)
 {
     rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);

data/platform/shared/db/DBAdapter.h

@@ -27,6 +27,8 @@ class CDBAdapter
 {
     sqlite3* m_dbHandle;
     String   m_strDbPath, m_strDbVer, m_strDbVerPath;
+    String   m_strDbPartition;
+
     Hashtable<String,sqlite3_stmt*> m_mapStatements;
     common::CRubyMutex m_mxRuby;
     common::CMutex m_mxDB;
@@ -48,10 +50,12 @@ class CDBAdapter
     	}
     };
 
+    static const char* USER_PARTITION_NAME(){return "user";}
 public:
     DEFINE_LOGCLASS;
 
-    CDBAdapter(void) : m_dbHandle(0), m_strDbPath(""), m_bUIWaitDB(false), m_nTransactionCounter(0){}
+    CDBAdapter(const char* szDBPartition) : m_dbHandle(0), m_strDbPath(""), m_strDbPartition(szDBPartition),
+        m_bUIWaitDB(false), m_nTransactionCounter(0) {}
     ~CDBAdapter(void){}
 
     void open (String strDbPath, String strVer, boolean bTemp);
@@ -244,7 +248,7 @@ private:
     virtual DBResultPtr prepareStatement( const char* szSt );
 
     boolean migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer, const String& strAppDBVer);
-
+    void copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbTo);
 };
 
 }

data/platform/shared/net/AsyncHttp.cpp

@@ -21,12 +21,14 @@ extern "C" void header_iter(const char* szName, const char* szValue, void* pHash
 
 CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
     const char* url, unsigned long headers, const char* body,
+    const char* file_path,
     const char* callback, const char* callback_params, boolean ssl_verify_peer) :  CRhoThread(factory)
 {
     m_bFinished = false;
     m_ptrFactory = factory;
     m_strUrl = url != null ? url : "";
     m_strBody = body != null ? body : "";
+    m_strFilePath = file_path != null ? file_path : "";
     m_strCallback = callback != null ? callback : "";
     m_strCallbackParams = callback_params != null ? callback_params : "";
     m_eCmd = eCmd;
@@ -126,16 +128,27 @@ void CAsyncHttp::run()
         break;
 
     case hcDownload:
-        m_pNetResponse = m_pNetRequest->pullFile(m_strUrl, m_strBody, null, &m_mapHeaders);
+        m_pNetResponse = m_pNetRequest->pullFile(m_strUrl, m_strFilePath, null, &m_mapHeaders);
         break;
 
     case hcUpload:
         {
-            net::CMultipartItem oItem;
-            oItem.m_strFilePath = m_strBody;
-            oItem.m_strContentType = "application/octet-stream";
+            VectorPtr<net::CMultipartItem*> arMultipartItems;
 
-            m_pNetResponse = m_pNetRequest->pushMultipartData( m_strUrl, oItem, null, &m_mapHeaders );
+            net::CMultipartItem* pItem = new net::CMultipartItem();
+            pItem->m_strFilePath = m_strFilePath;
+            pItem->m_strContentType = "application/octet-stream";
+            arMultipartItems.addElement(pItem);
+
+            if ( m_strBody.length() > 0 )
+            {
+                net::CMultipartItem* pItem = new net::CMultipartItem();
+                pItem->m_strBody = m_strBody;
+                pItem->m_strContentType = m_mapHeaders.get("content-type");
+                arMultipartItems.addElement(pItem);
+            }
+
+            m_pNetResponse = m_pNetRequest->pushMultipartData( m_strUrl, arMultipartItems, null, &m_mapHeaders );
             break;
         }
     }
@@ -223,7 +236,10 @@ void CAsyncHttp::callNotify(rho::net::INetResponse& resp, int nError )
         if (cookies.length()>0)
             m_strResBody += "&cookies=" + URI::urlEncode(cookies);
 
-        m_strResBody += "&" + makeHeadersString();
+        String strHeaders = makeHeadersString();
+        if (strHeaders.length() > 0 )
+            m_strResBody += "&" + strHeaders;
+
         m_strResBody += "&" + RHODESAPP().addCallbackObject(this, "body");
     }
 
@@ -249,25 +265,25 @@ using namespace rho::net;
 
 unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcGet, url, headers, null, callback, callback_params, ssl_verify_peer!=0 );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcGet, url, headers, null, null, callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 
 unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcPost, url, headers, body!=null?body:"", callback, callback_params, ssl_verify_peer!=0 );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcPost, url, headers, body!=null?body:"", null, callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 
 unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcDownload, url, headers, file_path, callback, callback_params, ssl_verify_peer!=0 );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcDownload, url, headers, "", file_path, callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 
-unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params, int ssl_verify_peer)
+unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* body, const char* file_path, const char* callback, const char* callback_params, int ssl_verify_peer)
 {
-    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcUpload, url, headers, file_path, callback, callback_params, ssl_verify_peer!=0 );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcUpload, url, headers, body, file_path, callback, callback_params, ssl_verify_peer!=0 );
     return pHttp->getRetValue();
 }
 

data/platform/shared/net/AsyncHttp.h

@@ -26,6 +26,7 @@ class CAsyncHttp : public common::CRhoThread, rho::ICallbackObject
     Hashtable<String,String> m_mapHeaders;
 
     String m_strUrl, m_strBody, m_strCallback, m_strCallbackParams;
+    String m_strFilePath;
 	String m_strResBody;
     boolean m_sslVerifyPeer;
     boolean m_bFinished;
@@ -39,6 +40,7 @@ public:
 
     CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
         const char* url, unsigned long headers, const char* body,
+        const char* file_path,
         const char* callback, const char* callback_params, boolean ssl_verify_peer = true);
 
     void cancel(boolean bWait);
@@ -70,7 +72,7 @@ extern "C" {
 unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params, int ssl_verify_peer);
 unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params, int ssl_verify_peer);
 unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
-unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
+unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* body, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 void rho_asynchttp_cancel(const char* cancel_callback);
 void rho_asynchttp_destroy();
 

data/platform/shared/net/CURLNetRequest.cpp

@@ -83,7 +83,8 @@ CURLNetRequest::CURLNetRequest()
 {
     m_bTraceCalls = rho_conf_getBool("net_trace");
     m_sslVerifyPeer = true;
-	curlm = curl_multi_init();
+    // Init curl
+    curlm = curl_multi_init();
     curl = curl_easy_init();
     curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, &errbuf);
 }
@@ -91,7 +92,7 @@ CURLNetRequest::CURLNetRequest()
 CURLNetRequest::~CURLNetRequest()
 {
     curl_easy_cleanup(curl);
-	curl_multi_cleanup(curlm);
+    curl_multi_cleanup(curlm);
 }
 
 INetResponse *CURLNetRequest::makeResponse(String strBody, int nErrorCode)
@@ -149,7 +150,7 @@ INetResponse* CURLNetRequest::doRequest( const char* method, const String& strUr
 
     rho_net_impl_network_indicator(1);
 
-    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, method, strUrl, strBody, oSession, pHeaders, m_sslVerifyPeer);
+    curl_slist *hdrs = set_curl_options(method, strUrl, strBody, oSession, pHeaders);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
 
@@ -176,7 +177,7 @@ INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, VectorPtr<
     
     rho_net_impl_network_indicator(1);
     
-    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "POST", strUrl, String(), oSession, pHeaders, m_sslVerifyPeer);
+    curl_slist *hdrs = set_curl_options("POST", strUrl, String(), oSession, pHeaders);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
 	
@@ -267,7 +268,7 @@ INetResponse* CURLNetRequest::pushFile(const String& strUrl, const String& strFi
 	
     rho_net_impl_network_indicator(1);
 	
-    curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "POST", strUrl, String(), oSession, pHeaders, m_sslVerifyPeer);
+    curl_slist *hdrs = set_curl_options("POST", strUrl, String(), oSession, pHeaders);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA, &strRespBody);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyStringCallback);
 	
@@ -308,7 +309,7 @@ INetResponse* CURLNetRequest::pullFile(const String& strUrl, const String& strFi
 
     rho_net_impl_network_indicator(1);
     
-	curl_slist *hdrs = set_curl_options(m_bTraceCalls, curl, "GET", strUrl, String(), oSession, pHeaders, m_sslVerifyPeer);
+	curl_slist *hdrs = set_curl_options("GET", strUrl, String(), oSession, pHeaders);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &oFile);
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &curlBodyFileCallback);
 	
@@ -459,8 +460,8 @@ static size_t curlHeaderCallback(void *ptr, size_t size, size_t nmemb, void *opa
     return nBytes;
 }
 
-curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const String& strUrl, const String& strBody,
-                             IRhoSession* pSession, Hashtable<String,String>* pHeaders, bool sslVerifyPeer)
+curl_slist *CURLNetRequest::set_curl_options(const char *method, const String& strUrl, const String& strBody,
+                             IRhoSession* pSession, Hashtable<String,String>* pHeaders)
 {
     curl_easy_reset(curl);
     if (strcasecmp(method, "GET") == 0)
@@ -485,7 +486,7 @@ curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const S
     curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);
     curl_easy_setopt(curl, CURLOPT_TCP_NODELAY, 1);
     
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, (long)sslVerifyPeer);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, (long)m_sslVerifyPeer);
     
     // Set very large timeout in case of local requests
     // It is required because otherwise requests (especially requests to writing!)
@@ -534,7 +535,7 @@ curl_slist *set_curl_options(bool trace, CURL *curl, const char *method, const S
     
     curl_easy_setopt(curl, CURLOPT_HTTPHEADER, hdrs);
     
-    if (trace) {
+    if (m_bTraceCalls) {
         curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, &curl_trace);
         curl_easy_setopt(curl, CURLOPT_DEBUGDATA, NULL);
         curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);

data/platform/shared/net/CURLNetRequest.h

@@ -36,12 +36,14 @@ public:
     virtual boolean isCancelled(){return m_bCancel;}
 
 private:
-	int getResponseCode(CURLMcode err, const String& strRespBody, IRhoSession* oSession);
-	String makeCookies();
+    curl_slist *set_curl_options(const char *method, const String& strUrl, const String& strBody,
+                                 IRhoSession* pSession, Hashtable<String,String>* pHeaders);
+    int getResponseCode(CURLMcode err, const String& strRespBody, IRhoSession* oSession);
+    String makeCookies();
     INetResponse *makeResponse(String strBody, int nErrorCode);
-	
+    
     boolean m_bCancel;
-	CURLM *curlm;
+    CURLM *curlm;
     CURL *curl;
     char *errbuf[CURL_ERROR_SIZE];
     boolean m_bTraceCalls;

data/platform/shared/net/HttpServer.cpp

@@ -888,8 +888,6 @@ bool CHttpServer::decide(String const &method, String const &uri, String const &
     Route route;
     if (dispatch(uri, route)) {
         RAWTRACE1("Uri %s is correct route, so enable MVC logic", uri.c_str());
-        if (method == "GET")
-            rho_rhodesapp_keeplastvisitedurl(uri.c_str());
         
         VALUE req = create_request_hash(route.application, route.model, route.action, route.id,
                                         method, uri, query, headers, body);
@@ -899,7 +897,10 @@ bool CHttpServer::decide(String const &method, String const &uri, String const &
 
         if (!send_response(reply))
             return false;
-        
+
+        if (method == "GET")
+            rho_rhodesapp_keeplastvisitedurl(uri.c_str());
+
         if (!route.id.empty())
             rho_sync_addobjectnotify_bysrcname(route.model.c_str(), route.id.c_str());
         
@@ -926,14 +927,18 @@ bool CHttpServer::decide(String const &method, String const &uri, String const &
         }
         
         RAWTRACE1("Uri %s is index file, call serveIndex", uri.c_str());
-        if (method == "GET")
-            rho_rhodesapp_keeplastvisitedurl(uri.c_str());
         
         VALUE data = callServeIndex((char *)fullPath.c_str());
         String reply(getStringFromValue(data), getStringLenFromValue(data));
         rho_ruby_releaseValue(data);
 
-        return send_response(reply);
+        if (!send_response(reply))
+            return false;
+
+        if (method == "GET")
+            rho_rhodesapp_keeplastvisitedurl(uri.c_str());
+
+        return true;
     }
     //RAWLOG_INFO("Sending File");