rhodes 5.5.0.7 → 5.5.0.22

data/lib/commonAPI/devicesecurity/ext/platform/iphone/impl/DeviceSecurity.h

@@ -0,0 +1,11 @@
+
+#import "IDeviceSecurity.h"
+#import "DeviceSecurityBase.h"
+
+@interface DeviceSecurity : DeviceSecurityBase<IDeviceSecurity> {
+}
+
+
+
+
+@end

data/lib/commonAPI/devicesecurity/ext/platform/iphone/impl/DeviceSecurity.m

@@ -0,0 +1,12 @@
+
+#import "DeviceSecurity.h"
+
+
+@implementation DeviceSecurity
+
+
+
+
+
+
+@end

data/lib/commonAPI/devicesecurity/ext/platform/iphone/impl/DeviceSecurityFactorySingleton.m

@@ -0,0 +1,16 @@
+
+#import "IDeviceSecurity.h"
+#import "DeviceSecurityFactoryBase.h"
+
+static DeviceSecurityFactoryBase* ourDeviceSecurityFactory = nil;
+
+@implementation DeviceSecurityFactorySingleton
+
++(id<IDeviceSecurityFactory>) getDeviceSecurityFactoryInstance {
+    if (ourDeviceSecurityFactory == nil) {
+        ourDeviceSecurityFactory = [[DeviceSecurityFactoryBase alloc] init];
+    }
+    return ourDeviceSecurityFactory;
+}
+
+@end

data/lib/commonAPI/devicesecurity/ext/platform/iphone/impl/DeviceSecuritySetup.m

@@ -0,0 +1,9 @@
+#import <Foundation/Foundation.h>
+#include "common/app_build_capabilities.h"
+
+extern void Init_DeviceSecurity_API();
+
+void Init_DeviceSecurity_extension()
+{
+    Init_DeviceSecurity_API();
+}

data/lib/commonAPI/devicesecurity/ext/platform/iphone/impl/DeviceSecuritySingleton.h

@@ -0,0 +1,19 @@
+
+#import "IDeviceSecurity.h"
+#import "DeviceSecuritySingletonBase.h"
+
+@interface DeviceSecuritySingleton : DeviceSecuritySingletonBase<IDeviceSecuritySingleton> {
+}
+
+
+
+-(void) isDeviceSecured:(id<IMethodResult>)methodResult;
+-(void) isDeviceJailbroken:(id<IMethodResult>)methodResult;
+-(void) isDeviceRooted:(id<IMethodResult>)methodResult;
+-(void) isRunOnSimulator:(id<IMethodResult>)methodResult;
+-(void) isDebugMode:(id<IMethodResult>)methodResult;
+
+
+
+
+@end

data/lib/commonAPI/devicesecurity/ext/platform/iphone/impl/DeviceSecuritySingleton.m

@@ -0,0 +1,106 @@
+
+#import "DeviceSecuritySingleton.h"
+#import <UIKit/UIKit.h>
+
+@implementation DeviceSecuritySingleton
+
+-(BOOL) isJailbroken
+{
+#if !(TARGET_IPHONE_SIMULATOR)
+    
+    if ([[NSFileManager defaultManager] fileExistsAtPath:@"/Applications/Cydia.app"] ||
+        [[NSFileManager defaultManager] fileExistsAtPath:@"/Library/MobileSubstrate/MobileSubstrate.dylib"] ||
+        [[NSFileManager defaultManager] fileExistsAtPath:@"/bin/bash"] ||
+        [[NSFileManager defaultManager] fileExistsAtPath:@"/usr/sbin/sshd"] ||
+        [[NSFileManager defaultManager] fileExistsAtPath:@"/etc/apt"] ||
+        [[NSFileManager defaultManager] fileExistsAtPath:@"/private/var/lib/apt/"] ||
+        [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"cydia://package/com.example.package"]])
+    {
+        return YES;
+    }
+    
+    FILE *f = NULL ;
+    if ((f = fopen("/bin/bash", "r")) ||
+        (f = fopen("/Applications/Cydia.app", "r")) ||
+        (f = fopen("/Library/MobileSubstrate/MobileSubstrate.dylib", "r")) ||
+        (f = fopen("/usr/sbin/sshd", "r")) ||
+        (f = fopen("/etc/apt", "r")))
+    {
+        fclose(f);
+        return YES;
+    }
+    fclose(f);
+    
+    NSError *error;
+    NSString *stringToBeWritten = @"This is a test.";
+    [stringToBeWritten writeToFile:@"/private/jailbreak.txt" atomically:YES encoding:NSUTF8StringEncoding error:&error];
+    [[NSFileManager defaultManager] removeItemAtPath:@"/private/jailbreak.txt" error:nil];
+    if(error == nil)
+    {
+        return YES;
+    }
+    
+#endif
+    
+    return NO;
+}
+
+-(BOOL) isSimulator {
+#if !(TARGET_IPHONE_SIMULATOR)
+    return NO;
+#else
+    return YES;
+#endif
+}
+
+-(void) isDeviceSecured:(id<IMethodResult>)methodResult {
+    [methodResult setResult:[NSNumber numberWithBool:!([self isJailbroken] || [self isSimulator])]];
+}
+
+-(void) isDeviceJailbroken:(id<IMethodResult>)methodResult {
+    [methodResult setResult:[NSNumber numberWithBool:[self isJailbroken]]];
+}
+
+-(void) isDeviceRooted:(id<IMethodResult>)methodResult {
+    [methodResult setResult:[NSNumber numberWithBool:NO]];
+}
+
+-(void) isRunOnSimulator:(id<IMethodResult>)methodResult {
+    [methodResult setResult:[NSNumber numberWithBool:[self isSimulator]]];
+}
+
+-(void) isDebugMode:(id<IMethodResult>)methodResult {
+    [methodResult setResult:[NSNumber numberWithBool:NO]];
+}
+
+-(void) getAppCertificateSignatures:(id<IMethodResult>)methodResult {
+    NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:1];
+    [methodResult setResult:arr];
+}
+
+-(void) getAllowedCertificateSignatures:(id<IMethodResult>)methodResult {
+    NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:1];
+    [methodResult setResult:arr];
+}
+
+-(void) getInstallerPackageName:(id<IMethodResult>)methodResult {
+    NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:1];
+    [methodResult setResult:@""];
+}
+
+-(void) getAllowedInstallerPackages:(id<IMethodResult>)methodResult {
+    NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:1];
+    [methodResult setResult:arr];
+}
+
+-(void) haveAnySignatureIssues:(id<IMethodResult>)methodResult {
+    [methodResult setResult:[NSNumber numberWithBool:NO]];
+}
+
+
+-(void) haveAnyInstallerIssues:(id<IMethodResult>)methodResult {
+    [methodResult setResult:[NSNumber numberWithBool:NO]];
+}
+
+
+@end

data/lib/commonAPI/devicesecurity/ext/platform/iphone/impl/readme.txt

@@ -0,0 +1,7 @@
+contains files with module API Implementation.
+
+Developer should create it - after first generation this folder is empty and this folder do not changed with next generation processes !!!.
+
+Developer should make at least <ModuleName>FactorySingleton.m with acees to <ModuleName>Factory interface!
+All other files include base_impl can be removed from project if it wants by developer.
+Default stub generated code placed in stub_impl folder - you can just copy all files from /generated/stub_impl to this folder and implement unemplemented methods.

data/platform/android/Rhodes/src/com/rhomobile/rhodes/LocalFileProvider.java

@@ -137,7 +137,7 @@ public class LocalFileProvider extends ContentProvider
     }
     
    @Override
-    public AssetFileDescriptor openAssetFile(Uri uri, String mode) {
+    public AssetFileDescriptor openAssetFile(Uri uri, String mode) throws FileNotFoundException {
         Logger.T(TAG, "Opening asset: " + uri);
         
         if(mode.compareTo("r") != 0)
@@ -148,6 +148,10 @@ public class LocalFileProvider extends ContentProvider
         File path = fileFromUri(uri);
         
         AssetFileDescriptor fd = RhoFileApi.openAssetFd(path.getPath());
+
+        if ( null == fd ) {
+            return super.openAssetFile( uri, mode );
+        }
         
         return fd;
     }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/Utils.java

@@ -33,6 +33,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.StringWriter;
+import java.io.PrintWriter;
 
 import android.content.res.AssetManager;
 
@@ -221,5 +223,12 @@ public class Utils {
 		s.append(message);
 		android.util.Log.v(tag, s.toString());
 	}
+
+	public static String getExceptionDetails( Exception e ) {
+		StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        e.printStackTrace(pw);
+        return (e.toString() + "\n" + sw.toString());
+	}
 	
 }

data/platform/android/build/android.rake

@@ -256,6 +256,30 @@ def find_file(file_name, path_array)
   result
 end
 
+def setup_ext_env( extpath, extname )
+  env = {}
+  env['RHO_PLATFORM'] = 'android'
+  env["RHO_APP_DIR"] = $app_path
+  env["ANDROID_SDK"] = $androidsdkpath
+  env["ANDROID_NDK"] = $androidndkpath
+  env["ANDROID_API_LEVEL"] = $found_api_level.to_s
+  env["RHO_ROOT"] = $startdir
+  env["BUILD_DIR"] ||= $startdir + "/platform/android/build"
+  env["RHO_INC"] = $appincdir
+  env["RHO_RES"] = $appres
+  env["RHO_ANDROID_TMP_DIR"] = $tmpdir
+  env["RHO_DEBUG"] = $debug.to_s
+  env['SOURCEPATH'] = extpath
+  sourcelist = Dir.glob(File.join(extpath,'**','android','ext_native.files'))
+  env['SOURCELIST'] = sourcelist.size == 1 ? sourcelist.first : File.join(extpath,'ext_native.files')
+  env["TARGET_TEMP_DIR"] = File.join($app_builddir, 'extensions', extname)
+  env['TARGETPATH'] = File.join($app_builddir, 'extensions', extname)
+  env['TARGETLIB'] = "lib#{extname}.a"
+  env['TEMP_FILES_DIR'] = File.join($tmpdir, extname)
+
+  env
+end
+
 namespace "config" do
   task :set_android_platform do
     $current_platform = "android"
@@ -709,6 +733,8 @@ namespace "config" do
               manifest_changes = extconf["android_manifest_changes"]
               manifest_changes = extconf_android['manifest_changes'] if manifest_changes.nil? and extconf_android
 
+              prebuild_rake_task = extconf_android['prebuild_rake_task'] if extconf_android
+
               if manifest_changes
                 manifest_changes = [manifest_changes] unless manifest_changes.is_a? Array
                 manifest_changes.map! { |path| File.join(extpath,path) }
@@ -855,6 +881,13 @@ namespace "config" do
                 rakepath = extpath
               end
               $ext_android_build_scripts[ext] = [rakepath, 'rake']
+
+              if prebuild_rake_task                
+                args = [ prebuild_rake_task ]
+                args << '--trace' if USE_TRACES
+                cc_run( 'rake', args, rakepath, true, setup_ext_env( extpath, ext ) ) or raise "Extension prebuild failed: #{extpath}"
+              end
+
             elsif exttype != 'prebuilt'
               build_script = File.join(extpath,'ext','build'+$bat_ext)
               if File.exists? build_script
@@ -2245,11 +2278,19 @@ namespace "package" do
     end
 
     # Workaround: manually add files starting with '_' because aapt silently ignore such files when creating package
+    args = [ USE_TRACES ? "uvf" : "uf", resourcepkg]
+
+    skip_underscores = true
+    
     Dir.glob(File.join($appassets, "**/*")).each do |f|
       next unless File.basename(f) =~ /^_/
       relpath = Pathname.new(f).relative_path_from(Pathname.new($tmpdir)).to_s
       puts "Add #{relpath} to #{resourcepkg}..."
-      args = ["uf", resourcepkg, relpath]
+      args << relpath
+      skip_underscores = false
+    end
+
+    unless skip_underscores
       Jake.run($jarbin, args, $tmpdir)
       unless $?.success?
         raise "Error packaging assets"

data/platform/android/build/androidcommon.rb

@@ -313,7 +313,7 @@ def cc_deps(filename, objdir, additional)
   out.split(/\s+/)
 end
 
-def cc_run(command, args, chdir = nil, coloring = true)
+def cc_run(command, args, chdir = nil, coloring = true, env = nil)
   save_cwd = FileUtils.pwd
   FileUtils.cd chdir unless chdir.nil?
   argv = [command]
@@ -325,6 +325,8 @@ def cc_run(command, args, chdir = nil, coloring = true)
     winName = `WMIC OS get Name`
     isWinXP = true if winName =~ /Windows XP/
   end
+
+  env = ENV unless env
   
   if isWinXP
     puts '-' * 80
@@ -332,7 +334,7 @@ def cc_run(command, args, chdir = nil, coloring = true)
   else
     out = StringIO.new
     ret = nil
-    Open3.popen2e(cmdstr) do |i,f,t|
+    Open3.popen2e(env, cmdstr) do |i,f,t|
       warning = false
       error = false
       while data = f.gets

data/platform/iphone/Classes/RhoWKWebView.m

@@ -176,6 +176,10 @@
 }
 
 - (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation {
+    // force Ajax CommonAPI calls
+    NSString* jscode = @"window['__rho_nativeBridgeType']='ajax'";
+    [self stringByEvaluatingJavaScriptFromString:jscode];
+    
     [delegate webViewDidFinishLoad:self];
 }
 

data/platform/iphone/Classes/URLProtocol/CRhoURLProtocol.h

@@ -15,4 +15,6 @@
 @property (retain) NSMutableDictionary* httpHeaders;
 @property (retain) NSData* httpBody;
 
+@property (nonatomic) BOOL isStopped;
+
 @end

data/platform/iphone/Classes/URLProtocol/CRhoURLProtocol.m

@@ -6,6 +6,25 @@
 
 #import "common/RhoConf.h"
 
+
+#import "logging/RhoLog.h"
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoURLProtocol"
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
 extern int rho_http_started();
 extern int rho_http_get_port();
 
@@ -28,6 +47,7 @@ int on_http_data_cb(http_parser* parser, const char *at, size_t length) { return
 int on_http_cb(http_parser* parser) { return 0; }
 
 
+
 @interface CRhoURLResponse : NSHTTPURLResponse {
     
 }
@@ -39,6 +59,16 @@ int on_http_cb(http_parser* parser) { return 0; }
 
 @implementation CRhoURLProtocol
 
+
+-(const char*)selfIDstring {
+    return [[NSString stringWithFormat:@"<%p>", self] UTF8String];
+}
+
++ (const char*)requestInfo:(NSURLRequest*)req {
+    return [[NSString stringWithFormat:@"<NSURLRequest:<%p>, URL:[ %@ ], Headers:[ %@ ]", req, req.URL, req.allHTTPHeaderFields] UTF8String];
+}
+
+
 - (void)dealloc
 {
   [httpBody release];
@@ -59,17 +89,27 @@ int on_http_cb(http_parser* parser) { return 0; }
  
 + (BOOL)canInitWithRequest:(NSURLRequest*)theRequest
 {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ canInitWithRequest BEGIN: { %s }", [CRhoURLProtocol requestInfo:theRequest]);
+    }
+    
     NSURL* theUrl = [theRequest URL];
     if ([[theUrl path] isEqualToString:@"/!__rhoNativeApi"]) {
         
         NSString* jsonRequestTest = [theRequest valueForHTTPHeaderField:@"__rhoNativeApiCall"];
         if (jsonRequestTest != nil) {
             //NSLog(@"$$$ process Request: [%@:%@]", [theUrl absoluteString], jsonRequestTest);
+            if (is_net_trace()) {
+                RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return YES by !__rhoNativeApi prefix");
+            }
             return YES;
         }
     }
 #if defined(RHO_NO_RUBY_API) && defined(RHO_NO_HTTP_SERVER)
     if ([theRequest.URL.scheme isEqualToString:@"file"]) {
+        if (is_net_trace()) {
+            RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return YES by file scheme when no Ruby API server");
+        }
         return YES;
     }
 #endif
@@ -79,10 +119,21 @@ int on_http_cb(http_parser* parser) { return 0; }
         canHandle = rho_conf_getBool("ios_direct_local_requests")!=0;
     }
   
-    if ( canHandle && [CRhoURLProtocol isLocalURL:theUrl] ) {
-      return YES;
+    if ( canHandle ) {
+        if (is_net_trace()) {
+            RAWTRACE("$NetRequestProcess$ canInitWithRequest: ios_direct_local_requests = true !");
+        }
+        if ([CRhoURLProtocol isLocalURL:theUrl]) {
+            if (is_net_trace()) {
+                RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return YES URL is local !");
+            }
+            return YES;
+        }
     }
 
+    if (is_net_trace()) {
+        RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return NO");
+    }
     return NO;
 }
 
@@ -91,19 +142,27 @@ int on_http_cb(http_parser* parser) { return 0; }
     return request;
 }
 
-- (void)startLoading
+- (void)startLoadingInThread
 {
+    if (is_net_trace()) {
+        RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoadingInThread BEGIN: { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:[self request]]);
+    }
     NSURL* theUrl = [[self request] URL];
     
     
     if ([[theUrl path] isEqualToString:@"/!__rhoNativeApi"]) {
-        
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading URL has !__rhoNativeApi", [self selfIDstring]);
+        }
         NSString* jsonRequestTest = [[self request] valueForHTTPHeaderField:@"__rhoNativeApiCall"];
         if (jsonRequestTest != nil) {
             NSString* responseStr = [CJSEntryPoint js_entry_point:jsonRequestTest];
             if (responseStr != nil) {
                 //NSLog(@"$$$ send responce for[%@:%@] = [%@]", [theUrl absoluteString], jsonRequestTest, responseStr);
                 [self sendResponseWithResponseCode:200 data:[responseStr dataUsingEncoding:NSUTF8StringEncoding]];
+                if (is_net_trace()) {
+                    RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading END", [self selfIDstring]);
+                }
                 return;
             }
         }
@@ -133,12 +192,13 @@ int on_http_cb(http_parser* parser) { return 0; }
                                 textEncodingName:@"UTF-8"];
             response.statusCode = 200;
             
-            [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
-            if (data != nil) {
-                [[self client] URLProtocol:self didLoadData:data];
+            if (!self.isStopped) {
+                [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+                if (data != nil) {
+                    [[self client] URLProtocol:self didLoadData:data];
+                }
+                [[self client] URLProtocolDidFinishLoading:self];
             }
-            [[self client] URLProtocolDidFinishLoading:self];
-            
             
             return;
         }
@@ -147,6 +207,9 @@ int on_http_cb(http_parser* parser) { return 0; }
 
   if ( [CRhoURLProtocol isLocalURL:theUrl] )
   {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: URL is local !", [self selfIDstring]);
+    }
     NSURL* url = theUrl;
     CRhoURLResponse* resp = nil;
     
@@ -154,7 +217,14 @@ int on_http_cb(http_parser* parser) { return 0; }
     
     if ( resp != nil )
     {
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading has Responce from local server", [self selfIDstring]);
+      }
       if ( ((self.httpStatusCode==301)||(self.httpStatusCode==302)) && ( [self.httpHeaders objectForKey:@"location"] != nil ) ) {
+          
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading we have REDIRECT from local server !", [self selfIDstring]);
+        }
         NSString* loc = [self.httpHeaders objectForKey:@"location"];
         
         NSString* escaped = [loc stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
@@ -172,18 +242,25 @@ int on_http_cb(http_parser* parser) { return 0; }
             if (rho_conf_is_property_exists("ios_https_local_server")!=0) {
                 force_https = rho_conf_getBool("ios_https_local_server")!=0;
             }
+              
+            NSString* spath = [url path];
+            spath = [spath stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+
+              
             if (force_https) {
-                 s = [NSMutableString stringWithFormat:@"https://127.0.0.1:%d%@",rho_http_get_port(),[url path]];
+                 s = [NSMutableString stringWithFormat:@"https://127.0.0.1:%d%@",rho_http_get_port(),spath];
             }
             else {
-                s = [NSMutableString stringWithFormat:@"http://127.0.0.1:%d%@",rho_http_get_port(),[url path]];
+                s = [NSMutableString stringWithFormat:@"http://127.0.0.1:%d%@",rho_http_get_port(),spath];
             }
   
               
-            if ( [url query] != nil )
+            NSString* squery = [url query];
+            if ( squery != nil )
             {
-              // decode query back to original state
-              [s appendFormat:@"?%@", [[url query] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+                // decode query back to original state
+                squery = [squery stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                [s appendFormat:@"?%@", squery];
             }
             
             if ( [url fragment] != nil )
@@ -195,34 +272,89 @@ int on_http_cb(http_parser* parser) { return 0; }
           }
         
         
-          NSURLRequest* redirReq = [NSURLRequest requestWithURL:url];
-          [[self client] URLProtocol:self wasRedirectedToRequest:redirReq redirectResponse:resp];
+          NSMutableURLRequest* redirReq = [NSMutableURLRequest requestWithURL:url];
+
+          // clone headers from original request to redirect request
+          NSDictionary* headers = [[self request] allHTTPHeaderFields];
+          for (NSString* key in headers) {
+              NSString* value = [headers objectForKey:key];
+              [redirReq setValue:value forHTTPHeaderField:key];
+          }
+            
+          if (is_net_trace()) {
+              RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading wasRedirectedToRequest with Request { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:redirReq]);
+          }
+            if (!self.isStopped) {
+  
+                [[self client] URLProtocol:self wasRedirectedToRequest:redirReq redirectResponse:resp];
+            }
+            if (is_net_trace()) {
+              RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading END", [self selfIDstring]);
+          }
           return;
         }
+        else {
+            RAWLOG_ERROR2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading Redirect response has no URL ! Initial request: { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:[self request]]);
+        }
       }
       else
       {
-        [[self client] URLProtocol:self didReceiveResponse:resp cacheStoragePolicy:NSURLCacheStorageNotAllowed];
-        
-        if (self.httpBody != nil) {
-          [[self client] URLProtocol:self didLoadData:self.httpBody];
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading just request - no redirection", [self selfIDstring]);
+        }
+          if (!self.isStopped) {
+  
+              [[self client] URLProtocol:self didReceiveResponse:resp cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+          }
+          if (self.httpBody != nil) {
+              if (!self.isStopped) {
+                  [[self client] URLProtocol:self didLoadData:self.httpBody];
+              }
+          }
+          if (!self.isStopped) {
+              [[self client] URLProtocolDidFinishLoading:self];
+          }
+
+        if (is_net_trace()) {
+            RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading END", [self selfIDstring]);
         }
-        
-        [[self client] URLProtocolDidFinishLoading:self];
         return;
       }
     }
+    else {
+        RAWLOG_ERROR2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading has NO Responce from local server !!! Initial request: { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:[self request]]);
+    }
   }
   
     //NSLog(@"$$$ responce ERROR: [%@]", [theUrl absoluteString]);
     NSString* body = @"error";
     [self sendResponseWithResponseCode:401 data:[body dataUsingEncoding:NSUTF8StringEncoding]];
- 
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoadingInThread END", [self selfIDstring]);
+    }
 }
 
+- (void)startLoading
+{
+    self.isStopped = NO;
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading()", [self selfIDstring]);
+    }
+    
+    dispatch_async( dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0 ), ^{
+        [self startLoadingInThread];
+    });
+ }
+
+
 - (CRhoURLResponse*) makeDirectHttpRequest:(NSURL*)theUrl
 {
-  //NSLog(@"Will make local request to %@", [theUrl absoluteString]);
+
+    if (is_net_trace()) {
+        RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: makeDirectHttpRequest : URL [ %s ]", [self selfIDstring], [[theUrl absoluteString] UTF8String]);
+    }
+    
+    //NSLog(@"Will make local request to %@", [theUrl absoluteString]);
   
   const char* uri = [[theUrl path] UTF8String];
   const char* method = [[[self request] HTTPMethod] UTF8String];
@@ -295,6 +427,10 @@ int on_http_cb(http_parser* parser) { return 0; }
 
 - (void)stopLoading
 {
+    self.isStopped = YES;
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ CRhoURLProtocol %s :: stopLoading()", [self selfIDstring]);
+    }
 
 }
 
@@ -305,7 +441,13 @@ int on_http_cb(http_parser* parser) { return 0; }
 
 - (void)sendResponseWithResponseCode:(NSInteger)statusCode data:(NSData*)data
 {
+    if (is_net_trace()) {
+        RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: sendResponseWithResponseCode : code: [ %d ] ", [self selfIDstring], (int)statusCode);
+    }
 
+    if (self.isStopped) {
+        return;
+    }
     CRhoURLResponse* response =
     [[CRhoURLResponse alloc] initWithURL:[[self request] URL]
                                    MIMEType:@"text/plain"
@@ -313,25 +455,39 @@ int on_http_cb(http_parser* parser) { return 0; }
                            textEncodingName:@"UTF-8"];
     response.statusCode = statusCode;
     
-    [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+    if (!self.isStopped) {
+        [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+    }
     if (data != nil) {
-        [[self client] URLProtocol:self didLoadData:data];
+        if (!self.isStopped) {
+            [[self client] URLProtocol:self didLoadData:data];
+        }
+    }
+    if (!self.isStopped) {
+        [[self client] URLProtocolDidFinishLoading:self];
     }
-    [[self client] URLProtocolDidFinishLoading:self];
-
     [response release];
 }
 
 + (BOOL) isLocalURL:(NSURL*)url
 {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ isLocalURL BEGIN : URL: [ %s ] ", [[url absoluteString] UTF8String]);
+    }
     if ( [[url absoluteString] isEqualToString:@""] )
     {
+      if (is_net_trace()) {
+          RAWTRACE("isLocalURL END : return NO");
+      }
       return NO;
     }
 
     const char* scheme = [[url scheme] UTF8String];
     if (scheme != 0) {
         if ((strcmp(scheme, "http") !=0 ) && (strcmp(scheme, "https") !=0 )) {
+            if (is_net_trace()) {
+                RAWTRACE("$NetRequestProcess$ isLocalURL END : return NO");
+            }
             return NO;
         }
     }
@@ -340,7 +496,10 @@ int on_http_cb(http_parser* parser) { return 0; }
   
     if ( 0 == host )
     {
-      return YES;
+      if (is_net_trace()) {
+          RAWTRACE("$NetRequestProcess$ isLocalURL END : return YES");
+      }
+        return YES;
     }
   
     NSNumber* p = [url port];
@@ -348,10 +507,15 @@ int on_http_cb(http_parser* parser) { return 0; }
   
     int rhoPort = rho_http_get_port();
 
-    return (
+    BOOL ret = (
       ((port == rhoPort))
       && ( (strcmp(host,"127.0.0.1")==0) || (strcmp(host,"localhost")==0)  )
     );
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ isLocalURL END : return [%s]", [[[NSNumber numberWithBool:ret] stringValue] UTF8String]);
+    }
+    
+    return ret;
 }
 
 
@@ -359,6 +523,7 @@ int on_http_cb(http_parser* parser) { return 0; }
 @synthesize httpHeaderName;
 @synthesize httpHeaders;
 @synthesize httpBody;
+@synthesize isStopped;
 
 
 @end