rhodes 5.5.0.22 → 5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59d660eec4516c51b9d05121cf3ec2a002447c8
-  data.tar.gz: 3dff6eb9aaf1b99bdbc1e73a7391b7505952e4e6
+  metadata.gz: ca79afe2871dc844140855c5c576cde2e543561f
+  data.tar.gz: 205d5827bdf76a53bacd15aecbbe94ef1eafe2fd
 SHA512:
-  metadata.gz: 6e9dfe2d490773cb366588e3b30c65d4a3781918b50b70fc34b36e9e8d60a1adedb4d38f5303ef68430ae0f21b86641f793787ede5df479441622b3afc436e6b
-  data.tar.gz: 3b2b2095210b17c711bb34a6d0de3136b42669fea381dc11d24cf8e34d33441ae098d51bca8c829dee53ee9b87352c92dbe7dc52bb768819747c54c687e84b3e
+  metadata.gz: 6bbd7b25acd92e68ed940b77f4687fe92ce3044d65380183f9595e68b5ca1a82c20db7866ec2ea8334fc2c5d7ee5780196972cd1368a24a0365489b1ad10672e
+  data.tar.gz: 9368726e9ccadcc979254160487ee1a36e3d39413be60c3de7691cf6ac0dcb05e07764e48da2faa52deba9664bb76f8416db09cc970707f85efc3ba18c22836e

data/CONTRIBUTING.md

@@ -4,7 +4,7 @@ Found an issue with Rhodes, give feedback or provide a patch?  Here's how!
 
 ## Reporting issues
 
-We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within Rhodes. For application-specific or API-related questions, please visit our [Forums](http://forums.tau-technologies.com). Please read the following guidelines before opening any issue.
+We only accept issues that are bug reports or feature requests. Bugs must be isolated and reproducible problems that we can fix within Rhodes. For application-specific or API-related questions, please visit our [Launchpad Disscussion Area](https://developer.zebra.com/community/rhomobile-suite/discussions/rhomobile-discussions). Please read the following guidelines before opening any issue.
 
 1. **Search for existing issues.** We sometimes get duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
 2. **Create an isolated and reproducible test case.** Be sure the problem exists in Rhodes' code.

data/CREDITS

@@ -1,4 +1,4 @@
-This media, software or hardware ("Product") obtained from Tau Technologies, Inc. ("Tau") may include Tau? 
+This media, software or hardware ("Product") obtained from Tau, Inc. ("Tau") may include Tau? 
 Software, Third Party Software (defined below), and/or Open Source Software 
 (defined below).
 
@@ -9,9 +9,9 @@ more agreements in force between the purchaser of the Tau
 Product or licensee of the Tau Software and Tau.  SOFTWARE IS PROTECTED BY U.S. COPYRIGHT LAWS AND INTERNATIONAL 
 LAWS AND TREATIES. UNAUTHORIZED COPYING, DISTRIBUTION OR OTHER USE OF
 THIS PRODUCT IS STRICTLY PROHIBITED. ANY DISTRIBUTION OR USE NOT 
-SPECIFICALLY APPROVED BY TAU IS STRICTLY PROHIBITED.
+SPECIFICALLY APPROVED BY ZEBRA IS STRICTLY PROHIBITED.
 
-Tau Software is subject to the commercial terms and 
+Tau? Software is subject to the commercial terms and 
 conditions entered into with Tau, any other use is strictly 
 prohibited.  Commercial Software licensed for redistribution by Tau ("Third Party Software") is subject to the terms and conditions 
 in force between Tau and the licensor of the Third party 

data/Rakefile

@@ -74,7 +74,6 @@ end
 #------------------------------------------------------------------------
 
 $app_basedir = pwd
-$is_webkit_engine = false
 $startdir = File.dirname(__FILE__)
 $startdir.gsub!('\\', '/')
 
@@ -2487,10 +2486,6 @@ def init_extensions(dest, mode = "")
 
   $app_config["extensions"].each do |extname|
     puts 'ext - ' + extname
-    
-    if extname == "webkit"
-		$is_webkit_engine = true
-    end
 
     extpath = nil
     extpaths.each do |p|
@@ -2675,23 +2670,6 @@ def init_extensions(dest, mode = "")
 
   end
 
-  stubs = File.join($startdir, "platform", "wm", "rhodes", "browser", "stubs.cpp")
-  if $is_webkit_engine == false
-	File.open(stubs, "w+") do |f|
-        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
-        f.puts "#include \"StdAfx.h\""
-        f.puts "#include \"common/RhoStd.h\""
-        f.puts "#include \"IBrowserEngine.h\""
-        f.puts "rho::IBrowserEngine* rho_wmimpl_get_webkitBrowserEngine(HWND hwndParent, HINSTANCE rhoAppInstance) {return 0;}"
-        Jake.modify_file_if_content_changed( stubs, f )
-    end
-  else
-	File.open(stubs, "w+") do |f|
-        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
-        f.puts "#include \"StdAfx.h\""
-        Jake.modify_file_if_content_changed( stubs, f )
-    end
-  end
 
   if ($ruby_only_extensions_list)
     BuildOutput.warning([

data/extensions/rhoconnect-push/ext/rhoconnect-push/platform/android/Rakefile

@@ -21,7 +21,7 @@ ARGS = [
     "-I\"#{$rootdir}/platform/android/Rhodes/jni/include\"",
     "-I\"#{$rootdir}/platform/android/Rhodes/jni/include/rhodes/details\"",
     "-I\"#{$rootdir}/platform/shared/ruby/include\"",
-    "-I\"#{$rootdir}/lib/commonAPI/coreapi/ext/shared\"",
+    "-I\"#{$rootdir}/lib/commonApi/coreapi/ext/shared\"",
     "-I\"#{$rootdir}/platform/shared\"",
     "-I\"#{$rootdir}/platform/shared/common\"",
     "-I\"#{$rootdir}/platform/shared/api_generator\"",

data/lib/build/jake.rb

@@ -876,11 +876,6 @@ class Jake
     app_version += "\r\napp_name='#{$app_config["name"]}'"
     app_version += "\r\ntitle_text='#{$app_config["name"]}'"  if $current_platform == "win32"
     app_version += "\r\norg_name='#{$app_config["vendor"]}'"  if $current_platform == "win32"
-    app_version += "\r\nrho_app_id='#{$app_config["rho_app_id"]}'" if $app_config['rho_app_id']
-
-    if $is_webkit_engine == true
-		File.open(File.join($srcdir,'apps/rhoconfig.txt'), "a"){ |f| f.write("\r\nwebengine=webkit") }
-	end
 
     File.open(File.join($srcdir,'apps/rhoconfig.txt'), "a"){ |f| f.write(app_version) }
     File.open(File.join($srcdir,'apps/rhoconfig.txt.timestamp'), "w"){ |f| f.write(Time.now.to_f().to_s()) }

data/lib/commonAPI/coreapi/ext/shared/TimerImpl.cpp

@@ -11,41 +11,35 @@
 
 extern "C" void rho_ios_log_console_output(const char* message);
 
-
-
-#undef DEFAULT_LOGCATEGORY
-#define DEFAULT_LOGCATEGORY "TimerImpl"
-
-
-namespace rho
-{
+namespace rho 
+{    
 	class CTimerFactory;
 
     using namespace apiGenerator;
     using namespace common;
-
+    
     class CTimerSingletonImpl: public CTimerSingletonBase
     {
 		static unsigned int createdTimers;
 
     public:
-
+        
         CTimerSingletonImpl(): CTimerSingletonBase(){}
-
+        
         //methods
-        // create Create a timers objects.
-        virtual void create(rho::apiGenerator::CMethodResult& oResult)
+        // create Create a timers objects. 
+        virtual void create(rho::apiGenerator::CMethodResult& oResult) 
 		{
 			++createdTimers;
 
 			char buf[10];
             sprintf(buf, "%d", createdTimers);
 			oResult.set(buf);
-        }
-        // enumerate This is documentation
-        virtual void enumerate(rho::apiGenerator::CMethodResult& oResult) { }
+        } 
+        // enumerate This is documentation 
+        virtual void enumerate(rho::apiGenerator::CMethodResult& oResult) { } 
     };
-
+    
 	unsigned int  CTimerSingletonImpl::createdTimers = 0;
 
     class CTimerImpl : public CTimerBase, public common::CRhoTimer::ICallback
@@ -61,7 +55,7 @@ namespace rho
 
 			virtual void run()
 			{
-
+				
 				while ( !RHODESAPP().isApplicationActive() ) {
 					wait(10);
 				}
@@ -77,40 +71,37 @@ namespace rho
 
     public:
 		CTimerImpl(const rho::String& timerID) : m_timerID(timerID), m_answerThread(0) {}
-		virtual ~CTimerImpl()
+		virtual ~CTimerImpl() 
 		{
 			if (!m_answerThread)
 				delete m_answerThread;
 		}
 
         //methods
-        virtual void start( int interval, rho::apiGenerator::CMethodResult& oResult)
+        virtual void start( int interval, rho::apiGenerator::CMethodResult& oResult) 
 		{
 			if (interval <= 0)
 			{
-                LOG(ERROR) + "$NetRequestProcess$ PRE SET ERROR CTimerImpl::start";
 				oResult.setError("invalid interval");
-                LOG(ERROR) + "$NetRequestProcess$ POST SET ERROR CTimerImpl::start";
-
-                return;
+				return;
 			}
 
 			m_oResult = oResult;
 			common::CRhoTimer& timerManager = RHODESAPP().getTimer();
 			timerManager.addNativeTimer(interval, this);
-        }
+        } 
 
         virtual void stop(rho::apiGenerator::CMethodResult& oResult)
 		{
 			common::CRhoTimer& timerManager = RHODESAPP().getTimer();
 			timerManager.stopNativeTimer(this);
-        }
+        } 
 
-        virtual void isAlive(rho::apiGenerator::CMethodResult& oResult)
+        virtual void isAlive(rho::apiGenerator::CMethodResult& oResult) 
 		{
 			common::CRhoTimer& timerManager = RHODESAPP().getTimer();
 			oResult.set(timerManager.isNativeTimerExist(this));
-        }
+        } 
 
 		virtual bool onTimer()
 		{
@@ -123,20 +114,20 @@ namespace rho
 			return true;
 		}
     };
-
+    
     ////////////////////////////////////////////////////////////////////////
-
-    class CTimerFactory: public CTimerFactoryBase
+    
+    class CTimerFactory: public CTimerFactoryBase    
 	{
     public:
         CTimerFactory(){}
-
+        
         ITimerSingleton* createModuleSingleton()
-        {
+        { 
             return new CTimerSingletonImpl();
         }
-
-        virtual ITimer* createModuleByID(const rho::String& strID){
+        
+        virtual ITimer* createModuleByID(const rho::String& strID){ 
 			return new CTimerImpl(strID);
 		};
 
@@ -145,7 +136,7 @@ namespace rho
 			return m_hashModules.size();
 		}
     };
-
+    
 }
 
 extern "C" void Init_Timer_extension()

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

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

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

@@ -6,25 +6,6 @@
 
 #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();
 
@@ -47,7 +28,6 @@ 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 {
     
 }
@@ -59,16 +39,6 @@ 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];
@@ -89,27 +59,17 @@ 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
@@ -119,21 +79,10 @@ int on_http_cb(http_parser* parser) { return 0; }
         canHandle = rho_conf_getBool("ios_direct_local_requests")!=0;
     }
   
-    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 ( canHandle && [CRhoURLProtocol isLocalURL:theUrl] ) {
+      return YES;
     }
 
-    if (is_net_trace()) {
-        RAWTRACE("$NetRequestProcess$ canInitWithRequest END: return NO");
-    }
     return NO;
 }
 
@@ -142,27 +91,19 @@ int on_http_cb(http_parser* parser) { return 0; }
     return request;
 }
 
-- (void)startLoadingInThread
+- (void)startLoading
 {
-    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;
             }
         }
@@ -192,13 +133,12 @@ int on_http_cb(http_parser* parser) { return 0; }
                                 textEncodingName:@"UTF-8"];
             response.statusCode = 200;
             
-            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] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+            if (data != nil) {
+                [[self client] URLProtocol:self didLoadData:data];
             }
+            [[self client] URLProtocolDidFinishLoading:self];
+            
             
             return;
         }
@@ -207,9 +147,6 @@ 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;
     
@@ -217,14 +154,7 @@ 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];
@@ -272,89 +202,34 @@ int on_http_cb(http_parser* parser) { return 0; }
           }
         
         
-          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]);
-          }
+          NSURLRequest* redirReq = [NSURLRequest requestWithURL:url];
+          [[self client] URLProtocol:self wasRedirectedToRequest:redirReq redirectResponse:resp];
           return;
         }
-        else {
-            RAWLOG_ERROR2("$NetRequestProcess$ CRhoURLProtocol %s :: startLoading Redirect response has no URL ! Initial request: { %s }", [self selfIDstring], [CRhoURLProtocol requestInfo:[self request]]);
-        }
       }
       else
       {
-        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] URLProtocol:self didReceiveResponse:resp cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+        
+        if (self.httpBody != nil) {
+          [[self client] URLProtocol:self didLoadData:self.httpBody];
         }
+        
+        [[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
 {
-
-    if (is_net_trace()) {
-        RAWTRACE2("$NetRequestProcess$ CRhoURLProtocol %s :: makeDirectHttpRequest : URL [ %s ]", [self selfIDstring], [[theUrl absoluteString] UTF8String]);
-    }
-    
-    //NSLog(@"Will make local request to %@", [theUrl absoluteString]);
+  //NSLog(@"Will make local request to %@", [theUrl absoluteString]);
   
   const char* uri = [[theUrl path] UTF8String];
   const char* method = [[[self request] HTTPMethod] UTF8String];
@@ -427,10 +302,6 @@ 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]);
-    }
 
 }
 
@@ -441,13 +312,7 @@ 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"
@@ -455,39 +320,25 @@ int on_http_cb(http_parser* parser) { return 0; }
                            textEncodingName:@"UTF-8"];
     response.statusCode = statusCode;
     
-    if (!self.isStopped) {
-        [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
-    }
+    [[self client] URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
     if (data != nil) {
-        if (!self.isStopped) {
-            [[self client] URLProtocol:self didLoadData:data];
-        }
-    }
-    if (!self.isStopped) {
-        [[self client] URLProtocolDidFinishLoading:self];
+        [[self client] URLProtocol:self didLoadData:data];
     }
+    [[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;
         }
     }
@@ -496,10 +347,7 @@ int on_http_cb(http_parser* parser) { return 0; }
   
     if ( 0 == host )
     {
-      if (is_net_trace()) {
-          RAWTRACE("$NetRequestProcess$ isLocalURL END : return YES");
-      }
-        return YES;
+      return YES;
     }
   
     NSNumber* p = [url port];
@@ -507,15 +355,10 @@ int on_http_cb(http_parser* parser) { return 0; }
   
     int rhoPort = rho_http_get_port();
 
-    BOOL ret = (
+    return (
       ((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;
 }
 
 
@@ -523,7 +366,6 @@ int on_http_cb(http_parser* parser) { return 0; }
 @synthesize httpHeaderName;
 @synthesize httpHeaders;
 @synthesize httpBody;
-@synthesize isStopped;
 
 
 @end