cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject cordova-lib git commit: Fix problem caused by circular dependency between server and stream.
Date Sat, 22 Aug 2015 13:59:59 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master bfa207bf3 -> da2a8f39b


Fix problem caused by circular dependency between server and stream.


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/da2a8f39
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/da2a8f39
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/da2a8f39

Branch: refs/heads/master
Commit: da2a8f39bea7f08e29ab14485a353be8042f1b3b
Parents: bfa207b
Author: Tim Barham <tim.barham@microsoft.com>
Authored: Sat Aug 22 23:59:48 2015 +1000
Committer: Tim Barham <tim.barham@microsoft.com>
Committed: Sat Aug 22 23:59:48 2015 +1000

----------------------------------------------------------------------
 cordova-serve/src/server.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/da2a8f39/cordova-serve/src/server.js
----------------------------------------------------------------------
diff --git a/cordova-serve/src/server.js b/cordova-serve/src/server.js
index 4446cd5..ea31831 100644
--- a/cordova-serve/src/server.js
+++ b/cordova-serve/src/server.js
@@ -22,8 +22,7 @@ var chalk  = require('chalk'),
     http   = require('http'),
     url    = require('url'),
     path   = require('path'),
-    Q      = require('q'),
-    stream = require('./stream');
+    Q      = require('q');
 
 /**
  * @desc Launches a server with the specified options and optional custom handlers.
@@ -123,7 +122,7 @@ module.exports = function (opts) {
                 } else if (!isFileChanged(filePath)) {
                     do304();
                 } else {
-                    var streamHandler = opts.streamHandler || stream;
+                    var streamHandler = opts.streamHandler || require('./stream');
                     streamHandler(filePath, request, response);
                 }
             });


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message