rhodes 1.5.1 → 1.5.2

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_strResBody;
     boolean m_bFinished;
 public:
     enum EHttpCommands{ hcGet = 0, hcPost, hcDownload, hcUpload };
@@ -33,8 +34,6 @@ private:
     EHttpCommands m_eCmd;
 public:
 
-    static boolean m_bNoThreaded;
-
     CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
         const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params);
 
@@ -45,6 +44,7 @@ public:
     //rho::ICallbackObject
     virtual unsigned long getObjectValue();
 
+    unsigned long getRetValue();
 private:
     virtual void run();
 
@@ -63,13 +63,12 @@ private:
 extern "C" {
 #endif //__cplusplus
 	
-void rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params);
-void rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params);
-void rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
-void rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
+unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params);
+unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params);
+unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
+unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params);
 void rho_asynchttp_cancel(const char* cancel_callback);
 void rho_asynchttp_destroy();
-void rho_asynchttp_set_threaded_mode(int b);
 
 #ifdef __cplusplus
 };

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

@@ -2,33 +2,29 @@
 %module "Rho::AsyncHttp"
 %{
 /* Put header files here or function declarations like below */
-	extern void rho_asynchttp_get(const char* url, VALUE headers, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_get(const char* url, VALUE headers, const char* callback, const char* callback_params);
 	#define do_get rho_asynchttp_get
 	
-	extern void rho_asynchttp_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params);
 	#define do_post rho_asynchttp_post
 
-	extern void rho_asynchttp_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
 	#define do_downloadfile rho_asynchttp_downloadfile
 
-	extern void rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
 	#define do_uploadfile rho_asynchttp_uploadfile
 
 	extern void rho_asynchttp_cancel(const char* cancel_callback);
 	#define cancel rho_asynchttp_cancel
 
-	extern void rho_asynchttp_set_threaded_mode(int b);
-	#define set_threaded_mode rho_asynchttp_set_threaded_mode
-	
 %}
 
 %typemap(default) const char* cancel_callback {
  $1 = "*";
 }
 
-extern void do_get(const char* url, VALUE headers, const char* callback, const char* callback_params);
-extern void do_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params);
-extern void do_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
-extern void do_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
+extern VALUE do_get(const char* url, VALUE headers, const char* callback, const char* callback_params);
+extern VALUE do_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params);
+extern VALUE do_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
+extern VALUE do_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
 extern void cancel(const char* cancel_callback);
-extern void set_threaded_mode(int b);

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

@@ -1546,24 +1546,21 @@ static VALUE mAsyncHttp;
 
 
 /* Put header files here or function declarations like below */
-	extern void rho_asynchttp_get(const char* url, VALUE headers, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_get(const char* url, VALUE headers, const char* callback, const char* callback_params);
 	#define do_get rho_asynchttp_get
 	
-	extern void rho_asynchttp_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_post(const char* url, VALUE headers, const char* body, const char* callback, const char* callback_params);
 	#define do_post rho_asynchttp_post
 
-	extern void rho_asynchttp_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_downloadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
 	#define do_downloadfile rho_asynchttp_downloadfile
 
-	extern void rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
+	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, const char* filename, const char* callback, const char* callback_params);
 	#define do_uploadfile rho_asynchttp_uploadfile
 
 	extern void rho_asynchttp_cancel(const char* cancel_callback);
 	#define cancel rho_asynchttp_cancel
 
-	extern void rho_asynchttp_set_threaded_mode(int b);
-	#define set_threaded_mode rho_asynchttp_set_threaded_mode
-	
 
 
 SWIGINTERN swig_type_info*
@@ -1619,76 +1616,13 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 
 
-
-#include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN	LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX	LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX	ULONG_LONG_MAX
-#endif
-
-
-SWIGINTERN VALUE
-SWIG_ruby_failed(void)
-{
-  return Qnil;
-} 
-
-
-/*@SWIG:%ruby_aux_method@*/
-SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
-{
-  VALUE obj = args[0];
-  VALUE type = TYPE(obj);
-  long *res = (long *)(args[1]);
-  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
-  return obj;
-}
-/*@SWIG@*/
-
-SWIGINTERN int
-SWIG_AsVal_long (VALUE obj, long* val)
-{
-  VALUE type = TYPE(obj);
-  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
-    long v;
-    VALUE a[2];
-    a[0] = obj;
-    a[1] = (VALUE)(&v);
-    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
-      if (val) *val = v;
-      return SWIG_OK;
-    }
-  }
-  return SWIG_TypeError;
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_int (VALUE obj, int *val)
-{
-  long v;
-  int res = SWIG_AsVal_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v < INT_MIN || v > INT_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = (int)(v);
-    }
-  }  
-  return res;
-}
-
 SWIGINTERN VALUE
 _wrap_do_get(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   VALUE arg2 = (VALUE) 0 ;
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
+  VALUE result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -1698,6 +1632,7 @@ _wrap_do_get(int argc, VALUE *argv, VALUE self) {
   int res4 ;
   char *buf4 = 0 ;
   int alloc4 = 0 ;
+  VALUE vresult = Qnil;
   
   if ((argc < 4) || (argc > 4)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
@@ -1718,11 +1653,12 @@ _wrap_do_get(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "do_get" "', argument " "4"" of type '" "char const *""'");
   }
   arg4 = (char *)(buf4);
-  do_get((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4);
+  result = (VALUE)do_get((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4);
+  vresult = result;
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
   if (alloc4 == SWIG_NEWOBJ) free((char*)buf4);
-  return Qnil;
+  return vresult;
 fail:
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -1738,6 +1674,7 @@ _wrap_do_post(int argc, VALUE *argv, VALUE self) {
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
+  VALUE result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -1750,6 +1687,7 @@ _wrap_do_post(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
+  VALUE vresult = Qnil;
   
   if ((argc < 5) || (argc > 5)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
@@ -1775,12 +1713,13 @@ _wrap_do_post(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "do_post" "', argument " "5"" of type '" "char const *""'");
   }
   arg5 = (char *)(buf5);
-  do_post((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  result = (VALUE)do_post((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  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);
-  return Qnil;
+  return vresult;
 fail:
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -1797,6 +1736,7 @@ _wrap_do_downloadfile(int argc, VALUE *argv, VALUE self) {
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
+  VALUE result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -1809,6 +1749,7 @@ _wrap_do_downloadfile(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
+  VALUE vresult = Qnil;
   
   if ((argc < 5) || (argc > 5)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
@@ -1834,12 +1775,13 @@ _wrap_do_downloadfile(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "do_downloadfile" "', argument " "5"" of type '" "char const *""'");
   }
   arg5 = (char *)(buf5);
-  do_downloadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  result = (VALUE)do_downloadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  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);
-  return Qnil;
+  return vresult;
 fail:
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -1856,6 +1798,7 @@ _wrap_do_uploadfile(int argc, VALUE *argv, VALUE self) {
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
+  VALUE result;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
@@ -1868,6 +1811,7 @@ _wrap_do_uploadfile(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
+  VALUE vresult = Qnil;
   
   if ((argc < 5) || (argc > 5)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
@@ -1893,12 +1837,13 @@ _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);
-  do_uploadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  result = (VALUE)do_uploadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  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);
-  return Qnil;
+  return vresult;
 fail:
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -1937,27 +1882,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-_wrap_set_threaded_mode(int argc, VALUE *argv, VALUE self) {
-  int arg1 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "set_threaded_mode" "', argument " "1"" of type '" "int""'");
-  } 
-  arg1 = (int)(val1);
-  set_threaded_mode(arg1);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2226,6 +2150,5 @@ SWIGEXPORT void Init_AsyncHttp(void) {
   rb_define_module_function(mAsyncHttp, "do_downloadfile", _wrap_do_downloadfile, -1);
   rb_define_module_function(mAsyncHttp, "do_uploadfile", _wrap_do_uploadfile, -1);
   rb_define_module_function(mAsyncHttp, "cancel", _wrap_cancel, -1);
-  rb_define_module_function(mAsyncHttp, "set_threaded_mode", _wrap_set_threaded_mode, -1);
 }
 

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

@@ -102,6 +102,11 @@ public class RhoRuby {
 		return res.toStr();
 	}
 	
+	public static void set_const(String name, String value)
+	{
+		RubyRuntime.ObjectClass.setConstant(name, ObjectFactory.createString(value) );
+	}
+	
 	public static void RhoRubyStart(String szAppPath)throws Exception
 	{
 		String[] args = new String[0];

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

@@ -59,21 +59,14 @@ public class RhodesApp
         return strRes;
     }
 
-    public void delCallbackObject(RubyValue valObject)
-    {
-        for (int i = 0; i < (int)m_arCallbackObjects.size(); i++)
-        {
-            if ( m_arCallbackObjects.elementAt(i) == valObject )
-                m_arCallbackObjects.setElementAt(null,i);
-        }
-    }
-
     public RubyValue getCallbackObject(int nIndex)
     {
         if ( nIndex < 0 || nIndex > m_arCallbackObjects.size() )
             return null;
 
-        return (RubyValue)m_arCallbackObjects.elementAt(nIndex);
+        RubyValue res = (RubyValue)m_arCallbackObjects.elementAt(nIndex);
+        m_arCallbackObjects.setElementAt(null,nIndex);        
+        return res;
     }
     
 }

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

@@ -27,12 +27,12 @@ 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_strResBody = "";
     boolean m_bFinished = false;
     
 	private RubyValue m_valBody;
 	public final static int  hcGet = 0, hcPost=1, hcDownload=2, hcUpload =3;
 	private int m_eCmd;
-	public  static boolean m_bNoThreaded;
 	
 	private RhodesApp RHODESAPP(){ return RhodesApp.getInstance(); }
 	
@@ -52,7 +52,7 @@ public class AsyncHttp extends RhoThread
 
 	    addNewObject(this);	    
 
-	    if (m_bNoThreaded)
+	    if (m_strCallback.length()==0)
 	        run();
 	    else
 	        start(epLow);
@@ -152,7 +152,7 @@ public class AsyncHttp extends RhoThread
 		        break;
 		    }
 		    
-		    if ( !m_pNetRequest.isCancelled() && m_strCallback.length() > 0)
+		    if ( !m_pNetRequest.isCancelled() )
 		    {
 			    processResponse(m_pNetResponse);
 		        callNotify(m_pNetResponse, 0);
@@ -215,69 +215,65 @@ public class AsyncHttp extends RhoThread
 	    m_valBody = RhoRuby.create_string(resp.getCharData());
 	}
 
+	RubyValue getRetValue()
+	{
+	    if ( m_strCallback.length() == 0 )
+	        return RhoRuby.create_string(m_strResBody); 
+
+	    return RubyConstant.QNIL;
+	}
+	
 	void callNotify(NetResponse resp, int nError )
 	{
-	    String strBody = "rho_callback=1";
-	    strBody += "&status=";
+		m_strResBody = "rho_callback=1";
+		m_strResBody += "&status=";
 	    if ( nError > 0 )
 	    {
-	    	strBody += "error&error_code=" + nError;
+	    	m_strResBody += "error&error_code=" + nError;
 	    }else
 	    {
 	    	if ( resp.isOK() )
-	    		strBody += "ok";
+	    		m_strResBody += "ok";
 		    else
 		    {
-		    	strBody += "error&error_code=";
+		    	m_strResBody += "error&error_code=";
 		        /*if ( !resp.isResponseRecieved())
 		            strBody += RhoRuby.ERR_NETWORK;
 		        else */if ( resp.isUnathorized() )
-		            strBody += RhoRuby.ERR_UNATHORIZED;
+		        	m_strResBody += RhoRuby.ERR_UNATHORIZED;
 		        else
-			        strBody += RhoRuby.ERR_REMOTESERVER;
+		        	m_strResBody += RhoRuby.ERR_REMOTESERVER;
 	
 		        //if ( resp.isResponseRecieved())
-			        strBody += "&http_error=" + resp.getRespCode();
+		        m_strResBody += "&http_error=" + resp.getRespCode();
 		    }
 
 	        String cookies = resp.getCookies();
 	        if (cookies.length()>0)
-	            strBody += "&cookies=" + URI.urlEncode(cookies);
+	        	m_strResBody += "&cookies=" + URI.urlEncode(cookies);
 	    	
-	    	strBody += "&" + makeHeadersString();
-	    	strBody += "&" + RHODESAPP().addCallbackObject(m_valBody, "body");
+	        m_strResBody += "&" + makeHeadersString();
+	        m_strResBody += "&" + RHODESAPP().addCallbackObject(m_valBody, "body");
 	    }
 	    
 	    if ( m_strCallbackParams.length() > 0 )
-	        strBody += "&" + m_strCallbackParams;
+	    	m_strResBody += "&" + m_strCallbackParams;
 	    	
-/*
-	    if ( m_bNoThreaded )
-	    {
-	        const char* szName = strrchr(m_strCallback.c_str(), '/');
-	        if (!szName)
-	            szName = m_strCallback.c_str();
-	        else
-	            szName++;
-
-	        String strName = "C_";
-	        strName += szName;
-	        rho_ruby_set_const( strName.c_str(), strBody.c_str());
-	    }else
-	    {*/
-	    try{
-	        NetRequest pNetRequest = m_ptrFactory.createNetRequest();
-
-	        String strFullUrl = pNetRequest.resolveUrl(m_strCallback);
-	        NetResponse resp1 = pNetRequest.pushData( strFullUrl, strBody, null );
-	        if ( !resp1.isOK() )
-	            LOG.ERROR("AsyncHttp notification failed. Code: " + resp1.getRespCode() + "; Error body: " + resp1.getCharData() );
-        }catch(Exception exc)
-        {
-        	LOG.ERROR("Async http callback failed.", exc);
-        }
 
-	    RHODESAPP().delCallbackObject(m_valBody);
+	    if ( m_strCallback.length() > 0 )
+	    {
+		    try{
+		        NetRequest pNetRequest = m_ptrFactory.createNetRequest();
+	
+		        String strFullUrl = pNetRequest.resolveUrl(m_strCallback);
+		        NetResponse resp1 = pNetRequest.pushData( strFullUrl, m_strResBody, null );
+		        if ( !resp1.isOK() )
+		            LOG.ERROR("AsyncHttp notification failed. Code: " + resp1.getRespCode() + "; Error body: " + resp1.getCharData() );
+	        }catch(Exception exc)
+	        {
+	        	LOG.ERROR("Async http callback failed.", exc);
+	        }
+	    }
 	}
 	
 	public static void initMethods(RubyModule klass) {
@@ -292,12 +288,12 @@ public class AsyncHttp extends RhoThread
 					String url = args.get(0).toStr();
 					String callback = args.get(2).toStr();
 					String callback_params = args.get(3).toStr();
-					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, callback, callback_params );
+					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_get failed", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 				}
-				return RubyConstant.QNIL;
 			}
 		});
 		
@@ -313,12 +309,12 @@ public class AsyncHttp extends RhoThread
 					String body = args.get(2).toStr();
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
-					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, callback, callback_params );
+					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_post failed", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 				}
-				return RubyConstant.QNIL;
 			}
 		});		
 
@@ -334,12 +330,12 @@ public class AsyncHttp extends RhoThread
 					String filepath = args.get(2).toStr();
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
-					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), filepath, callback, callback_params );
+					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_downloadfile failed", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 				}
-				return RubyConstant.QNIL;
 			}
 		});		
 
@@ -355,12 +351,12 @@ public class AsyncHttp extends RhoThread
 					String filepath = args.get(2).toStr();
 					String callback = args.get(3).toStr();
 					String callback_params = args.get(4).toStr();
-					new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcUpload, url, args.get(1), filepath, callback, callback_params );
+					AsyncHttp pHttp = new AsyncHttp(new RhoClassFactory(), AsyncHttp.hcUpload, url, args.get(1), filepath, callback, callback_params );
+					return pHttp.getRetValue();
 				} catch(Exception e) {
 					LOG.ERROR("do_uploadfile failed", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
 				}
-				return RubyConstant.QNIL;
 			}
 		});		
 
@@ -378,20 +374,6 @@ public class AsyncHttp extends RhoThread
 			}
 		});		
 
-		klass.getSingletonClass().defineMethod("set_threaded_mode", new RubyOneArgMethod(){ 
-			protected RubyValue run(RubyValue receiver, RubyValue arg, RubyBlock block )
-			{
-				try {
-					int b = arg.toInt();
-					AsyncHttp.m_bNoThreaded = (b==0);
-				} catch(Exception e) {
-					LOG.ERROR("set_threaded_mode failed", e);
-					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
-				}
-				return RubyConstant.QNIL;
-			}
-		});		
-		
 	}
 	
 }