rhodes 1.4.2 → 1.5.0

data/platform/iphone/Classes/rho/common/RhoClassFactory.h

@@ -4,6 +4,7 @@
 #include "net/CURLNetRequest.h"
 #include "common/PosixThreadImpl.h"
 #include "SystemInfoImpl.h"
+#include "../net/sslimpl.h"
 
 namespace rho {
 namespace common {
@@ -11,19 +12,22 @@ namespace common {
 class CRhoClassFactory : public common::IRhoClassFactory
 {
 public:
-    virtual ~CRhoClassFactory(void){}
     net::INetRequest* createNetRequest()
     {
         return new net::CURLNetRequest();
     }
-    virtual common::IRhoThreadImpl* createThreadImpl()
+    common::IRhoThreadImpl* createThreadImpl()
     {
         return new CPosixThreadImpl;
     }
-    virtual ISystemInfo* createSystemInfo()
+    ISystemInfo* createSystemInfo()
     {
         return new CSystemInfoImpl;
     }
+    net::ISSL* createSSLEngine()
+    {
+        return new net::SSLImpl();
+    }
 };
 
 }

data/platform/iphone/Classes/rho/common/SplashScreenImpl.cpp

@@ -0,0 +1,27 @@
+/*
+ *  SplashScreenImpl.cpp
+ *  rhorunner
+ *
+ *  Created by Dmitry Moskalchuk on 11.03.10.
+ *  Copyright 2010 Rhomobile. All rights reserved.
+ *
+ */
+
+#include "SplashScreenImpl.h"
+
+#include "common/RhodesApp.h"
+
+extern "C"
+{
+
+void rho_splash_screen_start()
+{
+    RHODESAPP().getSplashScreen().start();
+}
+
+void rho_splash_screen_hide()
+{
+    RHODESAPP().getSplashScreen().hide();
+}
+
+}

data/platform/iphone/Classes/rho/common/SplashScreenImpl.h

@@ -0,0 +1,22 @@
+/*
+ *  SplashScreenImpl.h
+ *  rhorunner
+ *
+ *  Created by Dmitry Moskalchuk on 11.03.10.
+ *  Copyright 2010 Rhomobile. All rights reserved.
+ *
+ */
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+void rho_splash_screen_start();
+void rho_splash_screen_hide();
+
+#ifdef __cplusplus
+}
+#endif

data/platform/iphone/Classes/rho/net/NetRequestImpl.m

@@ -24,12 +24,11 @@
 #import <SystemConfiguration/SCNetworkReachability.h>
 #import <Foundation/Foundation.h>
 #include "common/RhoPort.h"
+#include "ruby/ext/rho/rhoruby.h"
 #import "logging/RhoLog.h"
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Net"
 
-//extern int logged_in();
-//extern int has_network_impl();
 extern int isNetworkAvailableFlags(SCNetworkReachabilityFlags *outFlags);
 typedef void (*FSAVECONNDATA)(void* pThis, void* pData);
 
@@ -49,22 +48,22 @@ void rho_net_impl_network_indicator(int active)
 }
 
 // Determines network connectivity
-int rho_net_has_network() {
+VALUE rho_sys_has_network() {
 	SCNetworkReachabilityFlags defaultRouteFlags;
 	int defaultRouteIsAvailable = isNetworkAvailableFlags(&defaultRouteFlags);
 	if (defaultRouteIsAvailable == 1) {
 		if (defaultRouteFlags & kSCNetworkReachabilityFlagsIsDirect) {
 			// Ad-Hoc network, not available
-			return 0;
+			return rho_ruby_create_boolean(0);
 		}
 		else if (defaultRouteFlags & ReachableViaCarrierDataNetwork) {
 			// Cell network available
-			return 1;
+			return rho_ruby_create_boolean(1);
 		}
 		// WIFI available
-		return 1;
+		return rho_ruby_create_boolean(1);
 	}
-	return 0;
+	return rho_ruby_create_boolean(0);
 }
 
 int isNetworkAvailableFlags(SCNetworkReachabilityFlags *outFlags)

data/platform/iphone/Classes/rho/net/sslimpl.cpp

@@ -0,0 +1,126 @@
+/*
+ *  sslimpl.cpp
+ *  rhorunner
+ *
+ *  Created by Dmitry Moskalchuk on 19.02.10.
+ *  Copyright 2010 Rhomobile. All rights reserved.
+ *
+ */
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <CFNetwork/CFNetwork.h>
+
+#include "sslimpl.h"
+
+#import "logging/RhoLog.h"
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "SSL"
+
+namespace rho
+{
+namespace net
+{
+
+struct ssl_data_t {
+    CFReadStreamRef readStream;
+    CFWriteStreamRef writeStream;
+};
+
+static void report_error(const char *s, CFStreamError *e)
+{
+    if (e->domain == kCFStreamErrorDomainPOSIX)
+        RAWLOG_ERROR2("%s, errno: %d", s, e->error);
+    else if (e->domain == kCFStreamErrorDomainMacOSStatus)
+        RAWLOG_ERROR2("%s, Mac OS status: %d", s, e->error);
+    else
+        RAWLOG_ERROR1("%s, unknown error", s);
+}
+    
+
+void * SSLImpl::createStorage()
+{
+    return malloc(sizeof(ssl_data_t));
+}
+
+void SSLImpl::freeStorage(void *ptr)
+{
+    free(ptr);
+}
+    
+CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, void *storage)
+{
+    ssl_data_t *data = (ssl_data_t*)storage;
+    
+    CFStreamCreatePairWithSocket(kCFAllocatorDefault, sockfd, &data->readStream, &data->writeStream);
+    // Indicate that the connection needs to be done in secure manner
+    CFReadStreamSetProperty(data->readStream, kCFStreamPropertySocketSecurityLevel, kCFStreamSocketSecurityLevelSSLv3);
+    CFWriteStreamSetProperty(data->writeStream, kCFStreamPropertySocketSecurityLevel, kCFStreamSocketSecurityLevelSSLv3);
+    
+    if (!CFReadStreamOpen(data->readStream) || !CFWriteStreamOpen(data->writeStream)) {
+        RAWLOG_ERROR("SSL connection error");
+        return CURLE_SSL_CONNECT_ERROR;
+    }
+    
+    *done = 1;
+    return CURLE_OK;
+}
+
+void SSLImpl::shutdown(void *storage)
+{
+    ssl_data_t *data = (ssl_data_t*)storage;
+    if (!data)
+        return;
+    
+    if (data->readStream) {
+        CFReadStreamRef readStream = (CFReadStreamRef)data->readStream;
+        CFReadStreamClose(readStream);
+        data->readStream = NULL;
+    }
+    if (data->writeStream) {
+        CFWriteStreamRef writeStream = (CFWriteStreamRef)data->writeStream;
+        CFWriteStreamClose(writeStream);
+        data->writeStream = NULL;
+    }
+}
+
+ssize_t SSLImpl::send(const void *mem, size_t len, void *storage)
+{
+    ssl_data_t *data = (ssl_data_t*)storage;
+    
+    if (!CFWriteStreamCanAcceptBytes(data->writeStream))
+        return 0;
+    
+    int rc = CFWriteStreamWrite(data->writeStream, (const UInt8 *)mem, len);
+    if (rc < 0) {
+        CFStreamError err = CFWriteStreamGetError(data->writeStream);
+        report_error("SSL send failed", &err);
+        return -1;
+    }
+    
+    return rc;
+}
+
+ssize_t SSLImpl::recv(char *buf, size_t size, int *wouldblock, void *storage)
+{
+    ssl_data_t *data = (ssl_data_t*)storage;
+    
+    if (!CFReadStreamHasBytesAvailable(data->readStream)) {
+        *wouldblock = 1;
+        return -1;
+    }
+    
+    *wouldblock = 0;
+    
+    CFIndex rc = CFReadStreamRead(data->readStream, (UInt8*)buf, size);
+    if (rc < 0) {
+        CFStreamError err = CFReadStreamGetError(data->readStream);
+        report_error("SSL recv failed", &err);
+        return -1;
+    }
+    
+    return rc;
+    
+}
+
+} // namespace net
+} // namespace rho

data/platform/iphone/Classes/rho/net/sslimpl.h

@@ -0,0 +1,32 @@
+/*
+ *  sslimpl.h
+ *  rhorunner
+ *
+ *  Created by Dmitry Moskalchuk on 19.02.10.
+ *  Copyright 2010 Rhomobile. All rights reserved.
+ *
+ */
+
+#pragma once
+
+#include "net/ssl.h"
+
+namespace rho
+{
+namespace net
+{
+
+class SSLImpl : public ISSL
+{
+public:
+    void *createStorage();
+    void freeStorage(void *ptr);
+    
+    CURLcode connect(int sockfd, int nonblocking, int *done, void *storage);
+    void shutdown(void *storage);
+    ssize_t send(const void *mem, size_t len, void *storage);
+    ssize_t recv(char *buf, size_t size, int *wouldblock, void *storage);
+};
+
+} // namespace net
+} // namespace rho

data/platform/iphone/Info.plist

@@ -2,29 +2,27 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>en</string>
-  <key>CFBundleDisplayName</key>
-  <string>Rhodes</string>
-  <key>CFBundleExecutable</key>
-  <string>${EXECUTABLE_NAME}</string>
-  <key>CFBundleIconFile</key>
-  <string>icon.png</string>
-  <key>CFBundleIdentifier</key>
-  <string>com.rhomobile.rhosyncclient</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>${PRODUCT_NAME}</string>
-  <key>CFBundlePackageType</key>
-  <string>APPL</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.4.2</string>
-  <key>LSRequiresIPhoneOS</key>
-  <true/>
-  <key>NSMainNibFile</key>
-  <string>MainWindow</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>Rhodes</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>icon.png</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.rhomobile.rhosyncclient</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.5.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
 </dict>
 </plist>

data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj

@@ -37,24 +37,8 @@
 		5C71628A0F8B7E330096B6AA /* RhoPlainLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7162810F8B7E330096B6AA /* RhoPlainLog.cpp */; };
 		5C7405921064AF1600163569 /* Tokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C7405901064AF1600163569 /* Tokenizer.cpp */; };
 		5C7405931064AF1600163569 /* Tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7405911064AF1600163569 /* Tokenizer.h */; };
-		5C7BC94210AAB782007B0BA1 /* auth.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93010AAB782007B0BA1 /* auth.c */; };
-		5C7BC94310AAB782007B0BA1 /* compat_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93110AAB782007B0BA1 /* compat_unix.c */; };
-		5C7BC94410AAB782007B0BA1 /* compat_unix.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7BC93210AAB782007B0BA1 /* compat_unix.h */; };
-		5C7BC94510AAB782007B0BA1 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7BC93310AAB782007B0BA1 /* config.h */; };
-		5C7BC94610AAB782007B0BA1 /* defs.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7BC93410AAB782007B0BA1 /* defs.h */; };
-		5C7BC94710AAB782007B0BA1 /* io.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7BC93510AAB782007B0BA1 /* io.h */; };
-		5C7BC94810AAB782007B0BA1 /* io_dir.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93610AAB782007B0BA1 /* io_dir.c */; };
-		5C7BC94910AAB782007B0BA1 /* io_emb.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93710AAB782007B0BA1 /* io_emb.c */; };
-		5C7BC94A10AAB782007B0BA1 /* io_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93810AAB782007B0BA1 /* io_file.c */; };
-		5C7BC94B10AAB782007B0BA1 /* io_socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93910AAB782007B0BA1 /* io_socket.c */; };
-		5C7BC94C10AAB782007B0BA1 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93A10AAB782007B0BA1 /* log.c */; };
-		5C7BC94D10AAB782007B0BA1 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93B10AAB782007B0BA1 /* md5.c */; };
-		5C7BC94E10AAB782007B0BA1 /* md5.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7BC93C10AAB782007B0BA1 /* md5.h */; };
-		5C7BC94F10AAB782007B0BA1 /* rdispatcher.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93D10AAB782007B0BA1 /* rdispatcher.c */; };
-		5C7BC95010AAB782007B0BA1 /* rdispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7BC93E10AAB782007B0BA1 /* rdispatcher.h */; };
-		5C7BC95110AAB782007B0BA1 /* shttpd.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC93F10AAB782007B0BA1 /* shttpd.c */; };
-		5C7BC95210AAB782007B0BA1 /* shttpd.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7BC94010AAB782007B0BA1 /* shttpd.h */; };
-		5C7BC95310AAB782007B0BA1 /* string.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7BC94110AAB782007B0BA1 /* string.c */; };
+		5C798934113BD148005F8736 /* GeoLocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C798932113BD148005F8736 /* GeoLocation.cpp */; };
+		5C798935113BD148005F8736 /* GeoLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C798933113BD148005F8736 /* GeoLocation.h */; };
 		5C8EE85C11220E9E0005C20D /* AsyncHttp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C8EE85A11220E9E0005C20D /* AsyncHttp.cpp */; };
 		5C8EE85D11220E9E0005C20D /* AsyncHttp.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C8EE85B11220E9E0005C20D /* AsyncHttp.h */; };
 		5C98174C0FBC4FCE002597A5 /* AutoPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C9817490FBC4FCE002597A5 /* AutoPointer.h */; };
@@ -63,6 +47,7 @@
 		5CBD462A1087399700107D0D /* URI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CBD46271087399700107D0D /* URI.cpp */; };
 		5CBD462B1087399700107D0D /* URI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBD46281087399700107D0D /* URI.h */; };
 		5CE294121009D8D9009A75F6 /* isysteminfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE294111009D8D9009A75F6 /* isysteminfo.h */; };
+		5CECDBB3113FE3620084A75B /* System.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CECDBB2113FE3620084A75B /* System.cpp */; };
 		BD2C950810AE0D4B008D4692 /* PosixThreadImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */; };
 		BD2C950910AE0D4B008D4692 /* PosixThreadImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = BD2C950710AE0D4B008D4692 /* PosixThreadImpl.h */; };
 		BD2CEFCE10ADF10D002356D9 /* CURLNetRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD2CEFCB10ADF10D002356D9 /* CURLNetRequest.cpp */; };
@@ -70,6 +55,12 @@
 		BD2CEFD010ADF10D002356D9 /* INetRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BD2CEFCD10ADF10D002356D9 /* INetRequest.h */; };
 		BD4FC54B10BFE4D100D280D0 /* HttpServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD4FC54910BFE4D100D280D0 /* HttpServer.cpp */; };
 		BD4FC54C10BFE4D100D280D0 /* HttpServer.h in Headers */ = {isa = PBXBuildFile; fileRef = BD4FC54A10BFE4D100D280D0 /* HttpServer.h */; };
+		BD8DF8881147C8090041A968 /* SplashScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD8DF8861147C8090041A968 /* SplashScreen.cpp */; };
+		BD8DF8891147C8090041A968 /* SplashScreen.h in Headers */ = {isa = PBXBuildFile; fileRef = BD8DF8871147C8090041A968 /* SplashScreen.h */; };
+		BDD11ECD113664E700349BE3 /* rhoparams.c in Sources */ = {isa = PBXBuildFile; fileRef = BDD11ECB113664E700349BE3 /* rhoparams.c */; };
+		BDD11ECE113664E700349BE3 /* rhoparams.h in Headers */ = {isa = PBXBuildFile; fileRef = BDD11ECC113664E700349BE3 /* rhoparams.h */; };
+		BDFCB13D112EE2B500AE3724 /* ssl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDFCB13B112EE2B500AE3724 /* ssl.cpp */; };
+		BDFCB13E112EE2B500AE3724 /* ssl.h in Headers */ = {isa = PBXBuildFile; fileRef = BDFCB13C112EE2B500AE3724 /* ssl.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -103,24 +94,8 @@
 		5C7162810F8B7E330096B6AA /* RhoPlainLog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoPlainLog.cpp; path = ../../shared/logging/RhoPlainLog.cpp; sourceTree = SOURCE_ROOT; };
 		5C7405901064AF1600163569 /* Tokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tokenizer.cpp; path = ../../shared/common/Tokenizer.cpp; sourceTree = SOURCE_ROOT; };
 		5C7405911064AF1600163569 /* Tokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Tokenizer.h; path = ../../shared/common/Tokenizer.h; sourceTree = SOURCE_ROOT; };
-		5C7BC93010AAB782007B0BA1 /* auth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = auth.c; path = ../../shared/shttpd/src/auth.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93110AAB782007B0BA1 /* compat_unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = compat_unix.c; path = ../../shared/shttpd/src/compat_unix.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93210AAB782007B0BA1 /* compat_unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = compat_unix.h; path = ../../shared/shttpd/src/compat_unix.h; sourceTree = SOURCE_ROOT; };
-		5C7BC93310AAB782007B0BA1 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../shared/shttpd/src/config.h; sourceTree = SOURCE_ROOT; };
-		5C7BC93410AAB782007B0BA1 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defs.h; path = ../../shared/shttpd/src/defs.h; sourceTree = SOURCE_ROOT; };
-		5C7BC93510AAB782007B0BA1 /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = io.h; path = ../../shared/shttpd/src/io.h; sourceTree = SOURCE_ROOT; };
-		5C7BC93610AAB782007B0BA1 /* io_dir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io_dir.c; path = ../../shared/shttpd/src/io_dir.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93710AAB782007B0BA1 /* io_emb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io_emb.c; path = ../../shared/shttpd/src/io_emb.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93810AAB782007B0BA1 /* io_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io_file.c; path = ../../shared/shttpd/src/io_file.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93910AAB782007B0BA1 /* io_socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = io_socket.c; path = ../../shared/shttpd/src/io_socket.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93A10AAB782007B0BA1 /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = log.c; path = ../../shared/shttpd/src/log.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93B10AAB782007B0BA1 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.c; path = ../../shared/shttpd/src/md5.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93C10AAB782007B0BA1 /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = md5.h; path = ../../shared/shttpd/src/md5.h; sourceTree = SOURCE_ROOT; };
-		5C7BC93D10AAB782007B0BA1 /* rdispatcher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rdispatcher.c; path = ../../shared/shttpd/src/rdispatcher.c; sourceTree = SOURCE_ROOT; };
-		5C7BC93E10AAB782007B0BA1 /* rdispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rdispatcher.h; path = ../../shared/shttpd/src/rdispatcher.h; sourceTree = SOURCE_ROOT; };
-		5C7BC93F10AAB782007B0BA1 /* shttpd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = shttpd.c; path = ../../shared/shttpd/src/shttpd.c; sourceTree = SOURCE_ROOT; };
-		5C7BC94010AAB782007B0BA1 /* shttpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shttpd.h; path = ../../shared/shttpd/src/shttpd.h; sourceTree = SOURCE_ROOT; };
-		5C7BC94110AAB782007B0BA1 /* string.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = string.c; path = ../../shared/shttpd/src/string.c; sourceTree = SOURCE_ROOT; };
+		5C798932113BD148005F8736 /* GeoLocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GeoLocation.cpp; path = ../../shared/rubyext/GeoLocation.cpp; sourceTree = SOURCE_ROOT; };
+		5C798933113BD148005F8736 /* GeoLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GeoLocation.h; path = ../../shared/rubyext/GeoLocation.h; sourceTree = SOURCE_ROOT; };
 		5C8EE85A11220E9E0005C20D /* AsyncHttp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AsyncHttp.cpp; path = ../../shared/net/AsyncHttp.cpp; sourceTree = SOURCE_ROOT; };
 		5C8EE85B11220E9E0005C20D /* AsyncHttp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncHttp.h; path = ../../shared/net/AsyncHttp.h; sourceTree = SOURCE_ROOT; };
 		5C9817490FBC4FCE002597A5 /* AutoPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AutoPointer.h; path = ../../shared/common/AutoPointer.h; sourceTree = SOURCE_ROOT; };
@@ -129,6 +104,7 @@
 		5CBD46271087399700107D0D /* URI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = URI.cpp; path = ../../shared/net/URI.cpp; sourceTree = SOURCE_ROOT; };
 		5CBD46281087399700107D0D /* URI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URI.h; path = ../../shared/net/URI.h; sourceTree = SOURCE_ROOT; };
 		5CE294111009D8D9009A75F6 /* isysteminfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isysteminfo.h; path = ../../shared/common/isysteminfo.h; sourceTree = SOURCE_ROOT; };
+		5CECDBB2113FE3620084A75B /* System.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = System.cpp; path = ../../shared/rubyext/System.cpp; sourceTree = SOURCE_ROOT; };
 		BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PosixThreadImpl.cpp; path = ../../shared/common/PosixThreadImpl.cpp; sourceTree = SOURCE_ROOT; };
 		BD2C950710AE0D4B008D4692 /* PosixThreadImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PosixThreadImpl.h; path = ../../shared/common/PosixThreadImpl.h; sourceTree = SOURCE_ROOT; };
 		BD2CEFCB10ADF10D002356D9 /* CURLNetRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CURLNetRequest.cpp; path = ../../shared/net/CURLNetRequest.cpp; sourceTree = SOURCE_ROOT; };
@@ -136,6 +112,12 @@
 		BD2CEFCD10ADF10D002356D9 /* INetRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = INetRequest.h; path = ../../shared/net/INetRequest.h; sourceTree = SOURCE_ROOT; };
 		BD4FC54910BFE4D100D280D0 /* HttpServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HttpServer.cpp; path = ../../shared/net/HttpServer.cpp; sourceTree = SOURCE_ROOT; };
 		BD4FC54A10BFE4D100D280D0 /* HttpServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HttpServer.h; path = ../../shared/net/HttpServer.h; sourceTree = SOURCE_ROOT; };
+		BD8DF8861147C8090041A968 /* SplashScreen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SplashScreen.cpp; path = ../../shared/common/SplashScreen.cpp; sourceTree = SOURCE_ROOT; };
+		BD8DF8871147C8090041A968 /* SplashScreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplashScreen.h; path = ../../shared/common/SplashScreen.h; sourceTree = SOURCE_ROOT; };
+		BDD11ECB113664E700349BE3 /* rhoparams.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhoparams.c; path = ../../shared/common/rhoparams.c; sourceTree = SOURCE_ROOT; };
+		BDD11ECC113664E700349BE3 /* rhoparams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhoparams.h; path = ../../shared/common/rhoparams.h; sourceTree = SOURCE_ROOT; };
+		BDFCB13B112EE2B500AE3724 /* ssl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ssl.cpp; path = ../../shared/net/ssl.cpp; sourceTree = SOURCE_ROOT; };
+		BDFCB13C112EE2B500AE3724 /* ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ssl.h; path = ../../shared/net/ssl.h; sourceTree = SOURCE_ROOT; };
 		D2AAC046055464E500DB518D /* librholib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librholib.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -163,7 +145,7 @@
 		08FB7795FE84155DC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				5C7BC92F10AAB6CC007B0BA1 /* shttpd */,
+				5C798931113BD10C005F8736 /* rubyext */,
 				5CBD46251087397B00107D0D /* net */,
 				5C6B45280F9468C5003CB43A /* statistic */,
 				5C7162600F8B7DEE0096B6AA /* common */,
@@ -192,6 +174,8 @@
 		5C7162600F8B7DEE0096B6AA /* common */ = {
 			isa = PBXGroup;
 			children = (
+				BDD11ECB113664E700349BE3 /* rhoparams.c */,
+				BDD11ECC113664E700349BE3 /* rhoparams.h */,
 				BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */,
 				BD2C950710AE0D4B008D4692 /* PosixThreadImpl.h */,
 				5C6855E610A02EAA008DA047 /* RhodesApp.cpp */,
@@ -217,6 +201,8 @@
 				5C71626B0F8B7E170096B6AA /* RhoStd.h */,
 				5C71626C0F8B7E170096B6AA /* RhoSystem.h */,
 				5C71626D0F8B7E170096B6AA /* RhoTime.h */,
+				BD8DF8861147C8090041A968 /* SplashScreen.cpp */,
+				BD8DF8871147C8090041A968 /* SplashScreen.h */,
 				5C71626E0F8B7E170096B6AA /* StringConverter.h */,
 			);
 			name = common;
@@ -237,34 +223,21 @@
 			name = logging;
 			sourceTree = "<group>";
 		};
-		5C7BC92F10AAB6CC007B0BA1 /* shttpd */ = {
+		5C798931113BD10C005F8736 /* rubyext */ = {
 			isa = PBXGroup;
 			children = (
-				5C7BC93010AAB782007B0BA1 /* auth.c */,
-				5C7BC93110AAB782007B0BA1 /* compat_unix.c */,
-				5C7BC93210AAB782007B0BA1 /* compat_unix.h */,
-				5C7BC93310AAB782007B0BA1 /* config.h */,
-				5C7BC93410AAB782007B0BA1 /* defs.h */,
-				5C7BC93510AAB782007B0BA1 /* io.h */,
-				5C7BC93610AAB782007B0BA1 /* io_dir.c */,
-				5C7BC93710AAB782007B0BA1 /* io_emb.c */,
-				5C7BC93810AAB782007B0BA1 /* io_file.c */,
-				5C7BC93910AAB782007B0BA1 /* io_socket.c */,
-				5C7BC93A10AAB782007B0BA1 /* log.c */,
-				5C7BC93B10AAB782007B0BA1 /* md5.c */,
-				5C7BC93C10AAB782007B0BA1 /* md5.h */,
-				5C7BC93D10AAB782007B0BA1 /* rdispatcher.c */,
-				5C7BC93E10AAB782007B0BA1 /* rdispatcher.h */,
-				5C7BC93F10AAB782007B0BA1 /* shttpd.c */,
-				5C7BC94010AAB782007B0BA1 /* shttpd.h */,
-				5C7BC94110AAB782007B0BA1 /* string.c */,
+				5CECDBB2113FE3620084A75B /* System.cpp */,
+				5C798932113BD148005F8736 /* GeoLocation.cpp */,
+				5C798933113BD148005F8736 /* GeoLocation.h */,
 			);
-			name = shttpd;
+			name = rubyext;
 			sourceTree = "<group>";
 		};
 		5CBD46251087397B00107D0D /* net */ = {
 			isa = PBXGroup;
 			children = (
+				BDFCB13B112EE2B500AE3724 /* ssl.cpp */,
+				BDFCB13C112EE2B500AE3724 /* ssl.h */,
 				5C8EE85A11220E9E0005C20D /* AsyncHttp.cpp */,
 				5C8EE85B11220E9E0005C20D /* AsyncHttp.h */,
 				BD4FC54910BFE4D100D280D0 /* HttpServer.cpp */,
@@ -317,18 +290,15 @@
 				5C7405931064AF1600163569 /* Tokenizer.h in Headers */,
 				5CBD462B1087399700107D0D /* URI.h in Headers */,
 				5C6855EA10A02EAA008DA047 /* RhodesApp.h in Headers */,
-				5C7BC94410AAB782007B0BA1 /* compat_unix.h in Headers */,
-				5C7BC94510AAB782007B0BA1 /* config.h in Headers */,
-				5C7BC94610AAB782007B0BA1 /* defs.h in Headers */,
-				5C7BC94710AAB782007B0BA1 /* io.h in Headers */,
-				5C7BC94E10AAB782007B0BA1 /* md5.h in Headers */,
-				5C7BC95010AAB782007B0BA1 /* rdispatcher.h in Headers */,
-				5C7BC95210AAB782007B0BA1 /* shttpd.h in Headers */,
 				BD2CEFCF10ADF10D002356D9 /* CURLNetRequest.h in Headers */,
 				BD2CEFD010ADF10D002356D9 /* INetRequest.h in Headers */,
 				BD2C950910AE0D4B008D4692 /* PosixThreadImpl.h in Headers */,
 				BD4FC54C10BFE4D100D280D0 /* HttpServer.h in Headers */,
 				5C8EE85D11220E9E0005C20D /* AsyncHttp.h in Headers */,
+				BDFCB13E112EE2B500AE3724 /* ssl.h in Headers */,
+				BDD11ECE113664E700349BE3 /* rhoparams.h in Headers */,
+				5C798935113BD148005F8736 /* GeoLocation.h in Headers */,
+				BD8DF8891147C8090041A968 /* SplashScreen.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -385,21 +355,15 @@
 				5C7405921064AF1600163569 /* Tokenizer.cpp in Sources */,
 				5CBD462A1087399700107D0D /* URI.cpp in Sources */,
 				5C6855E910A02EAA008DA047 /* RhodesApp.cpp in Sources */,
-				5C7BC94210AAB782007B0BA1 /* auth.c in Sources */,
-				5C7BC94310AAB782007B0BA1 /* compat_unix.c in Sources */,
-				5C7BC94810AAB782007B0BA1 /* io_dir.c in Sources */,
-				5C7BC94910AAB782007B0BA1 /* io_emb.c in Sources */,
-				5C7BC94A10AAB782007B0BA1 /* io_file.c in Sources */,
-				5C7BC94B10AAB782007B0BA1 /* io_socket.c in Sources */,
-				5C7BC94C10AAB782007B0BA1 /* log.c in Sources */,
-				5C7BC94D10AAB782007B0BA1 /* md5.c in Sources */,
-				5C7BC94F10AAB782007B0BA1 /* rdispatcher.c in Sources */,
-				5C7BC95110AAB782007B0BA1 /* shttpd.c in Sources */,
-				5C7BC95310AAB782007B0BA1 /* string.c in Sources */,
 				BD2CEFCE10ADF10D002356D9 /* CURLNetRequest.cpp in Sources */,
 				BD2C950810AE0D4B008D4692 /* PosixThreadImpl.cpp in Sources */,
 				BD4FC54B10BFE4D100D280D0 /* HttpServer.cpp in Sources */,
 				5C8EE85C11220E9E0005C20D /* AsyncHttp.cpp in Sources */,
+				BDFCB13D112EE2B500AE3724 /* ssl.cpp in Sources */,
+				BDD11ECD113664E700349BE3 /* rhoparams.c in Sources */,
+				5C798934113BD148005F8736 /* GeoLocation.cpp in Sources */,
+				5CECDBB3113FE3620084A75B /* System.cpp in Sources */,
+				BD8DF8881147C8090041A968 /* SplashScreen.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};