rhodes 7.1.17 → 7.4.1

data/platform/sailfish/build/unzip.pro.erb

@@ -0,0 +1,66 @@
+QT -= core
+
+DEFINES += OS_SAILFISH OS_LINUX
+
+TARGET = unzip
+TEMPLATE = lib
+
+CONFIG += staticlib warn_on
+CONFIG += <%= @buildMode %>
+
+INCLUDEPATH += <%= @rhoRoot %>/platform/shared\
+<%= @rhoRoot %>/platform/shared/ruby\
+<%= @rhoRoot %>/lib/commonAPI
+
+
+DESTDIR = $$PWD/bin
+OBJECTS_DIR = $$PWD/bin/tmp
+INCLUDEPATH += <%= @rhoRoot %>/platform/shared/curl/include
+DEFINES += _GNU_SOURCE
+
+QMAKE_CFLAGS += -fvisibility=hidden
+QMAKE_CXXFLAGS += -fvisibility=hidden
+QMAKE_CFLAGS_DEBUG -= -O2
+QMAKE_CXXFLAGS_DEBUG -= -O2
+
+DEFINES += RHODES_QT_PLATFORM
+
+
+QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+
+
+HEADERS += <%= @rhoRoot %>/platform/shared/unzip/zip.h\
+<%= @rhoRoot %>/platform/shared/unzip/unzip.h\
+<%= @rhoRoot %>/platform/shared/unzip/gunzip.h\
+<%= @rhoRoot %>/platform/shared/unzip/crc32.h\
+<%= @rhoRoot %>/platform/shared/unzip/deflate.h\
+<%= @rhoRoot %>/platform/shared/unzip/inffast.h\
+<%= @rhoRoot %>/platform/shared/unzip/inffixed.h\
+<%= @rhoRoot %>/platform/shared/unzip/inflate.h\
+<%= @rhoRoot %>/platform/shared/unzip/gzguts.h\
+<%= @rhoRoot %>/platform/shared/unzip/inftrees.h\
+<%= @rhoRoot %>/platform/shared/unzip/trees.h\
+<%= @rhoRoot %>/platform/shared/unzip/unzip.h\
+<%= @rhoRoot %>/platform/shared/unzip/zconf.h\
+<%= @rhoRoot %>/platform/shared/unzip/zip.h\
+<%= @rhoRoot %>/platform/shared/unzip/zlib.h\
+<%= @rhoRoot %>/platform/shared/unzip/zutil.h
+
+SOURCES += <%= @rhoRoot %>/platform/shared/unzip/unzip.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/adler32.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/crc32.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/deflate.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/gunzip.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/gzclose.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/gzlib.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/gzread.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/gzwrite.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/infback.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/inffast.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/inflate.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/inftrees.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/trees.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/unzip.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/zip.cpp\
+<%= @rhoRoot %>/platform/shared/unzip/zutil.cpp

data/platform/sailfish/build/zlib.pro.erb

@@ -0,0 +1,72 @@
+QT -= core
+
+DEFINES += OS_SAILFISH OS_LINUX
+
+TARGET = zlib
+TEMPLATE = lib
+
+CONFIG += staticlib warn_on
+
+INCLUDEPATH += \
+<%= @rhoRoot %>/platform/shared/ruby/include\
+<%= @rhoRoot %>/platform/shared/ruby\
+<%= @rhoRoot %>/platform/shared\
+<%= @rhoRoot %>/platform/shared/ruby/sailfish
+
+
+DEFINES += OS_LINUX
+DESTDIR = <%= @rhoRoot %>/platform/linux/bin/extensions
+OBJECTS_DIR = <%= @rhoRoot %>/platform/linux/bin/extensions/zlib
+INCLUDEPATH += <%= @rhoRoot %>/platform/shared/ruby/linux
+
+DEFINES += RHODES_QT_PLATFORM _XOPEN_SOURCE _DARWIN_C_SOURCE _GNU_SOURCE
+
+CONFIG += staticlib warn_on
+CONFIG += <%= @buildMode %>
+
+DESTDIR = $$PWD/bin
+OBJECTS_DIR = $$PWD/bin/tmp
+
+
+QMAKE_CFLAGS += -fvisibility=hidden
+QMAKE_CXXFLAGS += -fvisibility=hidden
+QMAKE_CFLAGS_DEBUG -= -O2
+QMAKE_CXXFLAGS_DEBUG -= -O2
+QMAKE_CFLAGS -= -O2
+QMAKE_CXXFLAGS -= -O2
+
+
+QMAKE_CFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+QMAKE_CXXFLAGS_WARN_ON += -Wno-extra -Wno-unused -Wno-sign-compare -Wno-format -Wno-parentheses
+
+
+HEADERS += \
+<%= @rhoRoot %>/lib/extensions/zlib/ext/crc32.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/deflate.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/gzguts.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/inffast.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/inffixed.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/inflate.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/inftrees.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/trees.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/zconf.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/zlib.h\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/zutil.h
+
+SOURCES += \
+<%= @rhoRoot %>/lib/extensions/zlib/ext/adler32.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/compress.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/crc32.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/deflate.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/gzclose.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/gzlib.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/gzread.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/gzwrite.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/infback.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/inffast.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/inflate.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/inftrees.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/trees.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/uncompr.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/zlib.c\
+<%= @rhoRoot %>/lib/extensions/zlib/ext/zutil.c

data/platform/shared/api_generator/Api.h

@@ -6,12 +6,17 @@
 #include <string>
 #include <memory>
 
+#ifndef OS_SAILFISH
 #if __cplusplus == 201103L
 #  include <unordered_map>
 #  define MAP_TEMPLATE std::unordered_map
 #else
 #  define MAP_TEMPLATE rho::Hashtable
 #endif
+#else
+#  include <map>
+#  define MAP_TEMPLATE std::map
+#endif
 
 
 

data/platform/shared/common/CMakeLists.txt.erb

@@ -5,58 +5,7 @@ project(rhocommon)
 add_definitions(-DOS_ANDROID)
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/common/app_build_configs.c
-<%= @rhoRoot %>/platform/shared/common/AppMenu.cpp
-<%= @rhoRoot %>/platform/shared/common/AppMenu.cpp
-<%= @rhoRoot %>/platform/shared/common/map/BaseMapEngine.cpp
-<%= @rhoRoot %>/platform/shared/common/map/GeocodingMapEngine.cpp
-<%= @rhoRoot %>/platform/shared/common/map/ESRIMapEngine.cpp
-<%= @rhoRoot %>/platform/shared/common/map/GoogleMapEngine.cpp
-<%= @rhoRoot %>/platform/shared/common/map/OSMMapEngine.cpp
-<%= @rhoRoot %>/platform/shared/common/map/MapEngine.cpp
-<%= @rhoRoot %>/platform/shared/common/push/RhoPushManager.cpp
-<%= @rhoRoot %>/platform/shared/common/PosixThreadImpl.cpp
-<%= @rhoRoot %>/platform/shared/common/RhoConf.cpp
-<%= @rhoRoot %>/platform/shared/common/RhoFile.cpp
-<%= @rhoRoot %>/platform/shared/common/RhoMath.cpp
-<%= @rhoRoot %>/platform/shared/common/rhoparams.cpp
-<%= @rhoRoot %>/platform/shared/common/RhoThread.cpp
-<%= @rhoRoot %>/platform/shared/common/SplashScreen.cpp
-<%= @rhoRoot %>/platform/shared/common/ThreadQueue.cpp
-<%= @rhoRoot %>/platform/shared/common/Tokenizer.cpp
-<%= @rhoRoot %>/platform/shared/common/RhoTime.cpp
-<%= @rhoRoot %>/platform/shared/common/BundleManager.cpp
-<%= @rhoRoot %>/platform/shared/net/CURLNetRequest.cpp
-<%= @rhoRoot %>/platform/shared/net/HttpServer.cpp
-<%= @rhoRoot %>/platform/shared/net/ssl.cpp
-<%= @rhoRoot %>/platform/shared/net/URI.cpp
-<%= @rhoRoot %>/platform/shared/net/INetRequest.cpp
-<%= @rhoRoot %>/platform/shared/rubyext/GeoLocation.cpp
-<%= @rhoRoot %>/platform/shared/rubyext/RhoAppAdapter.cpp
-<%= @rhoRoot %>/platform/shared/rubyext/System.cpp
-<%= @rhoRoot %>/platform/shared/statistic/RhoProfiler.cpp
-<%= @rhoRoot %>/platform/shared/unzip/unzip.cpp
-<%= @rhoRoot %>/platform/shared/unzip/zip.cpp
-<%= @rhoRoot %>/platform/shared/unzip/zutil.cpp
-<%= @rhoRoot %>/platform/shared/unzip/adler32.cpp
-<%= @rhoRoot %>/platform/shared/unzip/crc32.cpp
-<%= @rhoRoot %>/platform/shared/unzip/inftrees.cpp
-<%= @rhoRoot %>/platform/shared/unzip/infback.cpp
-<%= @rhoRoot %>/platform/shared/unzip/inffast.cpp
-<%= @rhoRoot %>/platform/shared/unzip/trees.cpp
-<%= @rhoRoot %>/platform/shared/unzip/inflate.cpp
-<%= @rhoRoot %>/platform/shared/unzip/deflate.cpp
-<%= @rhoRoot %>/platform/shared/unzip/gzwrite.cpp
-<%= @rhoRoot %>/platform/shared/unzip/gzclose.cpp
-<%= @rhoRoot %>/platform/shared/unzip/gzread.cpp
-<%= @rhoRoot %>/platform/shared/unzip/gzlib.cpp
-<%= @rhoRoot %>/platform/shared/unzip/gunzip.cpp
-<%= @rhoRoot %>/platform/shared/api_generator/js_helpers.cpp
-<%= @rhoRoot %>/platform/shared/api_generator/MethodResult.cpp
-<%= @rhoRoot %>/platform/shared/api_generator/StringifyHelper.cpp
-<%= @rhoRoot %>/platform/shared/tinyxml2/tinyxml2.cpp
-<%= @rhoRoot %>/platform/shared/common/RhodesApp.cpp
-<%= @rhoRoot %>/platform/shared/common/RhodesAppBase.cpp
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared/curl/include)
@@ -65,6 +14,7 @@ include_directories(<%= @rhoRoot %>/platform/shared/ruby/android)
 include_directories(<%= @rhoRoot %>/platform/shared)
 include_directories(<%= @rhoRoot %>/platform/common)
 include_directories(<%= @rhoRoot %>/lib/commonAPI)
+include_directories(<%= @rhoRoot %>/lib/extensions/openssl.so/ext/sources/include)
 
 add_library(rhocommon STATIC ${SOURCE_LIB})
 

data/platform/shared/common/IRhoClassFactory.h

@@ -26,9 +26,13 @@
 
 #pragma once
 
+#include "common/RhoStd.h"
+#include "net/INetRequest.h"
+
 namespace rho {
-namespace net{
-    struct INetRequestImpl;
+
+namespace net
+{
     struct ISSL;
 }
 
@@ -53,9 +57,57 @@ struct IRhoClassFactory
     virtual IRhoCrypt* createRhoCrypt() = 0;
 
     virtual net::INetRequestImpl* createNetRequestImpl() = 0;
+    virtual void registerNetRequestBuilder( const String& name, net::INetRequestBuilder* builder, bool setAsDefault = true ) = 0;
+    virtual void setDefaultNetRequestBuilder( const String& name ) = 0;
+
     virtual const ISecurityTokenGenerator* createSecurityTokenGenerator() = 0;
 };
 
+//abstract base class stubbing some of IRhoClassFactory.
+//override for specific platforms.
+class CBaseRhoClassFactory : public IRhoClassFactory
+{
+public:
+
+    CBaseRhoClassFactory()
+        : mSelectedNetRequestBuilder(0)
+    {
+
+    }
+
+    virtual void registerNetRequestBuilder( const String& name, net::INetRequestBuilder* builder, bool setAsDefault = true )
+    {
+        mNetRequestBuilders[name] = builder;
+
+        if ( setAsDefault ) {
+            setDefaultNetRequestBuilder( name );
+        }
+    }
+
+    virtual void setDefaultNetRequestBuilder( const String& name )
+    {
+        mSelectedNetRequestBuilder = 0;
+
+        auto search = mNetRequestBuilders.find( name );
+        if ( search != mNetRequestBuilders.end() ) {
+            mSelectedNetRequestBuilder = search->second;
+        }
+    }
+
+    virtual net::INetRequestImpl* createNetRequestImpl()
+    {
+        net::INetRequestImpl* ret = 0;
+        if ( mSelectedNetRequestBuilder != 0 ) {
+            ret = mSelectedNetRequestBuilder->build();
+        }
+        return ret;
+    }
+
+private:
+    std::map<String, net::INetRequestBuilder*> mNetRequestBuilders;
+    net::INetRequestBuilder* mSelectedNetRequestBuilder;
+};
+
 }
 }
 

data/platform/shared/common/RhoDefs.h

@@ -44,7 +44,6 @@
 #define OS_ANDROID
 #elif defined(linux) || defined(__linux) || defined(__linux__)
 # define OS_LINUX
-# define OS_SAILFISH
 #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
 # define OS_MACOSX
 #elif defined(__FreeBSD__)

data/platform/shared/common/RhoFile.h

@@ -56,6 +56,8 @@ public:
     bool isEnd() const;
     unsigned int size() const;
     void truncate(unsigned int);
+    int getFD() const { return fileno(m_file); }
+    const String & getPath() const { return m_strPath; }
 
     void readString(String& strData);
     void readStringW(StringW& strTextW);

data/platform/shared/common/RhoMutexLock.h

@@ -40,7 +40,7 @@ typedef CRITICAL_SECTION MutexType;
 typedef pthread_mutex_t MutexType;
 #endif 
 
-#if defined(OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR)
+#if defined(OS_WINDOWS_DESKTOP) || defined(RHODES_EMULATOR) || defined(OS_LINUX)
 #define mutexSmartPointer std::shared_ptr<common::CMutex>
 #endif
 

data/platform/shared/common/RhodesApp.cpp

@@ -437,16 +437,20 @@ void CAppCallbacksQueue::processUiCreated()
     m_pInstance = 0;
 }
 
-#if defined(WINDOWS_PLATFORM)
+#if defined(WINDOWS_PLATFORM) 
 void CRhodesApp::waitAppStarted()
 {
+    #ifndef WINCE
     std::unique_lock<std::mutex> lock(wait_mutex);
     activated_cond.wait(lock);
+    #endif
 }
 
 void CRhodesApp::notifyAppStared()
 {
+    #ifndef WINCE
     activated_cond.notify_one();
+    #endif
 }
 #endif
 
@@ -738,6 +742,16 @@ static void callback_uicreated(void *arg, String const &strQuery)
     rho_http_sendresponse(arg, "");
 }
 
+static void callback_uicloserequest(void *arg, String const &strQuery)
+{
+#ifndef RHO_NO_RUBY_API
+    if (!RHODESAPP().isJSApplication() && !RHODESAPP().isNodeJSApplication())
+        rho_ruby_uiCloseRequest();
+#endif
+
+    rho_http_sendresponse(arg, "");
+}
+
 static void callback_uidestroyed(void *arg, String const &strQuery)
 {
 #ifndef RHO_NO_RUBY_API
@@ -758,7 +772,7 @@ static void callback_loadserversources(void *arg, String const &strQuery)
 static void callback_loadallsyncsources(void *arg, String const &strQuery)
 {
     RhoAppAdapter.loadAllSyncSources();
-    String strMsg;
+    String strMsg = "";
     rho_http_sendresponse(arg, strMsg.c_str());
 }
 
@@ -774,6 +788,23 @@ void CRhodesApp::callUiCreatedCallback()
     m_appCallbacksQueue->addQueueCommand(new CAppCallbacksQueue::Command(CAppCallbacksQueue::ui_created));
 }
 
+int CRhodesApp::callUiCloseRequestCallback()
+{
+    if ( m_bExit || !rho_ruby_is_started()) return 1;
+
+    String strUrl = m_strHomeUrl + "/system/uicloserequest";
+    NetResponse resp = getNetRequest().pullData( strUrl, NULL );
+    if ( !resp.isOK() )
+    {
+        LOG(ERROR) + "UI close request callback failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
+        return 1;
+    }else{
+        return 0;
+    }
+    return 1;
+
+}
+
 void CRhodesApp::callUiDestroyedCallback()
 {
     if ( m_bExit/* || !rho_ruby_is_started()*/ )
@@ -1553,12 +1584,7 @@ void CRhodesApp::initHttpServer()
     strAppRootPath += "apps";
 #endif
 
-#ifdef OS_SAILFISH
-    //m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath, strAppUserPath, strRuntimePath, true, false); This thing doesn't work
     m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath, strAppUserPath, strRuntimePath);
-#else
-    m_httpServer = new net::CHttpServer(atoi(getFreeListeningPort()), strAppRootPath, strAppUserPath, strRuntimePath);
-#endif
     m_httpServer->register_uri("/system/geolocation", rubyext::CGeoLocation::callback_geolocation);
     m_httpServer->register_uri("/system/syncdb", callback_syncdb);
     m_httpServer->register_uri("/system/redirect_to", callback_redirect_to);
@@ -1576,6 +1602,7 @@ void CRhodesApp::initHttpServer()
     m_httpServer->register_uri("/system/activateapp", callback_activateapp);
     m_httpServer->register_uri("/system/deactivateapp", callback_deactivateapp);
     m_httpServer->register_uri("/system/uicreated", callback_uicreated);
+    m_httpServer->register_uri("/system/uicloserequest", callback_uicloserequest);
     m_httpServer->register_uri("/system/uidestroyed", callback_uidestroyed);
     m_httpServer->register_uri("/system/loadserversources", callback_loadserversources);
     m_httpServer->register_uri("/system/resetDBOnSyncUserChanged", callback_resetDBOnSyncUserChanged);
@@ -1785,6 +1812,12 @@ void CRhodesApp::initAppUrls()
         force_https = rho_conf_getBool("ios_https_local_server")!=0;
     }
 #endif
+
+#ifdef OS_ANDROID
+       const char* value = get_app_build_config_item("local_https_server_with_client_checking");
+       force_https = value && strcmp(value, "1") == 0;
+#endif
+
     if (force_https) {
         m_strHomeUrl = "https://127.0.0.1:";
     }
@@ -2922,6 +2955,16 @@ void rho_rhodesapp_callUiCreatedCallback()
     }
 }
 
+int rho_rhodesapp_callUiCloseRequestCallback() //return zero if you whant to suppress closing
+{
+    if ( rho::common::CRhodesApp::getInstance() ){
+        return RHODESAPP().callUiCloseRequestCallback();
+    }
+
+    return 1;
+}
+
+
 void rho_rhodesapp_callUiDestroyedCallback()
 {
     if ( rho::common::CRhodesApp::getInstance() )

data/platform/shared/common/RhodesApp.h

@@ -40,8 +40,10 @@
 #include "ExtManager.h"
 #include "api_generator/MethodResult.h"
 
+#if !defined(WINCE)
 #include <condition_variable>
 #include <mutex>
+#endif
 
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RhodesApp"
@@ -174,7 +176,7 @@ private:
     Vector<String> m_arAppBackUrl, m_arAppBackUrlOrig;
     Vector<ICallbackObject*> m_arCallbackObjects;
     mutable common::CMutex m_mxCallbackObjects;
-#if defined(WINDOWS_PLATFORM)
+#if !defined(WINCE)
     std::mutex wait_mutex;
     std::condition_variable activated_cond;
 #endif
@@ -246,6 +248,7 @@ public:
 	void callBluetoothCallback(String strCallbackUrl, const char* body);
     void callAppActiveCallback(boolean bActive);
     void callUiCreatedCallback();
+    int callUiCloseRequestCallback();
     void callUiDestroyedCallback();
     void callPopupCallback(String strCallbackUrl, const String &id, const String &title);
     boolean callTimerCallback(const String& strUrl, const String& strData);
@@ -404,6 +407,7 @@ void rho_rhodesapp_callDateTimeCallback(const char* strCallbackUrl, long lDateTi
 void rho_rhodesapp_callBluetoothCallback(const char* strCallbackUrl, const char* body);
 void rho_rhodesapp_callAppActiveCallback(int nActive);
 void rho_rhodesapp_callUiCreatedCallback();
+int rho_rhodesapp_callUiCloseRequestCallback();
 void rho_rhodesapp_callUiDestroyedCallback();
 void rho_rhodesapp_callScreenOffCallback();
 void rho_rhodesapp_callScreenOnCallback();

data/platform/shared/common/iphone/RhoClassfactory.h

@@ -42,7 +42,7 @@
 namespace rho {
 namespace common {
 
-class CRhoClassFactory : public common::IRhoClassFactory
+class CRhoClassFactory : public common::CBaseRhoClassFactory
 {
 public:
     net::INetRequestImpl* createNetRequestImpl()

data/platform/shared/curl/CMakeLists.txt.erb

@@ -7,100 +7,7 @@ add_definitions(-DHAVE_CONFIG_H -DOS_ANDROID)
 
 
 set(SOURCE_LIB
-<%= @rhoRoot %>/platform/shared/curl/lib/amigaos.c
-<%= @rhoRoot %>/platform/shared/curl/lib/base64.c
-<%= @rhoRoot %>/platform/shared/curl/lib/connect.c
-<%= @rhoRoot %>/platform/shared/curl/lib/content_encoding.c
-<%= @rhoRoot %>/platform/shared/curl/lib/cookie.c
-<%= @rhoRoot %>/platform/shared/curl/lib/curl_addrinfo.c
-<%= @rhoRoot %>/platform/shared/curl/lib/curl_memrchr.c
-<%= @rhoRoot %>/platform/shared/curl/lib/rand.c
-<%= @rhoRoot %>/platform/shared/curl/lib/curl_sspi.c
-<%= @rhoRoot %>/platform/shared/curl/lib/dict.c
-<%= @rhoRoot %>/platform/shared/curl/lib/easy.c
-<%= @rhoRoot %>/platform/shared/curl/lib/escape.c
-<%= @rhoRoot %>/platform/shared/curl/lib/file.c
-<%= @rhoRoot %>/platform/shared/curl/lib/formdata.c
-<%= @rhoRoot %>/platform/shared/curl/lib/ftp.c
-<%= @rhoRoot %>/platform/shared/curl/lib/getenv.c
-<%= @rhoRoot %>/platform/shared/curl/lib/getinfo.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vtls/gtls.c
-<%= @rhoRoot %>/platform/shared/curl/lib/hash.c
-<%= @rhoRoot %>/platform/shared/curl/lib/hostasyn.c
-<%= @rhoRoot %>/platform/shared/curl/lib/hostip.c
-<%= @rhoRoot %>/platform/shared/curl/lib/hostip4.c
-<%= @rhoRoot %>/platform/shared/curl/lib/hostip6.c
-<%= @rhoRoot %>/platform/shared/curl/lib/hostsyn.c
-<%= @rhoRoot %>/platform/shared/curl/lib/http.c
-<%= @rhoRoot %>/platform/shared/curl/lib/http_chunks.c
-<%= @rhoRoot %>/platform/shared/curl/lib/http_digest.c
-<%= @rhoRoot %>/platform/shared/curl/lib/http_negotiate.c
-<%= @rhoRoot %>/platform/shared/curl/lib/if2ip.c
-<%= @rhoRoot %>/platform/shared/curl/lib/inet_ntop.c
-<%= @rhoRoot %>/platform/shared/curl/lib/inet_pton.c
-<%= @rhoRoot %>/platform/shared/curl/lib/krb5.c
-<%= @rhoRoot %>/platform/shared/curl/lib/ldap.c
-<%= @rhoRoot %>/platform/shared/curl/lib/llist.c
-<%= @rhoRoot %>/platform/shared/curl/lib/md5.c
-<%= @rhoRoot %>/platform/shared/curl/lib/memdebug.c
-<%= @rhoRoot %>/platform/shared/curl/lib/mprintf.c
-<%= @rhoRoot %>/platform/shared/curl/lib/multi.c
-<%= @rhoRoot %>/platform/shared/curl/lib/netrc.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vtls/nss.c
-<%= @rhoRoot %>/platform/shared/curl/lib/nonblock.c
-<%= @rhoRoot %>/platform/shared/curl/lib/nwlib.c
-<%= @rhoRoot %>/platform/shared/curl/lib/nwos.c
-<%= @rhoRoot %>/platform/shared/curl/lib/parsedate.c
-<%= @rhoRoot %>/platform/shared/curl/lib/progress.c
-<%= @rhoRoot %>/platform/shared/curl/lib/rhossl.c
-<%= @rhoRoot %>/platform/shared/curl/lib/security.c
-<%= @rhoRoot %>/platform/shared/curl/lib/select.c
-<%= @rhoRoot %>/platform/shared/curl/lib/sendf.c
-<%= @rhoRoot %>/platform/shared/curl/lib/share.c
-<%= @rhoRoot %>/platform/shared/curl/lib/slist.c
-<%= @rhoRoot %>/platform/shared/curl/lib/socks.c
-<%= @rhoRoot %>/platform/shared/curl/lib/socks_gssapi.c
-<%= @rhoRoot %>/platform/shared/curl/lib/socks_sspi.c
-<%= @rhoRoot %>/platform/shared/curl/lib/speedcheck.c
-<%= @rhoRoot %>/platform/shared/curl/lib/splay.c
-<%= @rhoRoot %>/platform/shared/curl/lib/ssh.c
-<%= @rhoRoot %>/platform/shared/curl/lib/strdup.c
-<%= @rhoRoot %>/platform/shared/curl/lib/strerror.c
-<%= @rhoRoot %>/platform/shared/curl/lib/strtok.c
-<%= @rhoRoot %>/platform/shared/curl/lib/strtoofft.c
-<%= @rhoRoot %>/platform/shared/curl/lib/telnet.c
-<%= @rhoRoot %>/platform/shared/curl/lib/tftp.c
-<%= @rhoRoot %>/platform/shared/curl/lib/timeval.c
-<%= @rhoRoot %>/platform/shared/curl/lib/transfer.c
-<%= @rhoRoot %>/platform/shared/curl/lib/url.c
-<%= @rhoRoot %>/platform/shared/curl/lib/version.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vtls/vtls.c
-<%= @rhoRoot %>/platform/shared/curl/lib/asyn-thread.c
-<%= @rhoRoot %>/platform/shared/curl/lib/strcase.c
-<%= @rhoRoot %>/platform/shared/curl/lib/pipeline.c
-<%= @rhoRoot %>/platform/shared/curl/lib/conncache.c
-<%= @rhoRoot %>/platform/shared/curl/lib/warnless.c
-<%= @rhoRoot %>/platform/shared/curl/lib/wildcard.c
-<%= @rhoRoot %>/platform/shared/curl/lib/http_proxy.c
-<%= @rhoRoot %>/platform/shared/curl/lib/pop3.c
-<%= @rhoRoot %>/platform/shared/curl/lib/smtp.c
-<%= @rhoRoot %>/platform/shared/curl/lib/imap.c
-<%= @rhoRoot %>/platform/shared/curl/lib/rtsp.c
-<%= @rhoRoot %>/platform/shared/curl/lib/gopher.c
-<%= @rhoRoot %>/platform/shared/curl/lib/dotdot.c
-<%= @rhoRoot %>/platform/shared/curl/lib/curl_threads.c
-<%= @rhoRoot %>/platform/shared/curl/lib/fileinfo.c
-<%= @rhoRoot %>/platform/shared/curl/lib/pingpong.c
-<%= @rhoRoot %>/platform/shared/curl/lib/curl_sasl.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vauth/vauth.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vauth/cleartext.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vauth/digest.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vauth/oauth2.c
-<%= @rhoRoot %>/platform/shared/curl/lib/ftplistparser.c
-<%= @rhoRoot %>/platform/shared/curl/lib/vauth/cram.c
-<%= @rhoRoot %>/platform/shared/curl/lib/hmac.c
-<%= @rhoRoot %>/platform/shared/curl/lib/curl_fnmatch.c
-<%= @rhoRoot %>/platform/shared/curl/lib/curl_gethostname.c
+<%= @sourceList %>
 )
 
 include_directories(<%= @rhoRoot %>/platform/shared/curl/include)

data/platform/shared/curl/lib/asyn-thread.c

@@ -644,12 +644,13 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn,
 
   snprintf(sbuf, sizeof(sbuf), "%d", port);
 
+#ifndef OS_LINUX //TODO: understand why async does not work on linux
   /* fire up a new resolver thread! */
   if(init_resolve_thread(conn, hostname, port, &hints)) {
     *waitp = 1; /* expect asynchronous response */
     return NULL;
   }
-
+#endif
   /* fall-back to blocking version */
   infof(conn->data, "init_resolve_thread() failed for %s; %s\n",
         hostname, Curl_strerror(conn, errno));

data/platform/shared/curl/lib/curl_addrinfo.h

@@ -40,6 +40,16 @@
 #  include <stdlib.h>
 #endif
 
+#ifdef OS_LINUX
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+//#include "ruby/ext/socket/addrinfo.h"
+#endif
 
 /*
  * Curl_addrinfo is our internal struct definition that we use to allow
@@ -60,6 +70,35 @@ struct Curl_addrinfo {
 };
 typedef struct Curl_addrinfo Curl_addrinfo;
 
+#ifdef OS_LINUX
+//RHO: this defines and struct addrinfo
+
+#define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
+#define	EAI_AGAIN	 2	/* temporary failure in name resolution */
+#define	EAI_BADFLAGS	 3	/* invalid value for ai_flags */
+#define	EAI_FAIL	 4	/* non-recoverable failure in name resolution */
+#define	EAI_FAMILY	 5	/* ai_family not supported */
+#define	EAI_MEMORY	 6	/* memory allocation failure */
+#define	EAI_NODATA	 7	/* no address associated with hostname */
+#define	EAI_NONAME	 8	/* hostname nor servname provided, or not known */
+#define	EAI_SERVICE	 9	/* servname not supported for ai_socktype */
+#define	EAI_SOCKTYPE	10	/* ai_socktype not supported */
+#define	EAI_SYSTEM	11	/* system error returned in errno */
+#define EAI_BADHINTS	12
+#define EAI_PROTOCOL	13
+#define EAI_MAX		14
+
+struct addrinfo {
+               int              ai_flags;
+               int              ai_family;
+               int              ai_socktype;
+               int              ai_protocol;
+               socklen_t        ai_addrlen;
+               struct sockaddr *ai_addr;
+               char            *ai_canonname;
+               struct addrinfo *ai_next;
+           };
+#endif
 void
 Curl_freeaddrinfo(Curl_addrinfo *cahead);