rhodes 7.1.17 → 7.4.1

data/platform/shared/net/HttpServer.cpp

@@ -24,6 +24,14 @@
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
+#if defined(OS_ANDROID)
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/x509_vfy.h>
+#include <net/ssl.h>
+#endif
+
 #include "net/HttpServer.h"
 #include "common/RhodesApp.h"
 #include "common/RhoFilePath.h"
@@ -314,6 +322,88 @@ static VALUE create_request_hash(String const &application, String const &model,
 }
 #endif
 
+#ifdef OS_ANDROID
+
+void openss_trace_proc(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)
+{
+    std::string err_str;
+    err_str.assign((const char*)buf, len);
+    RAWLOG_INFO2(SSL_TAG "Openssl trace message: %s, content_type=%d", err_str.c_str(), content_type);
+}
+
+int openssl_verify_callback(int preverify_ok, X509_STORE_CTX* x509_ctx)
+{
+    int err = X509_STORE_CTX_get_error(x509_ctx);
+    RAWLOG_ERROR1(SSL_TAG "X509_STORE_CTX_get_error return: %d", err);
+    return preverify_ok;
+}
+
+void CHttpServer::close_ssl_socket(SSL* ssl_sock, int fd)
+{
+    int code = SSL_shutdown(ssl_sock);
+    int err = SSL_get_error(m_ssl_sock, code);
+
+    if (verbose) RAWLOG_ERROR3(SSL_TAG "Close ssl socket: %d, code=%d, err=%d", fd, code, err);
+
+    if (code >= 0)
+    {
+        SSL_free(ssl_sock);
+        closesocket(fd);
+        auto it = m_ssl_map.find(fd);
+        if (it != m_ssl_map.end())
+            m_ssl_map.erase(it);
+        else
+            RAWLOG_ERROR1(SSL_TAG "Unable erase ssl socket, sockfd=%d", fd);
+    }
+   
+}
+
+void CHttpServer::init_ssl()
+{
+    SSL_load_error_strings();	
+    OpenSSL_add_ssl_algorithms();
+
+    ssl_ctx = SSL_CTX_new(TLSv1_2_server_method());
+    if (!ssl_ctx) 
+    {
+        ssl_ctx = nullptr;
+        m_ssl_sock = nullptr;
+        RAWLOG_ERROR("Unable to create SSL context!");
+        return;
+    }
+
+    //const char* allowedCiphers = "AES256-SHA256:AES256-GCM-SHA384:AES128-GCM-SHA256:AES128-SHA256";
+    //SSL_CTX_set_cipher_list(ssl_ctx, allowedCiphers);
+    SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_TICKET);
+
+    SSL_CTX_set_tmp_dh(ssl_ctx, rho_get_RhoClassFactory()->createSSLEngine()->getDHparams());
+
+    if (SSL_CTX_use_certificate(ssl_ctx, (X509 *)rho_get_RhoClassFactory()->createSSLEngine()->getCertificate()) <= 0)
+    {
+        RAWLOG_ERROR("Unable set certificate!");
+        return;
+    }
+
+    if (SSL_CTX_use_PrivateKey(ssl_ctx, (EVP_PKEY*)rho_get_RhoClassFactory()->createSSLEngine()->getPrivateKey()) <= 0 ) 
+    {
+        RAWLOG_ERROR("Unable set private key!");
+        return;
+    }
+
+    SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, openssl_verify_callback);
+
+    X509_STORE* ssl_store = X509_STORE_new();
+    X509_STORE_add_cert(ssl_store, (X509*)rho_get_RhoClassFactory()->createSSLEngine()->getClientCertificate());
+    SSL_CTX_set_cert_store(ssl_ctx, ssl_store);
+    X509_STORE_set_trust(ssl_store, 1);
+    SSL_CTX_set_session_cache_mode(ssl_ctx, SSL_SESS_CACHE_OFF);
+
+    //SSL_CTX_set_msg_callback(ssl_ctx, openss_trace_proc);
+    
+}
+
+#endif
+
 CHttpServer::CHttpServer(int port, String const &root, String const &user_root, String const &runtime_root, bool enable_external_access, bool started_as_separated_simple_server)
     :m_active(false), m_port(port), verbose(true), m_IP_adress("")
 #ifdef OS_MACOSX
@@ -358,6 +448,14 @@ CHttpServer::CHttpServer(int port, String const &root, String const &user_root,
     m_generator = rho_conf_getInt("disable_external_access") ? rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
     secureTokenExists = false;
 #endif
+
+#if defined(OS_ANDROID)
+    const char* value = get_app_build_config_item("local_https_server_with_client_checking");
+    if(value && !strcmp(value, "1"))
+    {
+        init_ssl();
+    }
+#endif
 }
     
 CHttpServer::CHttpServer(int port, String const &root)
@@ -386,6 +484,14 @@ CHttpServer::CHttpServer(int port, String const &root)
     m_generator = rho_conf_getInt("disable_external_access") ? rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
     secureTokenExists = false;
 #endif
+
+#if defined(OS_ANDROID)
+    const char* value = get_app_build_config_item("local_https_server_with_client_checking");
+    if(value && !strcmp(value, "1"))
+    {
+        init_ssl();
+    }
+#endif
 }
 
 CHttpServer::~CHttpServer()
@@ -486,6 +592,10 @@ bool CHttpServer::init()
         close_listener();
         return false;
     }
+
+#if defined(OS_ANDROID)
+    signal(SIGPIPE, SIG_IGN);
+#endif
     
     struct sockaddr_in sa;
     memset(&sa, 0, sizeof(sa));
@@ -598,9 +708,33 @@ int CHttpServer::select_internal( SOCKET listener, fd_set& readfds )
     return ret;
 }
 
+#ifdef OS_ANDROID
+bool CHttpServer::accept_ssl_factory()
+{
+    if(SSL_in_init(m_ssl_sock) == 1)
+    {
+        int code = SSL_accept(m_ssl_sock);
+        int syscall_err = errno;
+        if (verbose) RAWLOG_ERROR2(SSL_TAG "SSL_accept return : %d, socket: %d", code, SSL_get_fd(m_ssl_sock));
+        if (code < 0)
+        {
+            char err_buff[255] = {};
+            int err = SSL_get_error(m_ssl_sock, code);
+            ERR_error_string(err, err_buff);
+            if (verbose) RAWLOG_ERROR3(SSL_TAG "SSL_accept error code: %d, socket: %d, errno: %d", err, SSL_get_fd(m_ssl_sock), syscall_err);
+            if (verbose) RAWLOG_ERROR1(SSL_TAG "SSL_accept error string: %s",  err_buff);
+            close_ssl_socket(m_ssl_sock, SSL_get_fd(m_ssl_sock));
+            return true;
+        }
+    }
+    
+    return false;
+}
+#endif
+
 bool CHttpServer::run()
 {
-    #ifdef OS_SAILFISH
+    #ifdef OS_LINUX
     pthread_t current_thread = pthread_self();
     struct sched_param params = { 0 };
     params.sched_priority = 9;
@@ -638,6 +772,10 @@ bool CHttpServer::run()
                 //RAWTRACE("After accept...");
                 if (!m_active) {
                     if (verbose) RAWTRACE("Stop HTTP server");
+                    if (conn != INVALID_SOCKET) {
+                        closesocket(conn);
+                        conn = INVALID_SOCKET;
+                    }
                     return true;
                 }
                 if (conn == INVALID_SOCKET) {
@@ -659,6 +797,26 @@ bool CHttpServer::run()
                 }
 #endif
                 m_sock = conn;
+#ifdef OS_ANDROID
+                if (ssl_ctx)
+                {
+                    ERR_clear_error();
+                    auto it = m_ssl_map.find(m_sock);
+                    if (it != m_ssl_map.end())
+                        m_ssl_sock = it->second;
+                    else
+                    {
+                        m_ssl_sock = SSL_new(ssl_ctx);
+                        m_ssl_map.emplace(m_sock, m_ssl_sock);
+                        SSL_set_fd(m_ssl_sock, m_sock);
+                    }
+
+                    if(accept_ssl_factory())                   
+                        continue;
+                }
+
+#endif
+
                 bProcessed = process(m_sock);
 #ifndef RHO_NO_RUBY_API
                 if (rho_ruby_is_started() && (!m_started_as_separated_simple_server))
@@ -668,7 +826,14 @@ bool CHttpServer::run()
                 }
 #endif
                 if (verbose) RAWTRACE("Close connected socket");
-                closesocket(m_sock);
+#ifdef OS_ANDROID
+                if(ssl_ctx)
+                {
+                    close_ssl_socket(m_ssl_sock, m_sock);
+                }
+                else 
+#endif
+                   closesocket(m_sock);
                 m_sock = INVALID_SOCKET;
             }
         }
@@ -741,6 +906,15 @@ bool receive_request_test(ByteVector &request, int attempt)
 	return true;
 }
 
+int CHttpServer::internal_recv(char* buff, size_t size, int flags)
+{
+#ifdef OS_ANDROID
+    return ssl_ctx ? SSL_read(m_ssl_sock, buff, size) : recv(m_sock, buff, size, flags);
+#else
+    return recv(m_sock, buff, size, flags);
+#endif
+}
+
 bool CHttpServer::receive_request(ByteVector &request)
 {
 	if (verbose) RAWTRACE("Receiving request...");
@@ -750,7 +924,26 @@ bool CHttpServer::receive_request(ByteVector &request)
     int attempts = 0;
     for(;;) {
         if (verbose) RAWTRACE("Read portion of data from socket...");
-        int n = recv(m_sock, &buf[0], sizeof(buf), 0);
+
+        int n = internal_recv(&buf[0], sizeof(buf), 0);
+#ifdef OS_ANDROID
+        if(ssl_ctx && n < 0)
+        {
+            int err = SSL_get_error(m_ssl_sock, n);
+            if (verbose) RAWLOG_ERROR2(SSL_TAG "SSL_read return error code: %d, sock=%d", err, m_sock);
+            switch (err)
+            {
+            case SSL_ERROR_SSL:
+                return false;
+            case SSL_ERROR_WANT_READ:
+                break;
+            default:
+                break;
+            }
+        }
+#endif
+
+
         //RAWTRACE1("RECV: %d", n);
         if (n == -1) {
             int e = RHO_NET_ERROR_CODE;
@@ -814,6 +1007,15 @@ bool CHttpServer::receive_request(ByteVector &request)
     return true;
 }
 
+int CHttpServer::internal_send(const char* buff, size_t size, int flags)
+{
+#ifdef OS_ANDROID
+    return ssl_ctx ? SSL_write(m_ssl_sock, buff, size) : send(m_sock, buff, size, flags);
+#else
+    return send(m_sock, buff, size, flags);
+#endif
+}
+
 bool CHttpServer::send_response_impl(String const &data, bool continuation)
 {
 #ifdef OS_MACOSX
@@ -851,7 +1053,24 @@ bool CHttpServer::send_response_impl(String const &data, bool continuation)
     
     size_t pos = 0;
     for(; pos < data.size();) {
-        int n = send(m_sock, data.c_str() + pos, data.size() - pos, 0);
+
+        int n = internal_send(data.c_str() + pos, data.size() - pos, 0);
+#ifdef OS_ANDROID
+        if(ssl_ctx && n < 0)
+        {
+            int err = SSL_get_error(m_ssl_sock, n);
+            if(verbose) RAWLOG_ERROR2(SSL_TAG "SSL_write return error code: %d, sock=%d", err, m_sock);
+            switch (err)
+            {
+            case SSL_ERROR_SSL:
+                return false;
+            default:
+                break;
+            }
+        }
+#endif
+
+
         if (n == -1) {
             int e = RHO_NET_ERROR_CODE;
 #if !defined(WINDOWS_PLATFORM)
@@ -966,6 +1185,17 @@ bool CHttpServer::process(SOCKET sock)
     String method, uri, query;
     HeaderList headers;
     String body;
+#ifdef OS_ANDROID
+    if(ssl_ctx)
+    {
+        if(SSL_get_verify_result(m_ssl_sock) != X509_V_OK)
+        {
+           send_response(create_response("500 Internal Error"));        
+           return false;
+        }
+    }
+#endif
+
     if (!parse_request(method, uri, query, headers, body)) {
         if (verbose) RAWLOG_ERROR("Parsing error");
         send_response(create_response("500 Internal Error"));

data/platform/shared/net/HttpServer.h

@@ -36,6 +36,13 @@
 #include "common/ISecurityTokenGenerator.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include <map>
+
+typedef struct ssl_st SSL;
+typedef struct ssl_ctx_st SSL_CTX;
+#endif
+
 #if !defined(WINDOWS_PLATFORM)
 typedef int SOCKET;
 #  define INVALID_SOCKET -1
@@ -51,7 +58,7 @@ typedef int SOCKET;
 #  define RHO_NET_ERROR_CODE ::WSAGetLastError()
 #endif
 
-#if defined(OS_WINDOWS_DESKTOP)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_LINUX)
 #define SECURITY_HEADER "RHO-SECURE-TOKEN"
 #elif defined(OS_ANDROID)
 #define SECURITY_HEADER "User-Agent"
@@ -196,7 +203,20 @@ private:
 
 #if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
     const rho::common::ISecurityTokenGenerator* m_generator;
-    bool secureTokenExists;
+    bool secureTokenExists; 
+#endif
+
+    int internal_recv(char* buff, size_t size, int flags);
+    int internal_send(const char* buff, size_t size, int flags);
+#if defined(OS_ANDROID)
+#define SSL_TAG "SSL: "
+    SSL_CTX* ssl_ctx = nullptr;
+    SSL* m_ssl_sock = nullptr;
+    std::map<int, SSL*> m_ssl_map;
+
+    void init_ssl();
+    void close_ssl_socket(SSL* ssl_sock, int fd);
+    bool accept_ssl_factory();
 #endif
 
 #ifdef OS_MACOSX

data/platform/shared/net/INetRequest.cpp

@@ -162,7 +162,7 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::pullCookies(const String& strU
 
 rho::net::CNetResponseWrapper CNetRequestWrapper::doRequest( const char* method, const String& strUrl, const String& strBody, IRhoSession* oSession, Hashtable<String,String>* pHeaders )
 {
-#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)
+#if defined(OS_WINDOWS_DESKTOP) || defined(OS_ANDROID)  || defined(OS_LINUX)
     const rho::common::ISecurityTokenGenerator* generator = rho_conf_getInt("disable_external_access") ?
         rho_get_RhoClassFactory()->createSecurityTokenGenerator() : nullptr;
 
@@ -173,7 +173,7 @@ rho::net::CNetResponseWrapper CNetRequestWrapper::doRequest( const char* method,
             pHeaders = &headers;
 #if defined(OS_ANDROID)
         pHeaders->insert(std::make_pair(SECURITY_HEADER, "RhodesAgent RHO-SECURE-TOKEN=" + generator->getSecurityToken()));
-#elif defined(OS_WINDOWS_DESKTOP)
+#elif defined(OS_WINDOWS_DESKTOP) || defined(OS_LINUX)
         pHeaders->insert(std::make_pair(SECURITY_HEADER, generator->getSecurityToken()));
 #endif
     }

data/platform/shared/net/INetRequest.h

@@ -244,6 +244,12 @@ namespace common
 namespace net
 {
 
+class INetRequestBuilder
+{
+public:
+  virtual INetRequestImpl* build() = 0;
+};
+
 class INetRequestCallback
 {
   public:

data/platform/shared/net/linux/SSLImpl.cpp

@@ -28,7 +28,7 @@
 //#include <CFNetwork/CFNetwork.h>
 //#include <Security/Security.h>
 
-#include "sslimpl.h"
+#include "SSLImpl.h"
 
 #import "logging/RhoLog.h"
 #undef DEFAULT_LOGCATEGORY
@@ -58,6 +58,7 @@ namespace net
 void * SSLImpl::createStorage()
 {
     //return calloc(1, sizeof(ssl_data_t));
+    return NULL;
 }
 
 void SSLImpl::freeStorage(void *ptr)

data/platform/shared/net/ssl.h

@@ -34,6 +34,10 @@
 #define ssize_t int
 #endif
 
+typedef struct evp_pkey_st EVP_PKEY;
+typedef struct x509_st X509;
+typedef struct dh_st DH;
+
 namespace rho {
 namespace net {
 
@@ -49,6 +53,28 @@ struct ISSL
     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;
     virtual bool rand(unsigned char *entropy, size_t length) = 0;
+
+
+    virtual const EVP_PKEY* getPrivateKey() const
+    {
+        return nullptr;
+    }
+
+    virtual const X509* getCertificate() const
+    {
+        return nullptr;
+    }
+
+    virtual const X509* getClientCertificate() const
+    {
+        return nullptr;
+    }
+
+    virtual DH* getDHparams() const
+    {
+        return nullptr;
+    }
+
 };
 
 }

data/platform/shared/qt/RhoSimulator.pro

@@ -1,27 +1,39 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += CPP_ELEVEN
-    DEFINES += RHODES_VERSION_2
-}
-
 equals(QT_MAJOR_VERSION, 5) {
-    equals(QT_MINOR_VERSION, 6) {
-        QT += webkit widgets
+    lessThan(QT_MINOR_VERSION, 6): {
+        DEFINES += RHODES_VERSION_1
+    }
+    equals(QT_MINOR_VERSION, 6): {
+        QQT += webkit widgets
         DEFINES += OS_SAILFISH OS_LINUX CPP_ELEVEN
+        CONFIG +=  c++14
+    }
+    greaterThan(QT_MINOR_VERSION, 7): {
         CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2 _WINSOCKAPI_
     }
 }
 
-lessThan(QT_MINOR_VERSION, 6): {
-    DEFINES += RHODES_VERSION_1
-}
+
 #DEFINES += RHODES_EMULATOR
+CONFIG -= qml
+
 
 TEMPLATE = subdirs
 SUBDIRS = rubylib rholib sqlite3 syncengine
 
 unix:!macx {
- # SUBDIRS += curl
+    SUBDIRS += curl
+    DEFINES += CPP_ELEVEN
+    DEFINES += OS_LINUX
+    QMAKE_CXXFLAGS_RELEASE += -MP9
+    QMAKE_CXXFLAGS_DEBUG += -MP9
+
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+
+    #QMAKE_CFLAGS_RELEASE -= -O2
+    #QMAKE_CXXFLAGS_RELEASE -= -O2
+
 }
 macx {
  SUBDIRS += curl

data/platform/shared/qt/RhoSimulator_dev.pro

@@ -1,20 +1,20 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += CPP_ELEVEN
-    DEFINES += RHODES_VERSION_2
-}
-
 equals(QT_MAJOR_VERSION, 5) {
-    equals(QT_MINOR_VERSION, 6) {
-        QT += webkit widgets
+    lessThan(QT_MINOR_VERSION, 6): {
+        DEFINES += RHODES_VERSION_1
+    }
+    equals(QT_MINOR_VERSION, 6): {
+        QQT += webkit widgets
         DEFINES += OS_SAILFISH OS_LINUX CPP_ELEVEN
+        CONFIG +=  c++14
+    }
+    greaterThan(QT_MINOR_VERSION, 7): {
         CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2 _WINSOCKAPI_
     }
 }
 
-lessThan(QT_MINOR_VERSION, 6): {
-    DEFINES += RHODES_VERSION_1
-}
+
+
 TEMPLATE = subdirs
 SUBDIRS = rubylib rholib sqlite3 syncengine \
 ../../../lib/commonAPI/coreapi/ext/platform/qt/coreapi.pro \
@@ -26,13 +26,26 @@ SUBDIRS = rubylib rholib sqlite3 syncengine \
 #../../../lib/extensions/digest-sha2/ext/digest-sha2.pro \
 #../../../lib/extensions/fcntl/ext/fcntl.pro \
 #../../../lib/extensions/openssl/ext/openssl.pro \
+#../../../lib/extensions/bigdecimal/ext/bigdecimal.pro \
+../../../lib/extensions/zlib/ext/zlib.pro \#\
+../../../../RMS-Testing/auto/feature_def/auto_common_spec/extensions/genPropBag/ext/platform/qt/genPropBag.pro \
 #../../../lib/extensions/serialport/ext/serialport.pro \
-../../../lib/extensions/zlib/ext/zlib.pro# \
-#../../../lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro \
-#../../../lib/commonAPI/barcode/ext/platform/qt/Barcode.pro
+../../../lib/commonAPI/signature/ext/platform/qt/Signature.pro \
+../../../lib/commonAPI/mediacapture/ext/platform/qt/Mediacapture.pro \
+../../../lib/commonAPI/barcode/ext/platform/qt/Barcode.pro
 
 unix:!macx {
- # SUBDIRS += curl
+    SUBDIRS += curl
+    DEFINES += CPP_ELEVEN
+    DEFINES += OS_LINUX
+    QMAKE_CXXFLAGS_RELEASE += -MP9
+    QMAKE_CXXFLAGS_DEBUG += -MP9
+
+    QMAKE_CFLAGS_DEBUG -= -O2
+    QMAKE_CXXFLAGS_DEBUG -= -O2
+
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
 }
 macx {
  SUBDIRS += curl
@@ -42,3 +55,5 @@ SUBDIRS += rhodes
 
 QMAKE_CXXFLAGS_RELEASE += -MP9
 QMAKE_CXXFLAGS_DEBUG += -MP9
+
+

data/platform/shared/qt/curl/curl.pro

@@ -1,16 +1,15 @@
-greaterThan(QT_MINOR_VERSION, 6): {
-    CONFIG += c++14
-    DEFINES += RHODES_VERSION_2
-}
-
 equals(QT_MAJOR_VERSION, 5) {
-    equals(QT_MINOR_VERSION, 6) {
+    lessThan(QT_MINOR_VERSION, 6): {
+        DEFINES += RHODES_VERSION_1
+    }
+    equals(QT_MINOR_VERSION, 6): {
         DEFINES += OS_SAILFISH OS_LINUX
+        CONFIG +=  c++14
+    }
+    greaterThan(QT_MINOR_VERSION, 7): {
+        CONFIG += c++14
+        DEFINES += CPP_ELEVEN RHODES_VERSION_2
     }
-}
-
-lessThan(QT_MINOR_VERSION, 6): {
-    DEFINES += RHODES_VERSION_1
 }
 
 TARGET = curl
@@ -67,11 +66,23 @@ win32 {
 }
 
 unix:!macx {
-  DESTDIR = $$PWD/../../../linux/bin/curl
-  OBJECTS_DIR = $$PWD/../../../linux/bin/curl/tmp
-  DEFINES += HAVE_CONFIG_H USE_RHOSSL OS_LINUX OS_SAILFISH
-  QMAKE_CFLAGS += -fvisibility=hidden
-  QMAKE_CXXFLAGS += -fvisibility=hidden
+    INCLUDEPATH += $$PWD/../../ruby/linux
+    HEADERS += $$PWD/../../ruby/linux/ruby/config.h
+    DESTDIR = $$PWD/../../../linux/bin/curl
+    OBJECTS_DIR = $$PWD/../../../linux/bin/curl/tmp
+    DEFINES += HAVE_CONFIG_H USE_RHOSSL OS_LINUX __INTERIX
+    QMAKE_CFLAGS += -fvisibility=hidden
+    QMAKE_CXXFLAGS += -fvisibility=hidden
+    
+    #QMAKE_CFLAGS_RELEASE -= -O2
+    #QMAKE_CXXFLAGS_RELEASE -= -O2    
+
+    Debug {
+      DEFINES += _DEBUG DEBUG
+    }
+    Release {
+      DEFINES += _NDEBUG NDEBUG
+    }
 
 }
 
@@ -283,4 +294,4 @@ SOURCES += ../../curl/lib/amigaos.c\
 ../../curl/lib/gopher.c \
 ../../curl/lib/curl_threads.c \
 ../../curl/lib/curl_gethostname.c \
-../../curl/lib/curl_fnmatch.c
+../../curl/lib/curl_fnmatch.c

data/platform/shared/qt/rhodes/iexecutable.h

@@ -15,7 +15,7 @@ public:
         //setParent(parent);
         connect(parent, SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater()));
         connect(this, SIGNAL(run()), this, SLOT(execute()), Qt::QueuedConnection);
-#ifdef RHODES_MAC_BUILD
+#if defined (RHODES_MAC_BUILD) || (defined (OS_LINUX) && !defined (OS_SAILFISH))
         qDebug() << "Creating Executable in thred ID 0x" + QString::number((quint64)QThread::currentThreadId(), 16);
 #else
         qDebug() << "Creating Executable in thred ID 0x" + QString::number((quint32)QThread::currentThreadId(), 16);

data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.h

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

data/platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp

@@ -26,7 +26,7 @@
 
 #include "common/RhoDefs.h"
 
-#ifdef OS_WINDOWS_DESKTOP
+#if defined(OS_WINDOWS_DESKTOP)// || defined(OS_LINUX)
 
 #include "common/RhoPort.h"
 #include "RhoThreadImpl.h"