rhodes 2.0.0.beta2 → 2.0.0.beta3

data/platform/shared/ruby/ext/asynchttp/asynchttp.i

@@ -11,7 +11,7 @@
 	extern VALUE rho_asynchttp_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 	#define do_downloadfile rho_asynchttp_downloadfile
 
-	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
+	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* body, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 	#define do_uploadfile rho_asynchttp_uploadfile
 
 	extern void rho_asynchttp_cancel(const char* cancel_callback);
@@ -26,5 +26,5 @@
 extern VALUE do_get(const char* url, VALUE headers, const char* callback, const char* callback_params, int ssl_verify_peer);
 extern VALUE do_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params, int ssl_verify_peer);
 extern VALUE do_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
-extern VALUE do_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
+extern VALUE do_uploadfile(const char* url, VALUE headers, const char* body, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 extern void cancel(const char* cancel_callback);

data/platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c

@@ -1555,7 +1555,7 @@ static VALUE mAsyncHttp;
 	extern VALUE rho_asynchttp_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 	#define do_downloadfile rho_asynchttp_downloadfile
 
-	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
+	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* body, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 	#define do_uploadfile rho_asynchttp_uploadfile
 
 	extern void rho_asynchttp_cancel(const char* cancel_callback);
@@ -1886,7 +1886,8 @@ _wrap_do_uploadfile(int argc, VALUE *argv, VALUE self) {
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
-  int arg6 ;
+  char *arg6 = (char *) 0 ;
+  int arg7 ;
   VALUE result;
   int res1 ;
   char *buf1 = 0 ;
@@ -1900,12 +1901,15 @@ _wrap_do_uploadfile(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
-  int val6 ;
-  int ecode6 = 0 ;
+  int res6 ;
+  char *buf6 = 0 ;
+  int alloc6 = 0 ;
+  int val7 ;
+  int ecode7 = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 6) || (argc > 6)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
+  if ((argc < 7) || (argc > 7)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
@@ -1928,23 +1932,30 @@ _wrap_do_uploadfile(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "do_uploadfile" "', argument " "5"" of type '" "char const *""'");
   }
   arg5 = (char *)(buf5);
-  ecode6 = SWIG_AsVal_int(argv[5], &val6);
-  if (!SWIG_IsOK(ecode6)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "do_uploadfile" "', argument " "6"" of type '" "int""'");
+  res6 = SWIG_AsCharPtrAndSize(argv[5], &buf6, NULL, &alloc6);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "do_uploadfile" "', argument " "6"" of type '" "char const *""'");
+  }
+  arg6 = (char *)(buf6);
+  ecode7 = SWIG_AsVal_int(argv[6], &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "do_uploadfile" "', argument " "7"" of type '" "int""'");
   } 
-  arg6 = (int)(val6);
-  result = (VALUE)do_uploadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6);
+  arg7 = (int)(val7);
+  result = (VALUE)do_uploadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,arg7);
   vresult = result;
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
   if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
   return vresult;
 fail:
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
   if (alloc5 == SWIG_NEWOBJ) free((char*)buf5);
+  if (alloc6 == SWIG_NEWOBJ) free((char*)buf6);
   return Qnil;
 }
 

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -486,7 +486,7 @@ VALUE callFramework(VALUE hashReq) {
 
     rb_gc_register_mark_object(callres);
     //TBD: need to cleanup memory
-    rb_gc();
+    //rb_gc();
 
     return callres;
 }
@@ -505,7 +505,7 @@ VALUE callServeIndex(char* index_name) {
     rb_gc_register_mark_object(callres);
 
     //TBD: need to cleanup memory
-    rb_gc();
+    //rb_gc();
     
     return callres;
 }

data/platform/shared/ruby/ext/rho/rhosupport.c

@@ -269,22 +269,42 @@ VALUE isAlreadyLoaded(VALUE path)
 
 RHO_INIT_LOCK(require_lock);
 
+static int String_endsWith(const char* str, const char* szSuffix)
+{
+    int nOff = 0;
+    if ( !szSuffix || !*szSuffix )
+        return 0;
+
+    nOff = strlen(str) - strlen(szSuffix);
+    if ( nOff < 0 )
+        return 0;
+
+    return strcmp(str+nOff, szSuffix) == 0;
+}
+
 VALUE require_compiled(VALUE fname, VALUE* result)
 {
     VALUE path;
     char* szName1 = 0;
     VALUE retval = Qtrue;
 
-    RHO_LOCK(require_lock);
-    rb_funcall(fname, rb_intern("sub!"), 2, rb_str_new2(".rb"), rb_str_new2("") );
+    szName1 = RSTRING_PTR(fname);
 
+    if ( String_endsWith(szName1,".rb") ) 
+    {
+        rb_str_chop_bang(fname); rb_str_chop_bang(fname); rb_str_chop_bang(fname);
+    }
+    //rb_funcall(fname, rb_intern("sub!"), 2, rb_str_new2(".rb"), rb_str_new2("") );
     szName1 = RSTRING_PTR(fname);
+
     if ( strcmp("strscan",szName1)==0 || strcmp("enumerator",szName1)==0 ||
         strcmp("stringio",szName1)==0 || strcmp("socket",szName1)==0 ||
         strcmp("digest.so",szName1)==0 ||
         strcmp("fcntl",szName1)==0 || strcmp("digest/md5",szName1)==0 ||
         strcmp("digest/sha1",szName1)==0 )
-        goto RCompExit;
+        return Qtrue;
+
+    RHO_LOCK(require_lock);
 
     if ( isAlreadyLoaded(fname) == Qtrue )
         goto RCompExit;

data/platform/shared/ruby/ext/webview/webview.i

@@ -17,6 +17,9 @@ extern int rho_webview_active_tab();
 extern void rho_webview_full_screen_mode(int enable);
 #define full_screen_mode rho_webview_full_screen_mode
 
+extern void rho_webview_set_cookie(const char* url, const char* cookie);
+#define set_cookie rho_webview_set_cookie
+
 %}
 
 %typemap(default) int index {
@@ -30,3 +33,4 @@ extern const char* execute_js(const char* js, int index);
 extern void set_menu_items(VALUE argv);
 extern int active_tab();
 extern void full_screen_mode(int enable);
+extern void set_cookie(const char* url, const char* cookie);

data/platform/shared/ruby/ext/webview/webview_wrap.c

@@ -1561,6 +1561,9 @@ extern int rho_webview_active_tab();
 extern void rho_webview_full_screen_mode(int enable);
 #define full_screen_mode rho_webview_full_screen_mode
 
+extern void rho_webview_set_cookie(const char* url, const char* cookie);
+#define set_cookie rho_webview_set_cookie
+
 
 
 #include <limits.h>
@@ -1898,6 +1901,41 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_set_cookie(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_cookie" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = (char *)(buf1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "set_cookie" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = (char *)(buf2);
+  set_cookie((char const *)arg1,(char const *)arg2);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2167,5 +2205,6 @@ SWIGEXPORT void Init_WebView(void) {
   rb_define_module_function(mWebView, "set_menu_items", _wrap_set_menu_items, -1);
   rb_define_module_function(mWebView, "active_tab", _wrap_active_tab, -1);
   rb_define_module_function(mWebView, "full_screen_mode", _wrap_full_screen_mode, -1);
+  rb_define_module_function(mWebView, "set_cookie", _wrap_set_cookie, -1);
 }
 

data/platform/shared/ruby/re.c

@@ -1232,6 +1232,14 @@ rb_reg_prepare_re(VALUE re, VALUE str)
     rb_encoding *enc = rb_reg_prepare_enc(re, str, 1);
 
     if (reg->enc == enc) return reg;
+//RHO
+    if (reg->enc->ruby_encoding_index == rb_ascii8bit_encindex() &&
+        enc->ruby_encoding_index == rb_usascii_encindex() )
+        return reg;
+    if (reg->enc->ruby_encoding_index == rb_usascii_encindex() &&
+        enc->ruby_encoding_index == rb_ascii8bit_encindex() )
+        return reg;
+//RHO
 
     rb_reg_check(re);
     reg = RREGEXP(re)->ptr;

data/platform/shared/ruby/string.c

@@ -5822,7 +5822,7 @@ chopped_length(VALUE str)
  *  <code>String#chomp!</code>.
  */
 
-static VALUE
+/*static*/ VALUE
 rb_str_chop_bang(VALUE str)
 {
     if (RSTRING_LEN(str) > 0) {

data/platform/shared/rubyJVM/src/com/rho/IRhoRubyHelper.java

@@ -14,6 +14,7 @@ public interface IRhoRubyHelper {
 	public abstract IDBStorage createDBStorage();
 	public abstract IFileAccess createFileAccess();
 	public abstract IRAFile createRAFile();
+	public abstract IRAFile createFSRAFile();
 	
 	public void loadBackTrace(RubyArray backtrace);
 	public String getDeviceId();

data/platform/shared/rubyJVM/src/com/rho/RhoClassFactory.java

@@ -45,7 +45,12 @@ public class RhoClassFactory
     {
     	return RhoClassFactory.createRhoRubyHelper().createRAFile();
     }
-    
+
+    public static IRAFile createFSRAFile() throws Exception
+    {
+    	return RhoClassFactory.createRhoRubyHelper().createFSRAFile();
+    }
+
     public static IDBStorage createDBStorage() throws Exception
     {
     	return RhoClassFactory.createRhoRubyHelper().createDBStorage();

data/platform/shared/rubyJVM/src/com/rho/RhoThread.java

@@ -19,6 +19,9 @@ public class RhoThread extends Thread
     
     public void start(int ePriority)
     {
+    	if ( super.isAlive() )
+    		return;
+    	
     	super.start();
     	
     	int nThreadPriority = Thread.NORM_PRIORITY;

data/platform/shared/rubyJVM/src/com/rho/RhodesApp.java

@@ -13,6 +13,7 @@ public class RhodesApp
 	static RhodesApp m_pInstance;
 	
     private String m_strRhoRootPath, m_strBlobsDirPath, m_strDBDirPath;
+	private String m_strHomeUrl;
 	
     Vector/*<unsigned long>*/ m_arCallbackObjects = new Vector();
     private SplashScreen m_oSplashScreen = new SplashScreen();
@@ -23,6 +24,9 @@ public class RhodesApp
 	Mutex m_mxScreenRotationCallback = new Mutex();
     String m_strScreenRotationCallback = "", m_strScreenRotationCallbackParams = "";
     
+    int m_currentTabIndex = 0;
+    String[] m_currentUrls = new String[5];
+    
     NetRequest getNet() { return RhoClassFactory.createNetRequest();}
     
     public static RhodesApp Create(String strRootPath)
@@ -57,6 +61,7 @@ public class RhodesApp
 
     void initAppUrls() 
     {
+    	m_strHomeUrl = "http://localhost:8080";
         m_strBlobsDirPath = getRhoRootPath() + "db/db-files";
     	m_strDBDirPath = getRhoRootPath() + "db";
     }
@@ -181,5 +186,34 @@ public class RhodesApp
         strBody += "&rho_callback=1";
         getNet().pushData( strCallbackUrl, strBody, null );
     }
+ 
+    public String getCurrentUrl(int index)
+    { 
+        return m_currentUrls[m_currentTabIndex]; 
+    }
     
+    public void keepLastVisitedUrl(String strUrl)
+    {
+        //LOG(INFO) + "Current URL: " + strUrl;
+
+    	try{
+	        m_currentUrls[m_currentTabIndex] = canonicalizeRhoUrl(strUrl);
+	
+	        if ( RHOCONF().getBool("KeepTrackOfLastVisitedPage") )
+	        {
+	            if ( strUrl.startsWith(m_strHomeUrl) )
+	                strUrl = strUrl.substring(m_strHomeUrl.length());
+	
+	            int nFragment = strUrl.indexOf('#');
+	            if ( nFragment >= 0 )
+	                strUrl = strUrl.substring(0, nFragment);
+	
+	            RHOCONF().setString("LastVisitedPage",strUrl);		
+	            RHOCONF().saveToFile();
+	        }
+    	}catch(Exception exc)
+    	{
+    		LOG.ERROR("Save current location failed.", exc);
+    	}
+	}    
 }

data/platform/shared/rubyJVM/src/com/rho/db/DBAdapter.java

@@ -18,8 +18,8 @@ public class DBAdapter extends RubyBasic
 	
 	private IDBStorage m_dbStorage;
 	private boolean m_bIsOpen = false;
-	private String  m_strDBPath;
-	private String  m_strDBVerPath;
+	private String  m_strDBPath, m_strDBVerPath;
+	private String  m_strDbPartition;
 	private DBAttrManager m_attrMgr = new DBAttrManager();
 	static Hashtable/*Ptr<String,CDBAdapter*>*/ m_mapDBPartitions = new Hashtable();
 	
@@ -27,6 +27,7 @@ public class DBAdapter extends RubyBasic
     int m_nTransactionCounter=0;
     boolean m_bUIWaitDB = false;
 	
+    static String USER_PARTITION_NAME(){return "user";}
     static Hashtable/*Ptr<String,CDBAdapter*>&*/ getDBPartitions(){ return  m_mapDBPartitions; }
     
 	DBAdapter(RubyClass c) {
@@ -46,6 +47,11 @@ public class DBAdapter extends RubyBasic
 		return m_Instance;
 	}*/
 
+	private void setDbPartition(String strPartition)
+	{
+		m_strDbPartition = strPartition;
+	}
+	 
 	public void close()
 	{ 
 		try{
@@ -613,15 +619,7 @@ public class DBAdapter extends RubyBasic
 				if ( destroyTableName( tableName, vecIncludes, vecExcludes ) )
 					continue;
 				
-				res = executeSQL("SELECT * from " + tableName, null);
-				String strInsert = "";
-			    for ( ; !res.isEnd(); res.next() )
-			    {
-			    	if ( strInsert.length() == 0 )
-			    		strInsert = createInsertStatement(res, tableName);
-			    	
-			    	db.executeSQL(strInsert, res.getCurData(), false );
-			    }
+				copyTable(tableName, this.m_dbStorage, db );
 			}
 			
 		    db.commit();
@@ -682,6 +680,19 @@ public class DBAdapter extends RubyBasic
 		return RubyConstant.QNIL;
     }
     
+    private void copyTable(String tableName, IDBStorage dbFrom, IDBStorage dbTo)throws DBException
+    {
+    	IDBResult res = dbFrom.executeSQL("SELECT * from " + tableName, null, false);
+		String strInsert = "";
+	    for ( ; !res.isEnd(); res.next() )
+	    {
+	    	if ( strInsert.length() == 0 )
+	    		strInsert = createInsertStatement(res, tableName);
+	    	
+	    	dbTo.executeSQL(strInsert, res.getCurData(), false );
+	    }
+    }
+    
     public void setBulkSyncDB(String fDbName, String fScriptName)
     {
 		IDBStorage db = null;
@@ -691,48 +702,23 @@ public class DBAdapter extends RubyBasic
 
 		    db.startTransaction();
 			
-		    //copy client_info
-			{
-				IDBResult res = executeSQL("SELECT * from client_info", null);
-				String strInsert = "";
-				
-			    for ( ; !res.isEnd(); res.next() )
-			    {
-			    	if ( strInsert.length() == 0 )
-			    		strInsert = createInsertStatement(res, "client_info");
-			    	
-			    	db.executeSQL(strInsert, res.getCurData(), false );
-			    }
-			}
-		    //copy sources
-			{
-		        String tableName = "sources";
-		        String strSelect = "SELECT * from " + tableName;
-		        IDBResult res = executeSQL( strSelect );
-				String strInsert = "";
-			    for ( ; !res.isEnd(); res.next() )
-			    {
-		            String strName = res.getStringByIdx(1);
-		            Object[] values = {strName};
-		            IDBResult res2 = db.executeSQL("SELECT name from sources where name=?", values, false);
-		            if (!res2.isEnd())
-		                continue;
+		    copyTable("client_info", this.m_dbStorage, db );
+		    
+		    //update User partition
+		    if ( m_strDbPartition.compareTo(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.m_dbStorage, db );
+		    }else
+		    {
+		        //remove all m_strDbPartition sources from user db
+		        //copy all sources from bulk db to user db
+		        DBAdapter dbUser  = getDB(USER_PARTITION_NAME());
+		        dbUser.executeSQL("DELETE FROM sources WHERE partition=?", m_strDbPartition);
 
-			    	if ( strInsert.length() == 0 )
-			    		strInsert = createInsertStatement(res, tableName);
-			    	
-			    	db.executeSQL(strInsert, res.getCurData(), false );
-			    }
-/*				
-				IDBResult res = executeSQL("SELECT name, sync_type, partition, priority from sources", null);
-			    for ( ; !res.isEnd(); res.next() )
-			    {
-			    	String strName = res.getStringByIdx(0);
-			    	Object[] values = {res.getStringByIdx(1), new Integer(res.getIntByIdx(2)),new Integer(res.getIntByIdx(3)),strName};
-			    	
-		            db.executeSQL("UPDATE sources SET sync_type=?, partition=?, priority=? where name=?",values, false); 
-			    }*/
-			}
+		        copyTable("sources", db, dbUser.m_dbStorage );
+		    }
 			
 		    db.commit();
 		    db.close();
@@ -899,7 +885,7 @@ public class DBAdapter extends RubyBasic
     
     public static DBAdapter getUserDB()
     {
-        return (DBAdapter)getDBPartitions().get("user");
+        return (DBAdapter)getDBPartitions().get(USER_PARTITION_NAME());
     }
 
     public static DBAdapter getDB(String szPartition)
@@ -937,6 +923,7 @@ public class DBAdapter extends RubyBasic
 		    		String szDbName = arg1.toStr();
 		    		String szDbPartition = arg2.toStr();
 		    		((DBAdapter)receiver).openDB(szDbName);
+		    		((DBAdapter)receiver).setDbPartition(szDbPartition);
 		    		
 		    		DBAdapter.getDBPartitions().put(szDbPartition, receiver);
 		    		

data/platform/shared/rubyJVM/src/com/rho/net/AsyncHttp.java

@@ -28,6 +28,7 @@ public class AsyncHttp extends RhoThread
 	private Hashtable/*<String,String>*/ m_mapHeaders = new Hashtable();
 
 	private String m_strUrl, m_strBody, m_strCallback, m_strCallbackParams;
+	private String m_strFilePath;
     private String m_strResBody = "";
     boolean m_bFinished = false;
     
@@ -38,13 +39,14 @@ public class AsyncHttp extends RhoThread
 	private RhodesApp RHODESAPP(){ return RhodesApp.getInstance(); }
 	
 	AsyncHttp(RhoClassFactory factory, int eCmd,
-		    String url, RubyValue headers, String body, String callback, String callback_params)
+		    String url, RubyValue headers, String body, String filepath, String callback, String callback_params)
 	{
 		super(factory);
 		
 	    m_ptrFactory = factory;
 	    m_strUrl = url != null ? url : "";
 	    m_strBody = body != null ? body : "";
+	    m_strFilePath = filepath != null ? filepath : "";
 	    m_strCallback = callback != null ? callback : "";
 	    m_strCallbackParams = callback_params != null ? callback_params : "";
 	    m_eCmd = eCmd;
@@ -150,11 +152,22 @@ public class AsyncHttp extends RhoThread
 	
 		    case hcUpload:
 		    	{
+		            Vector/*Ptr<net::CMultipartItem*>*/ arMultipartItems = new Vector();
+
 		            MultipartItem oItem = new MultipartItem();
-		            oItem.m_strFilePath = m_strBody;
+		            oItem.m_strFilePath = m_strFilePath;
 		            oItem.m_strContentType = "application/octet-stream";
-	
-		            m_pNetResponse = m_pNetRequest.pushMultipartData( m_strUrl, oItem, null, m_mapHeaders );
+		            arMultipartItems.addElement(oItem);
+
+		            if ( m_strBody.length() > 0 )
+		            {
+			            MultipartItem oItem2 = new MultipartItem();
+			            oItem2.m_strBody = m_strBody;
+			            oItem2.m_strContentType = (String)m_mapHeaders.get("content-type");
+			            arMultipartItems.addElement(oItem2);
+		            }
+		    		
+		            m_pNetResponse = m_pNetRequest.pushMultipartData( m_strUrl, arMultipartItems, null, m_mapHeaders );
 			        break;
 		    	}
 		    }
@@ -253,7 +266,10 @@ public class AsyncHttp extends RhoThread
 	        if (cookies.length()>0)
 	        	m_strResBody += "&cookies=" + URI.urlEncode(cookies);
 	    	
-	        m_strResBody += "&" + makeHeadersString();
+	        String strHeaders = makeHeadersString();
+	        if ( strHeaders != null && strHeaders.length() > 0 )
+	        	m_strResBody += "&" + makeHeadersString();
+	        
 	        m_strResBody += "&" + RHODESAPP().addCallbackObject(m_valBody, "body");
 	    }
 	    
@@ -290,7 +306,7 @@ public class AsyncHttp extends RhoThread
 					String callback = args.get(2).toStr();
 					String callback_params = args.get(3).toStr();
 					boolean ssl_verify_peer = args.get(4).toInt() != 0 ? true : false;
-					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcGet, url, args.get(1), null, callback, callback_params );
+					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcGet, url, args.get(1), null, null, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_get failed", e);
@@ -312,7 +328,7 @@ public class AsyncHttp extends RhoThread
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
 					boolean ssl_verify_peer = args.get(5).toInt() != 0 ? true : false;
-					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcPost, url, args.get(1), body, callback, callback_params );
+					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcPost, url, args.get(1), body, null, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_post failed", e);
@@ -334,7 +350,7 @@ public class AsyncHttp extends RhoThread
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
 					boolean ssl_verify_peer = args.get(5).toInt() != 0 ? true : false;
-					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcDownload, url, args.get(1), filepath, callback, callback_params );
+					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcDownload, url, args.get(1), null, filepath, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_downloadfile failed", e);
@@ -346,17 +362,18 @@ public class AsyncHttp extends RhoThread
 		klass.getSingletonClass().defineMethod("do_uploadfile", new RubyVarArgMethod(){ 
 			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block )
 			{
-				if ( args.size() != 6 )
+				if ( args.size() != 7 )
 					throw new RubyException(RubyRuntime.ArgumentErrorClass, 
-							"in AsyncHttp.do_uploadfile: wrong number of arguments ( " + args.size() + " for " + 6 + " )");			
+							"in AsyncHttp.do_uploadfile: wrong number of arguments ( " + args.size() + " for " + 7 + " )");			
 				
 				try {
 					String url = args.get(0).toStr();
-					String filepath = args.get(2).toStr();
-					String callback = args.get(3).toStr();
-					String callback_params = args.get(4).toStr();
-					boolean ssl_verify_peer = args.get(5).toInt() != 0 ? true : false;
-					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcUpload, url, args.get(1), filepath, callback, callback_params );
+					String body = args.get(2).toStr();
+					String filepath = args.get(3).toStr();
+					String callback = args.get(4).toStr();
+					String callback_params = args.get(5).toStr();
+					boolean ssl_verify_peer = args.get(6).toInt() != 0 ? true : false;
+					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcUpload, url, args.get(1), body, filepath, callback, callback_params );
 					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_uploadfile failed", e);