rhodes 1.5.5 → 2.0.0.beta1

data/platform/shared/net/HttpServer.h

@@ -2,7 +2,6 @@
 #define RHO_HTTP_SERVER_F5FFD21AD3EE463E850C5E2C789397BD
 
 #include "common/RhoStd.h"
-#include "common/RhoPort.h"
 #include "logging/RhoLog.h"
 
 #if !defined(OS_WINDOWS) && !defined(OS_WINCE)

data/platform/shared/net/INetRequest.h

@@ -7,8 +7,6 @@
 namespace rho {
 namespace net {
 
-#define MAX_NETREQUEST_RETRY 1
-
 struct INetResponse
 {
     virtual ~INetResponse(void){;}
@@ -25,6 +23,19 @@ struct IRhoSession
 {
 	virtual void logout()=0;
 	virtual const String& getSession()=0;
+    virtual const String& getContentType()=0;
+};
+
+struct CMultipartItem
+{
+    //mutually exclusive
+    String m_strFilePath;
+    String m_strBody;
+    //
+
+    String m_strName, m_strFileName, m_strContentType;
+
+    String m_strDataPrefix;
 };
 
 struct INetRequest
@@ -33,12 +44,17 @@ struct INetRequest
 
     virtual INetResponse* pullData(const String& strUrl, IRhoSession* oSession ) = 0;
     virtual INetResponse* pushData(const String& strUrl, const String& strBody, IRhoSession* oSession)=0;
-    virtual INetResponse* pushFile(const String& strUrl, const String& strFileName, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
+    virtual INetResponse* pushMultipartData(const String& strUrl, VectorPtr<CMultipartItem*>& arItems, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
+    virtual INetResponse* pushMultipartData(const String& strUrl, CMultipartItem& oItem, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
+
     virtual INetResponse* pullFile(const String& strUrl, const String& strFileName, IRhoSession* oSession, Hashtable<String,String>* pHeaders)=0;
     virtual INetResponse* pullCookies(const String& strUrl, const String& strBody, IRhoSession* oSession)=0;
 
     virtual INetResponse* doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )=0;
 
+    virtual boolean sslVerifyPeer() = 0;
+    virtual void sslVerifyPeer(boolean mode) = 0;
+    
     virtual String resolveUrl(const String& strUrl)=0;
 
     virtual void cancel() = 0;

data/platform/shared/net/URI.cpp

@@ -151,7 +151,7 @@ String URI::urlEncode(const String& fullPath)
 	while (stringtokenizer.hasMoreTokens()) 
     {
 		String tok = stringtokenizer.nextToken();
-		tok = trim(tok);
+		tok = String_trim(tok);
 		if (tok.length() == 0) {
 			continue;
 		}
@@ -171,7 +171,7 @@ String URI::urlEncode(const String& fullPath)
 			}
 			
 			tok = tok.substr(0,nExp) + tok.substr(nEnd+1);
-			tok = trim(tok);
+			tok = String_trim(tok);
 		}
 		
 		int nEq = tok.find('=');

data/platform/shared/net/ssl.cpp

@@ -15,9 +15,9 @@ void rho_ssl_free_storage(void *ptr)
     return GETSSL->freeStorage(ptr);
 }
 
-CURLcode rho_ssl_connect(int sockfd, int nonblocking, int *done, void *storage)
+CURLcode rho_ssl_connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage)
 {
-    return GETSSL->connect(sockfd, nonblocking, done, storage);
+    return GETSSL->connect(sockfd, nonblocking, done, ssl_verify_peer, storage);
 }
 
 void rho_ssl_shutdown(void *storage)

data/platform/shared/net/ssl.h

@@ -14,7 +14,7 @@ struct ISSL
     virtual void* createStorage() = 0;
     virtual void freeStorage(void *ptr) = 0;
 
-    virtual CURLcode connect(int sockfd, int nonblocking, int *done, void *storage) = 0;
+    virtual CURLcode connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage) = 0;
     virtual void shutdown(void *storage) = 0;
     virtual ssize_t send(const void *mem, size_t len, void *storage) = 0;
     virtual ssize_t recv(char *buf, size_t size, int *wouldblock, void *storage) = 0;
@@ -26,7 +26,7 @@ struct ISSL
 extern "C" {
 void *rho_ssl_create_storage();
 void rho_ssl_free_storage(void *);
-CURLcode rho_ssl_connect(int sockfd, int nonblocking, int *done, void *storage);
+CURLcode rho_ssl_connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage);
 void rho_ssl_shutdown(void *storage);
 ssize_t rho_ssl_send(const void *mem, size_t len, void *storage);
 ssize_t rho_ssl_recv(char *buf, size_t size, int *wouldblock, void *storage);

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

@@ -1,14 +1,26 @@
 /* alert.i */
 %module Alert
 %{
-extern void alert_show_popup(char* message);
+#include "ext/rho/rhoruby.h"
+extern void alert_show_popup(rho_param *p);
 #define show_popup alert_show_popup 
+extern void alert_hide_popup();
+#define hide_popup alert_hide_popup
 extern void alert_vibrate(void*);
 #define vibrate alert_vibrate
 extern void alert_play_file(char* file_name, ...);
 #define play_file alert_play_file 
 %}
 
-extern void show_popup(char* message);
+%typemap(in) (rho_param *p) {
+    $1 = valueToRhoParam($input);
+}
+
+%typemap(freearg) (rho_param *p) {
+    rho_param_free($1);
+}
+
+extern void show_popup(rho_param *p);
+extern void hide_popup();
 extern void vibrate(...);
 extern void play_file(char* file_name, ...);

data/platform/shared/ruby/ext/alert/alert_wrap.c

@@ -998,10 +998,10 @@ extern "C" {
 /* Global Ruby hash table to store Trackings from C/C++
    structs to Ruby Objects. */
 static VALUE swig_ruby_trackings;
-
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete = 0;
+
+/* Global variable that stores a reference to the ruby
+   hash table delete function. */
+static ID swig_ruby_hash_delete = 0;
 
 /* Setup a Ruby hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
@@ -1011,9 +1011,9 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
   swig_ruby_trackings = rb_hash_new();
   rb_gc_register_address(&swig_ruby_trackings);
   
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
+  /* Now store a reference to the hash table delete function
+     so that we only have to look it up once.*/
+  swig_ruby_hash_delete = rb_intern("delete");
 }
 
 /* Get a Ruby number to reference a pointer */
@@ -1525,8 +1525,9 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_char swig_types[0]
-static swig_type_info *swig_types[2];
-static swig_module_info swig_module = {swig_types, 1, 0, 0, 0, 0};
+#define SWIGTYPE_p_rho_param swig_types[1]
+static swig_type_info *swig_types[3];
+static swig_module_info swig_module = {swig_types, 2, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1545,8 +1546,11 @@ static VALUE mAlert;
 #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
 
 
-extern void alert_show_popup(char* message);
+#include "ext/rho/rhoruby.h"
+extern void alert_show_popup(rho_param *p);
 #define show_popup alert_show_popup 
+extern void alert_hide_popup();
+#define hide_popup alert_hide_popup
 extern void alert_vibrate(void*);
 #define vibrate alert_vibrate
 extern void alert_play_file(char* file_name, ...);
@@ -1608,24 +1612,35 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 SWIGINTERN VALUE
 _wrap_show_popup(int argc, VALUE *argv, VALUE self) {
-  char *arg1 = (char *) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
+  rho_param *arg1 = (rho_param *) 0 ;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "show_popup" "', argument " "1"" of type '" "char *""'");
+  {
+    arg1 = valueToRhoParam(argv[0]);
   }
-  arg1 = (char *)(buf1);
   show_popup(arg1);
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  {
+    rho_param_free(arg1);
+  }
+  return Qnil;
+fail:
+  {
+    rho_param_free(arg1);
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_hide_popup(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  hide_popup();
   return Qnil;
 fail:
-  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   return Qnil;
 }
 
@@ -1673,15 +1688,19 @@ fail:
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_rho_param = {"_p_rho_param", "rho_param *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_char,
+  &_swigt__p_rho_param,
 };
 
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_rho_param[] = {  {&_swigt__p_rho_param, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_char,
+  _swigc__p_rho_param,
 };
 
 
@@ -1932,6 +1951,7 @@ SWIGEXPORT void Init_Alert(void) {
   
   SWIG_RubyInitializeTrackings();
   rb_define_module_function(mAlert, "show_popup", _wrap_show_popup, -1);
+  rb_define_module_function(mAlert, "hide_popup", _wrap_hide_popup, -1);
   rb_define_module_function(mAlert, "vibrate", _wrap_vibrate, -1);
   rb_define_module_function(mAlert, "play_file", _wrap_play_file, -1);
 }

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

@@ -2,16 +2,16 @@
 %module "Rho::AsyncHttp"
 %{
 /* Put header files here or function declarations like below */
-	extern VALUE 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, int ssl_verify_peer);
 	#define do_get rho_asynchttp_get
 	
-	extern VALUE 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, int ssl_verify_peer);
 	#define do_post rho_asynchttp_post
 
-	extern VALUE 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, 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);
+	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, 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);
@@ -23,8 +23,8 @@
  $1 = "*";
 }
 
-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 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 void cancel(const char* cancel_callback);

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

@@ -1546,16 +1546,16 @@ static VALUE mAsyncHttp;
 
 
 /* Put header files here or function declarations like below */
-	extern VALUE 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, int ssl_verify_peer);
 	#define do_get rho_asynchttp_get
 	
-	extern VALUE 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, int ssl_verify_peer);
 	#define do_post rho_asynchttp_post
 
-	extern VALUE 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, 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);
+	extern VALUE rho_asynchttp_uploadfile(const char* url, VALUE headers, 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);
@@ -1616,12 +1616,77 @@ 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 ;
+  int arg5 ;
   VALUE result;
   int res1 ;
   char *buf1 = 0 ;
@@ -1632,10 +1697,12 @@ _wrap_do_get(int argc, VALUE *argv, VALUE self) {
   int res4 ;
   char *buf4 = 0 ;
   int alloc4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 4) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  if ((argc < 5) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
@@ -1653,7 +1720,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);
-  result = (VALUE)do_get((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4);
+  ecode5 = SWIG_AsVal_int(argv[4], &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "do_get" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = (int)(val5);
+  result = (VALUE)do_get((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,arg5);
   vresult = result;
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -1674,6 +1746,7 @@ _wrap_do_post(int argc, VALUE *argv, VALUE self) {
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
+  int arg6 ;
   VALUE result;
   int res1 ;
   char *buf1 = 0 ;
@@ -1687,10 +1760,12 @@ _wrap_do_post(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 5) || (argc > 5)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  if ((argc < 6) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
@@ -1713,7 +1788,12 @@ _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);
-  result = (VALUE)do_post((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  ecode6 = SWIG_AsVal_int(argv[5], &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "do_post" "', argument " "6"" of type '" "int""'");
+  } 
+  arg6 = (int)(val6);
+  result = (VALUE)do_post((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6);
   vresult = result;
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -1736,6 +1816,7 @@ _wrap_do_downloadfile(int argc, VALUE *argv, VALUE self) {
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
+  int arg6 ;
   VALUE result;
   int res1 ;
   char *buf1 = 0 ;
@@ -1749,10 +1830,12 @@ _wrap_do_downloadfile(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 5) || (argc > 5)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  if ((argc < 6) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
@@ -1775,7 +1858,12 @@ _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);
-  result = (VALUE)do_downloadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  ecode6 = SWIG_AsVal_int(argv[5], &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "do_downloadfile" "', argument " "6"" of type '" "int""'");
+  } 
+  arg6 = (int)(val6);
+  result = (VALUE)do_downloadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6);
   vresult = result;
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
@@ -1798,6 +1886,7 @@ _wrap_do_uploadfile(int argc, VALUE *argv, VALUE self) {
   char *arg3 = (char *) 0 ;
   char *arg4 = (char *) 0 ;
   char *arg5 = (char *) 0 ;
+  int arg6 ;
   VALUE result;
   int res1 ;
   char *buf1 = 0 ;
@@ -1811,10 +1900,12 @@ _wrap_do_uploadfile(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
+  int val6 ;
+  int ecode6 = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 5) || (argc > 5)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 5)",argc); SWIG_fail;
+  if ((argc < 6) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
@@ -1837,7 +1928,12 @@ _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);
-  result = (VALUE)do_uploadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5);
+  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""'");
+  } 
+  arg6 = (int)(val6);
+  result = (VALUE)do_uploadfile((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,arg6);
   vresult = result;
   if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
   if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);