rhodes 1.4.2 → 1.5.0

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

@@ -156,6 +156,9 @@
 		BD2C945610AE01D7008D4692 /* stdcheaders.h in Headers */ = {isa = PBXBuildFile; fileRef = BD2C944C10AE01D7008D4692 /* stdcheaders.h */; };
 		BD2C945710AE01D7008D4692 /* typecheck-gcc.h in Headers */ = {isa = PBXBuildFile; fileRef = BD2C944D10AE01D7008D4692 /* typecheck-gcc.h */; };
 		BD2C945810AE01D7008D4692 /* types.h in Headers */ = {isa = PBXBuildFile; fileRef = BD2C944E10AE01D7008D4692 /* types.h */; };
+		BDFCB036112EC4C500AE3724 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BDFCB035112EC4C500AE3724 /* CFNetwork.framework */; };
+		BDFCB120112EDB7600AE3724 /* rhossl.c in Sources */ = {isa = PBXBuildFile; fileRef = BDFCB11E112EDB7600AE3724 /* rhossl.c */; };
+		BDFCB121112EDB7600AE3724 /* rhossl.h in Headers */ = {isa = PBXBuildFile; fileRef = BDFCB11F112EDB7600AE3724 /* rhossl.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -308,6 +311,9 @@
 		BD2C944C10AE01D7008D4692 /* stdcheaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdcheaders.h; sourceTree = "<group>"; };
 		BD2C944D10AE01D7008D4692 /* typecheck-gcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "typecheck-gcc.h"; sourceTree = "<group>"; };
 		BD2C944E10AE01D7008D4692 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
+		BDFCB035112EC4C500AE3724 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+		BDFCB11E112EDB7600AE3724 /* rhossl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rhossl.c; sourceTree = "<group>"; };
+		BDFCB11F112EDB7600AE3724 /* rhossl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rhossl.h; sourceTree = "<group>"; };
 		D2AAC046055464E500DB518D /* libcurl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcurl.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -316,6 +322,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BDFCB036112EC4C500AE3724 /* CFNetwork.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -328,6 +335,7 @@
 				08FB7795FE84155DC02AAC07 /* Source */,
 				C6A0FF2B0290797F04C91782 /* Documentation */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
+				BDFCB035112EC4C500AE3724 /* CFNetwork.framework */,
 			);
 			name = curl;
 			sourceTree = "<group>";
@@ -352,6 +360,8 @@
 		BD2C932D10AE01B7008D4692 /* lib */ = {
 			isa = PBXGroup;
 			children = (
+				BDFCB11E112EDB7600AE3724 /* rhossl.c */,
+				BDFCB11F112EDB7600AE3724 /* rhossl.h */,
 				BD2C932E10AE01B7008D4692 /* amigaos.c */,
 				BD2C932F10AE01B7008D4692 /* arpa_telnet.h */,
 				BD2C933010AE01B7008D4692 /* base64.c */,
@@ -602,6 +612,7 @@
 				BD2C945610AE01D7008D4692 /* stdcheaders.h in Headers */,
 				BD2C945710AE01D7008D4692 /* typecheck-gcc.h in Headers */,
 				BD2C945810AE01D7008D4692 /* types.h in Headers */,
+				BDFCB121112EDB7600AE3724 /* rhossl.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -722,6 +733,7 @@
 				BD2C943E10AE01B7008D4692 /* transfer.c in Sources */,
 				BD2C944010AE01B7008D4692 /* url.c in Sources */,
 				BD2C944310AE01B7008D4692 /* version.c in Sources */,
+				BDFCB120112EDB7600AE3724 /* rhossl.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -738,7 +750,10 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INSTALL_PATH = /usr/local/lib;
-				OTHER_CFLAGS = "-DHAVE_CONFIG_H";
+				OTHER_CFLAGS = (
+					"-DHAVE_CONFIG_H",
+					"-DUSE_RHOSSL",
+				);
 				PRODUCT_NAME = curl;
 				SDKROOT = iphonesimulator2.2.1;
 				SYMROOT = ../build;
@@ -753,7 +768,10 @@
 				GCC_MODEL_TUNING = G5;
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-DHAVE_CONFIG_H";
+				OTHER_CFLAGS = (
+					"-DHAVE_CONFIG_H",
+					"-DUSE_RHOSSL",
+				);
 				PRODUCT_NAME = curl;
 				SDKROOT = iphoneos2.2.1;
 				SYMROOT = ../build;
@@ -806,7 +824,10 @@
 				GCC_MODEL_TUNING = G5;
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-DHAVE_CONFIG_H";
+				OTHER_CFLAGS = (
+					"-DHAVE_CONFIG_H",
+					"-DUSE_RHOSSL",
+				);
 				PRODUCT_NAME = curl;
 				SDKROOT = iphoneos2.2.1;
 				SYMROOT = ../build;

data/platform/iphone/main.m

@@ -6,6 +6,8 @@
 //  Copyright __MyCompanyName__ 2008. All rights reserved.
 //
 
+#include <signal.h>
+
 #import <UIKit/UIKit.h>
 #import "ServerHost.h"
 #import "logging/RhoLog.h"
@@ -13,14 +15,13 @@
 #define DEFAULT_LOGCATEGORY "main"
 
 int main(int argc, char *argv[]) {
-
-	NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-    int retVal = UIApplicationMain(argc, argv, nil, nil);
     
-	[pool release];
+    signal(SIGPIPE, SIG_IGN);
+    
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    int retVal = UIApplicationMain(argc, argv, nil, @"RhoRunnerAppDelegate");
+    [pool release];
 
     RAWLOG_INFO("Exiting the Runner");
-
-	return retVal;
+    return retVal;
 }

data/platform/iphone/rbuild/iphone.rake

@@ -1,5 +1,4 @@
 #
-require 'digest/sha2'
 
 def set_app_name(newname)
   fname = $config["build"]["iphonepath"] + "/Info.plist"
@@ -108,12 +107,8 @@ namespace "build" do
 
       Rake::Task["build:iphone:extensions"].execute
 
-      # Calculate hash of newly built files
-      hash = ''
-      Dir.glob($srcdir + "/**/*").each do |f|
-        hash += Digest::SHA2.file(f).hexdigest if File.file? f and f !~ /\/hash$/
-      end
-      File.open(File.join($srcdir, "hash"), "w") { |f| f.write(Digest::SHA2.hexdigest(hash)) }
+      # Store hash
+      File.open(File.join($srcdir, "hash"), "w") { |f| f.write(get_dir_hash($srcdir).hexdigest) }
       # Store app name
       File.open(File.join($srcdir, "name"), "w") { |f| f.write($app_config["name"]) }
 

data/platform/iphone/rhoextlib/syscall.c

@@ -7,7 +7,7 @@
 
 extern void _rho_ext_syscall(PARAMS_WRAPPER* params);
 
-VALUE rho_syscall(const char* callname, int nparams, char** param_names, char** param_values) {
+VALUE rho_sys_makephonecall(const char* callname, int nparams, char** param_names, char** param_values) {
 	PARAMS_WRAPPER params = {nparams,param_names,param_values,callname,0};
 	PARAMS_WRAPPER* ret;
 	VALUE ret_value = Qnil;

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

@@ -8,15 +8,13 @@
 
 /* Begin PBXBuildFile section */
 		46056D171031DC7E00C21967 /* datetimepicker_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 46056D151031DC7E00C21967 /* datetimepicker_wrap.c */; };
-		4678FCCC0F8187A10054340C /* network.c in Sources */ = {isa = PBXBuildFile; fileRef = 4678FCCA0F8187A10054340C /* network.c */; };
-		4678FCCD0F8187A10054340C /* network.h in Headers */ = {isa = PBXBuildFile; fileRef = 4678FCCB0F8187A10054340C /* network.h */; };
 		46A4ABC0101A25DD00AF74C7 /* rhoconf_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 46A4ABBE101A25DD00AF74C7 /* rhoconf_wrap.c */; };
 		46AF502F103DE480006E02E1 /* nativebar_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 46AF502D103DE480006E02E1 /* nativebar_wrap.c */; };
-		5C2E6F470F30E05700CCFE20 /* geolocation_rhowrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E6F460F30E05700CCFE20 /* geolocation_rhowrap.c */; };
 		5C76527E0FD3E3C100CB43FD /* rhoruby.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C76527B0FD3E3C100CB43FD /* rhoruby.c */; };
 		5C76527F0FD3E3C100CB43FD /* rhoruby.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C76527C0FD3E3C100CB43FD /* rhoruby.h */; };
 		5C7652800FD3E3C100CB43FD /* rhosupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C76527D0FD3E3C100CB43FD /* rhosupport.c */; };
 		5C7652830FD3E3E000CB43FD /* stringio.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7652820FD3E3E000CB43FD /* stringio.c */; };
+		5C79894D113BD1D0005F8736 /* geolocation_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C79894C113BD1D0005F8736 /* geolocation_wrap.c */; };
 		5C8EE86511220ED30005C20D /* asynchttp_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C8EE86411220ED30005C20D /* asynchttp_wrap.c */; };
 		5CF8DBC610B1D45C00247AB4 /* addrinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CF8DBC010B1D45C00247AB4 /* addrinfo.h */; };
 		5CF8DBC710B1D45C00247AB4 /* constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CF8DBC110B1D45C00247AB4 /* constants.h */; };
@@ -25,8 +23,6 @@
 		D38F7B5F110647510030B1F4 /* extensions.c in Sources */ = {isa = PBXBuildFile; fileRef = D38F7B5E110647510030B1F4 /* extensions.c */; };
 		F51668800FFD39D80079F023 /* alert_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F516687F0FFD39D80079F023 /* alert_wrap.c */; };
 		F5177F180EE5B624000EA1A0 /* system_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5177F170EE5B624000EA1A0 /* system_wrap.c */; };
-		F5177F210EE5C940000EA1A0 /* system_properties.c in Sources */ = {isa = PBXBuildFile; fileRef = F5177F1F0EE5C940000EA1A0 /* system_properties.c */; };
-		F5177F220EE5C940000EA1A0 /* system_properties.h in Headers */ = {isa = PBXBuildFile; fileRef = F5177F200EE5C940000EA1A0 /* system_properties.h */; };
 		F58E7FE80F008AA600E46829 /* phonebook_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F58E7FE70F008AA600E46829 /* phonebook_wrap.c */; };
 		F5B8FACF0F44E92700C9AF85 /* camera_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B8FACE0F44E92700C9AF85 /* camera_wrap.c */; };
 		F5C61CAA0F3CFE7800207621 /* webview_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5C61CA90F3CFE7800207621 /* webview_wrap.c */; };
@@ -121,15 +117,13 @@
 
 /* Begin PBXFileReference section */
 		46056D151031DC7E00C21967 /* datetimepicker_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = datetimepicker_wrap.c; path = ../../shared/ruby/ext/datetimepicker/datetimepicker_wrap.c; sourceTree = SOURCE_ROOT; };
-		4678FCCA0F8187A10054340C /* network.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = network.c; path = ../../shared/ruby/ext/system/network.c; sourceTree = SOURCE_ROOT; };
-		4678FCCB0F8187A10054340C /* network.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = network.h; path = ../../shared/ruby/ext/system/network.h; sourceTree = SOURCE_ROOT; };
 		46A4ABBE101A25DD00AF74C7 /* rhoconf_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhoconf_wrap.c; path = ../../shared/ruby/ext/rhoconf/rhoconf_wrap.c; sourceTree = SOURCE_ROOT; };
 		46AF502D103DE480006E02E1 /* nativebar_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nativebar_wrap.c; sourceTree = "<group>"; };
-		5C2E6F460F30E05700CCFE20 /* geolocation_rhowrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = geolocation_rhowrap.c; path = ext/geolocation/geolocation_rhowrap.c; sourceTree = "<group>"; };
 		5C76527B0FD3E3C100CB43FD /* rhoruby.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhoruby.c; path = ext/rho/rhoruby.c; sourceTree = "<group>"; };
 		5C76527C0FD3E3C100CB43FD /* rhoruby.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhoruby.h; path = ext/rho/rhoruby.h; sourceTree = "<group>"; };
 		5C76527D0FD3E3C100CB43FD /* rhosupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhosupport.c; path = ext/rho/rhosupport.c; sourceTree = "<group>"; };
 		5C7652820FD3E3E000CB43FD /* stringio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stringio.c; path = ext/stringio/stringio.c; sourceTree = "<group>"; };
+		5C79894C113BD1D0005F8736 /* geolocation_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = geolocation_wrap.c; path = ext/geolocation/geolocation_wrap.c; sourceTree = "<group>"; };
 		5C8EE86411220ED30005C20D /* asynchttp_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = asynchttp_wrap.c; path = ext/asynchttp/asynchttp_wrap.c; sourceTree = "<group>"; };
 		5CF8DBC010B1D45C00247AB4 /* addrinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = addrinfo.h; path = ext/socket/addrinfo.h; sourceTree = "<group>"; };
 		5CF8DBC110B1D45C00247AB4 /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ext/socket/constants.h; sourceTree = "<group>"; };
@@ -139,8 +133,6 @@
 		D38F7B5E110647510030B1F4 /* extensions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extensions.c; path = ext/rho/extensions.c; sourceTree = "<group>"; };
 		F516687F0FFD39D80079F023 /* alert_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = alert_wrap.c; path = ../../shared/ruby/ext/alert/alert_wrap.c; sourceTree = SOURCE_ROOT; };
 		F5177F170EE5B624000EA1A0 /* system_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system_wrap.c; path = ../../shared/ruby/ext/system/system_wrap.c; sourceTree = SOURCE_ROOT; };
-		F5177F1F0EE5C940000EA1A0 /* system_properties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system_properties.c; path = ../../shared/ruby/ext/system/system_properties.c; sourceTree = SOURCE_ROOT; };
-		F5177F200EE5C940000EA1A0 /* system_properties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = system_properties.h; path = ../../shared/ruby/ext/system/system_properties.h; sourceTree = SOURCE_ROOT; };
 		F58E7FE70F008AA600E46829 /* phonebook_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = phonebook_wrap.c; path = ../../shared/ruby/ext/phonebook/phonebook_wrap.c; sourceTree = SOURCE_ROOT; };
 		F5B8FACE0F44E92700C9AF85 /* camera_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = camera_wrap.c; path = ../../shared/ruby/ext/camera/camera_wrap.c; sourceTree = SOURCE_ROOT; };
 		F5C61CA90F3CFE7800207621 /* webview_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = webview_wrap.c; path = ../../shared/ruby/ext/webview/webview_wrap.c; sourceTree = SOURCE_ROOT; };
@@ -345,10 +337,6 @@
 		F5177F150EE5B5D9000EA1A0 /* system */ = {
 			isa = PBXGroup;
 			children = (
-				4678FCCA0F8187A10054340C /* network.c */,
-				4678FCCB0F8187A10054340C /* network.h */,
-				F5177F1F0EE5C940000EA1A0 /* system_properties.c */,
-				F5177F200EE5C940000EA1A0 /* system_properties.h */,
 				F5177F170EE5B624000EA1A0 /* system_wrap.c */,
 			);
 			name = system;
@@ -504,7 +492,7 @@
 		F5E360BA0EB6A6C400226287 /* geolocation */ = {
 			isa = PBXGroup;
 			children = (
-				5C2E6F460F30E05700CCFE20 /* geolocation_rhowrap.c */,
+				5C79894C113BD1D0005F8736 /* geolocation_wrap.c */,
 			);
 			name = geolocation;
 			sourceTree = "<group>";
@@ -598,8 +586,6 @@
 				F5E360D40EB6A84600226287 /* config.h in Headers */,
 				F5E362410EB785C100226287 /* crt_externs.h in Headers */,
 				F5E362990EB7927100226287 /* thread_pthread.h in Headers */,
-				F5177F220EE5C940000EA1A0 /* system_properties.h in Headers */,
-				4678FCCD0F8187A10054340C /* network.h in Headers */,
 				5C76527F0FD3E3C100CB43FD /* rhoruby.h in Headers */,
 				5CF8DBC610B1D45C00247AB4 /* addrinfo.h in Headers */,
 				5CF8DBC710B1D45C00247AB4 /* constants.h in Headers */,
@@ -719,12 +705,9 @@
 				F5E363050EB79F8400226287 /* lgamma_r.c in Sources */,
 				F5E363080EB7A0DB00226287 /* newline.c in Sources */,
 				F5177F180EE5B624000EA1A0 /* system_wrap.c in Sources */,
-				F5177F210EE5C940000EA1A0 /* system_properties.c in Sources */,
 				F58E7FE80F008AA600E46829 /* phonebook_wrap.c in Sources */,
-				5C2E6F470F30E05700CCFE20 /* geolocation_rhowrap.c in Sources */,
 				F5C61CAA0F3CFE7800207621 /* webview_wrap.c in Sources */,
 				F5B8FACF0F44E92700C9AF85 /* camera_wrap.c in Sources */,
-				4678FCCC0F8187A10054340C /* network.c in Sources */,
 				5C76527E0FD3E3C100CB43FD /* rhoruby.c in Sources */,
 				5C7652800FD3E3C100CB43FD /* rhosupport.c in Sources */,
 				5C7652830FD3E3E000CB43FD /* stringio.c in Sources */,
@@ -736,6 +719,7 @@
 				5CF8DBCA10B1D45C00247AB4 /* socket.c in Sources */,
 				D38F7B5F110647510030B1F4 /* extensions.c in Sources */,
 				5C8EE86511220ED30005C20D /* asynchttp_wrap.c in Sources */,
+				5C79894D113BD1D0005F8736 /* geolocation_wrap.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

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

@@ -8,19 +8,13 @@
 
 /* Begin PBXBuildFile section */
 		05377B3F0E709170003B8BD1 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 05377B3D0E709170003B8BD1 /* WebViewController.m */; };
-		05377CEC0E74D6C0003B8BD1 /* HttpContext.c in Sources */ = {isa = PBXBuildFile; fileRef = 05377CE80E74D6C0003B8BD1 /* HttpContext.c */; };
-		05377CED0E74D6C0003B8BD1 /* Server.c in Sources */ = {isa = PBXBuildFile; fileRef = 05377CEA0E74D6C0003B8BD1 /* Server.c */; };
 		05377D120E74D7D7003B8BD1 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05377D110E74D7D7003B8BD1 /* CoreFoundation.framework */; };
-		05CF70EB0E78B14D00D41986 /* ServerHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 05CF70EA0E78B14D00D41986 /* ServerHost.m */; };
-		05CF72500E7B16F800D41986 /* HttpMessage.c in Sources */ = {isa = PBXBuildFile; fileRef = 05CF724E0E7B16F800D41986 /* HttpMessage.c */; };
 		1D3623260D0F684500981E51 /* RhoRunnerAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* RhoRunnerAppDelegate.m */; };
 		1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
 		1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
 		46056D221031EDA900C21967 /* DateTimePickerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 46056D211031EDA900C21967 /* DateTimePickerDelegate.m */; };
-		463577BF107272A400BEC653 /* JSString.m in Sources */ = {isa = PBXBuildFile; fileRef = 463577BE107272A400BEC653 /* JSString.m */; };
 		4678FCA90F8185920054340C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4678FCA80F8185920054340C /* SystemConfiguration.framework */; };
-		468276F010713FD600ADBCD4 /* WebViewUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = 468276EF10713FD600ADBCD4 /* WebViewUrl.m */; };
 		4684391210445A810019C7F0 /* BarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4684391110445A810019C7F0 /* BarItem.m */; };
 		468E57421035DBC100A2293C /* TabBarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 468E57411035DBC100A2293C /* TabBarDelegate.m */; };
 		46AD7DB31117AFB9009A974A /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46AD7DB21117AFB9009A974A /* MapKit.framework */; };
@@ -29,8 +23,13 @@
 		46B005F71033690F00D0C2F4 /* DateTime.m in Sources */ = {isa = PBXBuildFile; fileRef = 46B005F61033690F00D0C2F4 /* DateTime.m */; };
 		46B007071033776600D0C2F4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46B007061033776600D0C2F4 /* CoreGraphics.framework */; };
 		46C25E3B103240A400A26428 /* RhoDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 46C25E3A103240A400A26428 /* RhoDelegate.m */; };
+		5C4775F71130832B0092D21E /* ServerHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C4775F61130832B0092D21E /* ServerHost.m */; };
+		5C477604113083F10092D21E /* JSString.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C477603113083F10092D21E /* JSString.m */; };
+		5C477608113084290092D21E /* WebViewUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C477607113084290092D21E /* WebViewUrl.m */; };
 		5C53337B0FC1B20000F268F0 /* NetRequestImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C5333790FC1B20000F268F0 /* NetRequestImpl.m */; };
 		5C5335C60FC2F44500F268F0 /* RhoClassFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5335C40FC2F44500F268F0 /* RhoClassFactory.cpp */; };
+		BD5B744B113BE2DB00C6070A /* SplashViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BD5B7449113BE2DB00C6070A /* SplashViewController.m */; };
+		BDA401BD11495BBD00C5D4BD /* SplashScreenImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDA401BC11495BBD00C5D4BD /* SplashScreenImpl.cpp */; };
 		BDA4BAA0109A347400467AB9 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BDA4BA9F109A347400467AB9 /* libz.dylib */; };
 		BDB15ED110B2EBC200003DFA /* librhoextlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5F06496102B946F006CFD39 /* librhoextlib.a */; };
 		BDB15ED210B2EC6600003DFA /* librhosynclib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F563D5450EA8240E0062DA57 /* librhosynclib.a */; };
@@ -39,7 +38,6 @@
 		BDB15ED510B2EC8700003DFA /* librhorubylib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F59F16000E9449B8004103B4 /* librhorubylib.a */; };
 		BDB15ED610B2EC8E00003DFA /* libtcmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C12568C0F7CEA9200C87274 /* libtcmalloc.a */; };
 		BDE35A7A107F900A009941C7 /* RhoFileImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = BDE35A79107F900A009941C7 /* RhoFileImpl.m */; };
-		BDFBD99110B1B98900BAAFAB /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD99010B1B98900BAAFAB /* MainWindow.xib */; };
 		BDFBD99610B1B99A00BAAFAB /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD99510B1B99A00BAAFAB /* Entitlements.plist */; };
 		BDFBD99A10B1B9A900BAAFAB /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD99910B1B9A900BAAFAB /* Settings.bundle */; };
 		BDFBD99F10B1B9B900BAAFAB /* gears.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD99E10B1B9B900BAAFAB /* gears.png */; };
@@ -47,6 +45,7 @@
 		BDFBD9A410B1B9E500BAAFAB /* forward_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A210B1B9E500BAAFAB /* forward_btn.png */; };
 		BDFBD9A510B1B9E500BAAFAB /* home_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A310B1B9E500BAAFAB /* home_btn.png */; };
 		BDFBD9A710B1BA2000BAAFAB /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A610B1BA2000BAAFAB /* icon.png */; };
+		BDFCB156112EE65900AE3724 /* sslimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDFCB155112EE65900AE3724 /* sslimpl.cpp */; };
 		F5128ADD1069752F002F00E5 /* MapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128ADC1069752F002F00E5 /* MapAnnotation.m */; };
 		F5128C2C106C1FF3002F00E5 /* GoogleGeocoder.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128C2B106C1FF3002F00E5 /* GoogleGeocoder.m */; };
 		F51668E00FFD5F740079F023 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F51668DF0FFD5F740079F023 /* AudioToolbox.framework */; };
@@ -62,7 +61,6 @@
 		F58E7FDB0F008A6B00E46829 /* phonebook.m in Sources */ = {isa = PBXBuildFile; fileRef = F58E7FDA0F008A6B00E46829 /* phonebook.m */; };
 		F58E80110F008B3F00E46829 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F58E80100F008B3F00E46829 /* AddressBook.framework */; };
 		F5B8FAD40F44EA7B00C9AF85 /* PickImageDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B8FAD30F44EA7B00C9AF85 /* PickImageDelegate.m */; };
-		F5C106500E917D2A0049A94A /* Dispatcher.c in Sources */ = {isa = PBXBuildFile; fileRef = F5C1064F0E917D2A0049A94A /* Dispatcher.c */; };
 		F5F06668102CB134006CFD39 /* ParamsWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F06667102CB134006CFD39 /* ParamsWrapper.m */; };
 		F5FD0944106151C200B7B8ED /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FD0943106151C200B7B8ED /* MapViewController.m */; };
 /* End PBXBuildFile section */
@@ -157,16 +155,7 @@
 /* Begin PBXFileReference section */
 		05377B3D0E709170003B8BD1 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
 		05377B3E0E709170003B8BD1 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
-		05377CE80E74D6C0003B8BD1 /* HttpContext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HttpContext.c; path = Server/HttpContext.c; sourceTree = "<group>"; };
-		05377CE90E74D6C0003B8BD1 /* HttpContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HttpContext.h; path = Server/HttpContext.h; sourceTree = "<group>"; };
-		05377CEA0E74D6C0003B8BD1 /* Server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Server.c; path = Server/Server.c; sourceTree = "<group>"; };
-		05377CEB0E74D6C0003B8BD1 /* Server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Server.h; path = Server/Server.h; sourceTree = "<group>"; };
 		05377D110E74D7D7003B8BD1 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		05CF70E90E78B14D00D41986 /* ServerHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerHost.h; path = Server/ServerHost.h; sourceTree = "<group>"; };
-		05CF70EA0E78B14D00D41986 /* ServerHost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ServerHost.m; path = Server/ServerHost.m; sourceTree = "<group>"; };
-		05CF724E0E7B16F800D41986 /* HttpMessage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = HttpMessage.c; path = Server/HttpMessage.c; sourceTree = "<group>"; };
-		05CF724F0E7B16F800D41986 /* HttpMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HttpMessage.h; path = Server/HttpMessage.h; sourceTree = "<group>"; };
-		05CF72930E7F2EAC00D41986 /* defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = defs.h; path = Server/defs.h; sourceTree = "<group>"; };
 		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		1D3623240D0F684500981E51 /* RhoRunnerAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoRunnerAppDelegate.h; sourceTree = "<group>"; };
 		1D3623250D0F684500981E51 /* RhoRunnerAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoRunnerAppDelegate.m; sourceTree = "<group>"; };
@@ -176,11 +165,7 @@
 		32CA4F630368D1EE00C91783 /* rhorunner_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rhorunner_Prefix.pch; sourceTree = "<group>"; };
 		46056D201031EDA900C21967 /* DateTimePickerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTimePickerDelegate.h; sourceTree = "<group>"; };
 		46056D211031EDA900C21967 /* DateTimePickerDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateTimePickerDelegate.m; sourceTree = "<group>"; };
-		463577BD107272A400BEC653 /* JSString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSString.h; path = Classes/JSString.h; sourceTree = SOURCE_ROOT; };
-		463577BE107272A400BEC653 /* JSString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JSString.m; path = Classes/JSString.m; sourceTree = SOURCE_ROOT; };
 		4678FCA80F8185920054340C /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = ../../../../../../../../Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS2.1.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SOURCE_ROOT; };
-		468276EE10713FD600ADBCD4 /* WebViewUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewUrl.h; path = Server/WebViewUrl.h; sourceTree = "<group>"; };
-		468276EF10713FD600ADBCD4 /* WebViewUrl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewUrl.m; path = Server/WebViewUrl.m; sourceTree = "<group>"; };
 		4684391010445A810019C7F0 /* BarItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarItem.h; sourceTree = "<group>"; };
 		4684391110445A810019C7F0 /* BarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BarItem.m; sourceTree = "<group>"; };
 		468E57401035DBC100A2293C /* TabBarDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabBarDelegate.h; sourceTree = "<group>"; };
@@ -195,16 +180,25 @@
 		46C25E39103240A400A26428 /* RhoDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoDelegate.h; sourceTree = "<group>"; };
 		46C25E3A103240A400A26428 /* RhoDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoDelegate.m; sourceTree = "<group>"; };
 		5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = tcmalloc.xcodeproj; path = tcmalloc/tcmalloc.xcodeproj; sourceTree = "<group>"; };
+		5C4775F51130832B0092D21E /* ServerHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerHost.h; path = Server/ServerHost.h; sourceTree = "<group>"; };
+		5C4775F61130832B0092D21E /* ServerHost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ServerHost.m; path = Server/ServerHost.m; sourceTree = "<group>"; };
+		5C477602113083F10092D21E /* JSString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSString.h; sourceTree = "<group>"; };
+		5C477603113083F10092D21E /* JSString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSString.m; sourceTree = "<group>"; };
+		5C477606113084290092D21E /* WebViewUrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewUrl.h; path = Server/WebViewUrl.h; sourceTree = "<group>"; };
+		5C477607113084290092D21E /* WebViewUrl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewUrl.m; path = Server/WebViewUrl.m; sourceTree = "<group>"; };
 		5C5333790FC1B20000F268F0 /* NetRequestImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetRequestImpl.m; path = rho/net/NetRequestImpl.m; sourceTree = "<group>"; };
 		5C5335C40FC2F44500F268F0 /* RhoClassFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoClassFactory.cpp; path = rho/common/RhoClassFactory.cpp; sourceTree = "<group>"; };
 		5C5335C50FC2F44500F268F0 /* RhoClassFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoClassFactory.h; path = rho/common/RhoClassFactory.h; sourceTree = "<group>"; };
 		5C7162920F8B7EEC0096B6AA /* RhoLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RhoLib.xcodeproj; path = RhoLib/RhoLib.xcodeproj; sourceTree = "<group>"; };
 		5CE293FF1009D74F009A75F6 /* SystemInfoImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SystemInfoImpl.h; path = rho/common/SystemInfoImpl.h; sourceTree = "<group>"; };
-		BD236A8510B1B6EB00F88F1D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		BD2C94A610AE052A008D4692 /* curl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = curl.xcodeproj; path = curl/curl.xcodeproj; sourceTree = SOURCE_ROOT; };
+		BD5B7448113BE2DB00C6070A /* SplashViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SplashViewController.h; sourceTree = "<group>"; };
+		BD5B7449113BE2DB00C6070A /* SplashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SplashViewController.m; sourceTree = "<group>"; };
+		BD72CCE4112D629F003B7D27 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		BDA401BB11495BBD00C5D4BD /* SplashScreenImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplashScreenImpl.h; path = rho/common/SplashScreenImpl.h; sourceTree = "<group>"; };
+		BDA401BC11495BBD00C5D4BD /* SplashScreenImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SplashScreenImpl.cpp; path = rho/common/SplashScreenImpl.cpp; sourceTree = "<group>"; };
 		BDA4BA9F109A347400467AB9 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		BDE35A79107F900A009941C7 /* RhoFileImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RhoFileImpl.m; sourceTree = "<group>"; };
-		BDFBD99010B1B98900BAAFAB /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
 		BDFBD99510B1B99A00BAAFAB /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = "<group>"; };
 		BDFBD99910B1B9A900BAAFAB /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		BDFBD99E10B1B9B900BAAFAB /* gears.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gears.png; sourceTree = "<group>"; };
@@ -212,6 +206,8 @@
 		BDFBD9A210B1B9E500BAAFAB /* forward_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward_btn.png; sourceTree = "<group>"; };
 		BDFBD9A310B1B9E500BAAFAB /* home_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = home_btn.png; sourceTree = "<group>"; };
 		BDFBD9A610B1BA2000BAAFAB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = SOURCE_ROOT; };
+		BDFCB154112EE53D00AE3724 /* sslimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sslimpl.h; path = rho/net/sslimpl.h; sourceTree = "<group>"; };
+		BDFCB155112EE65900AE3724 /* sslimpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sslimpl.cpp; path = rho/net/sslimpl.cpp; sourceTree = "<group>"; };
 		F5128ADB1069752F002F00E5 /* MapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapAnnotation.h; path = MapView/MapAnnotation.h; sourceTree = "<group>"; };
 		F5128ADC1069752F002F00E5 /* MapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapAnnotation.m; path = MapView/MapAnnotation.m; sourceTree = "<group>"; };
 		F5128C2A106C1FF3002F00E5 /* GoogleGeocoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GoogleGeocoder.h; path = Classes/MapView/GoogleGeocoder.h; sourceTree = SOURCE_ROOT; };
@@ -240,8 +236,6 @@
 		F59F15F90E9449B8004103B4 /* rhorubylib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = rhorubylib.xcodeproj; path = rhorubylib/rhorubylib.xcodeproj; sourceTree = SOURCE_ROOT; };
 		F5B8FAD20F44EA7B00C9AF85 /* PickImageDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PickImageDelegate.h; path = Camera/PickImageDelegate.h; sourceTree = "<group>"; };
 		F5B8FAD30F44EA7B00C9AF85 /* PickImageDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PickImageDelegate.m; path = Camera/PickImageDelegate.m; sourceTree = "<group>"; };
-		F5C1064E0E917D2A0049A94A /* Dispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Dispatcher.h; path = Dispatcher/Dispatcher.h; sourceTree = "<group>"; };
-		F5C1064F0E917D2A0049A94A /* Dispatcher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Dispatcher.c; path = Dispatcher/Dispatcher.c; sourceTree = "<group>"; };
 		F5F0648C102B946F006CFD39 /* rhoextlib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = rhoextlib.xcodeproj; path = rhoextlib/rhoextlib.xcodeproj; sourceTree = SOURCE_ROOT; };
 		F5F06666102CB134006CFD39 /* ParamsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParamsWrapper.h; sourceTree = "<group>"; };
 		F5F06667102CB134006CFD39 /* ParamsWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ParamsWrapper.m; sourceTree = "<group>"; };
@@ -279,26 +273,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		05377CEE0E74D6CB003B8BD1 /* Server */ = {
-			isa = PBXGroup;
-			children = (
-				463577BD107272A400BEC653 /* JSString.h */,
-				463577BE107272A400BEC653 /* JSString.m */,
-				05CF724F0E7B16F800D41986 /* HttpMessage.h */,
-				05CF724E0E7B16F800D41986 /* HttpMessage.c */,
-				05CF70E90E78B14D00D41986 /* ServerHost.h */,
-				05CF70EA0E78B14D00D41986 /* ServerHost.m */,
-				05377CE90E74D6C0003B8BD1 /* HttpContext.h */,
-				05377CE80E74D6C0003B8BD1 /* HttpContext.c */,
-				05377CEB0E74D6C0003B8BD1 /* Server.h */,
-				05377CEA0E74D6C0003B8BD1 /* Server.c */,
-				05CF72930E7F2EAC00D41986 /* defs.h */,
-				468276EE10713FD600ADBCD4 /* WebViewUrl.h */,
-				468276EF10713FD600ADBCD4 /* WebViewUrl.m */,
-			);
-			name = Server;
-			sourceTree = "<group>";
-		};
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
@@ -311,16 +285,19 @@
 				F5B8FAD10F44E95F00C9AF85 /* Camera */,
 				F58E7FD80F008A2300E46829 /* Phonebook */,
 				F563D0310EA5408C0062DA57 /* GeoLocation */,
-				F5C106510E917D4A0049A94A /* Dispatcher */,
 				F579170F0E8AB2A200BBC54D /* AppManager */,
-				05377CEE0E74D6CB003B8BD1 /* Server */,
+				5C4775EC113082290092D21E /* Server */,
+				F56DF8D40E8D81FD00F6CBE8 /* Utils */,
 				05377B3E0E709170003B8BD1 /* WebViewController.h */,
 				05377B3D0E709170003B8BD1 /* WebViewController.m */,
 				1D3623240D0F684500981E51 /* RhoRunnerAppDelegate.h */,
 				1D3623250D0F684500981E51 /* RhoRunnerAppDelegate.m */,
 				46C25E39103240A400A26428 /* RhoDelegate.h */,
 				46C25E3A103240A400A26428 /* RhoDelegate.m */,
-				F56DF8D40E8D81FD00F6CBE8 /* Utils */,
+				5C477602113083F10092D21E /* JSString.h */,
+				5C477603113083F10092D21E /* JSString.m */,
+				BD5B7448113BE2DB00C6070A /* SplashViewController.h */,
+				BD5B7449113BE2DB00C6070A /* SplashViewController.m */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -347,7 +324,7 @@
 				5C1256870F7CEA9200C87274 /* tcmalloc.xcodeproj */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
-				29B97317FDCFA39411CA2CEA /* Resources */,
+				BD72CCE4112D629F003B7D27 /* Info.plist */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				46AD7DB21117AFB9009A974A /* MapKit.framework */,
@@ -365,15 +342,6 @@
 			name = "Other Sources";
 			sourceTree = "<group>";
 		};
-		29B97317FDCFA39411CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				BDFBD99010B1B98900BAAFAB /* MainWindow.xib */,
-				BD236A8510B1B6EB00F88F1D /* Info.plist */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -435,6 +403,17 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		5C4775EC113082290092D21E /* Server */ = {
+			isa = PBXGroup;
+			children = (
+				5C477606113084290092D21E /* WebViewUrl.h */,
+				5C477607113084290092D21E /* WebViewUrl.m */,
+				5C4775F51130832B0092D21E /* ServerHost.h */,
+				5C4775F61130832B0092D21E /* ServerHost.m */,
+			);
+			name = Server;
+			sourceTree = "<group>";
+		};
 		5C5332610FBD6AC700F268F0 /* rho */ = {
 			isa = PBXGroup;
 			children = (
@@ -448,6 +427,8 @@
 			isa = PBXGroup;
 			children = (
 				5C5333790FC1B20000F268F0 /* NetRequestImpl.m */,
+				BDFCB154112EE53D00AE3724 /* sslimpl.h */,
+				BDFCB155112EE65900AE3724 /* sslimpl.cpp */,
 			);
 			name = net;
 			sourceTree = "<group>";
@@ -459,6 +440,8 @@
 				5C5335C40FC2F44500F268F0 /* RhoClassFactory.cpp */,
 				5C5335C50FC2F44500F268F0 /* RhoClassFactory.h */,
 				BDE35A79107F900A009941C7 /* RhoFileImpl.m */,
+				BDA401BB11495BBD00C5D4BD /* SplashScreenImpl.h */,
+				BDA401BC11495BBD00C5D4BD /* SplashScreenImpl.cpp */,
 			);
 			name = common;
 			sourceTree = "<group>";
@@ -569,15 +552,6 @@
 			name = Camera;
 			sourceTree = "<group>";
 		};
-		F5C106510E917D4A0049A94A /* Dispatcher */ = {
-			isa = PBXGroup;
-			children = (
-				F5C1064E0E917D2A0049A94A /* Dispatcher.h */,
-				F5C1064F0E917D2A0049A94A /* Dispatcher.c */,
-			);
-			name = Dispatcher;
-			sourceTree = "<group>";
-		};
 		F5F06492102B946F006CFD39 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -709,7 +683,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BDFBD99110B1B98900BAAFAB /* MainWindow.xib in Resources */,
 				BDFBD99610B1B99A00BAAFAB /* Entitlements.plist in Resources */,
 				BDFBD99A10B1B9A900BAAFAB /* Settings.bundle in Resources */,
 				BDFBD99F10B1B9B900BAAFAB /* gears.png in Resources */,
@@ -786,14 +759,9 @@
 				1D60589B0D05DD56006BFB54 /* main.m in Sources */,
 				1D3623260D0F684500981E51 /* RhoRunnerAppDelegate.m in Sources */,
 				05377B3F0E709170003B8BD1 /* WebViewController.m in Sources */,
-				05377CEC0E74D6C0003B8BD1 /* HttpContext.c in Sources */,
-				05377CED0E74D6C0003B8BD1 /* Server.c in Sources */,
-				05CF70EB0E78B14D00D41986 /* ServerHost.m in Sources */,
-				05CF72500E7B16F800D41986 /* HttpMessage.c in Sources */,
 				F57917150E8ACA9E00BBC54D /* AppManager.m in Sources */,
 				F56DF7280E8C373800F6CBE8 /* AppLoader.m in Sources */,
 				F56DF8D70E8D81FD00F6CBE8 /* unzip.cpp in Sources */,
-				F5C106500E917D2A0049A94A /* Dispatcher.c in Sources */,
 				F563D38F0EA6BC2E0062DA57 /* LocationController.m in Sources */,
 				F58E7FDB0F008A6B00E46829 /* phonebook.m in Sources */,
 				F5B8FAD40F44EA7B00C9AF85 /* PickImageDelegate.m in Sources */,
@@ -811,9 +779,13 @@
 				F5FD0944106151C200B7B8ED /* MapViewController.m in Sources */,
 				F5128ADD1069752F002F00E5 /* MapAnnotation.m in Sources */,
 				F5128C2C106C1FF3002F00E5 /* GoogleGeocoder.m in Sources */,
-				468276F010713FD600ADBCD4 /* WebViewUrl.m in Sources */,
-				463577BF107272A400BEC653 /* JSString.m in Sources */,
 				BDE35A7A107F900A009941C7 /* RhoFileImpl.m in Sources */,
+				BDFCB156112EE65900AE3724 /* sslimpl.cpp in Sources */,
+				5C4775F71130832B0092D21E /* ServerHost.m in Sources */,
+				5C477604113083F10092D21E /* JSString.m in Sources */,
+				5C477608113084290092D21E /* WebViewUrl.m in Sources */,
+				BD5B744B113BE2DB00C6070A /* SplashViewController.m in Sources */,
+				BDA401BD11495BBD00C5D4BD /* SplashScreenImpl.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -868,10 +840,11 @@
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				INFOPLIST_FILE = Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)\"",
-					"\"$(SRCROOT)/build/Debug-iphonesimulator\"",
+					"$(SRCROOT)",
+					"$(SRCROOT)/build/Debug-iphonesimulator",
 				);
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "$(EXTENSIONS_LDFLAGS)";
@@ -880,6 +853,7 @@
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos3.0;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
 			name = Debug;
@@ -896,10 +870,11 @@
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				INFOPLIST_FILE = Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)\"",
-					"\"$(SRCROOT)/build/Debug-iphonesimulator\"",
+					"$(SRCROOT)",
+					"$(SRCROOT)/build/Debug-iphonesimulator",
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
@@ -920,6 +895,7 @@
 				PROVISIONING_PROFILE = "E302C486-8C38-4E23-B945-196D8B2BA5B9";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "E302C486-8C38-4E23-B945-196D8B2BA5B9";
 				SDKROOT = iphoneos2.2.1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
 			name = Release;
@@ -1014,11 +990,12 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = rhorunner_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"\"$(SRCROOT)\"",
-					"\"$(SRCROOT)/build/Debug-iphonesimulator\"",
-					"\"$(SRCROOT)/openssl/build\"",
+					"$(SRCROOT)",
+					"$(SRCROOT)/build/Debug-iphonesimulator",
+					"$(SRCROOT)/openssl/build",
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
@@ -1065,6 +1042,7 @@
 				PROVISIONING_PROFILE = "E302C486-8C38-4E23-B945-196D8B2BA5B9";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "E302C486-8C38-4E23-B945-196D8B2BA5B9";
 				SDKROOT = iphoneos2.2.1;
+				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
 			name = Distribution;