[Pkg-javascript-commits] [node-stream-http] 43/208: Merge remote-tracking branch 'bendrucker/no-util'

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-stream-http.

commit 221ce6d7bd50bda0a3bae7e9d7100f8fcbce9893
Merge: 9d80ac6 3f96e05
Author: John Hiesey <john at hiesey.com>
Date:   Sun Jul 12 15:14:09 2015 -0700

    Merge remote-tracking branch 'bendrucker/no-util'

 lib/capability.js | 16 +++++++++-------
 lib/request.js    |  4 ++--
 lib/response.js   |  4 ++--
 package.json      |  1 +
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --cc lib/capability.js
index 39c721f,20400f9..56f7c81
--- a/lib/capability.js
+++ b/lib/capability.js
@@@ -1,13 -1,5 +1,11 @@@
- var util = require('util')
- 
- exports.fetch = util.isFunction(window.fetch) && util.isFunction(window.ReadableByteStream)
+ exports.fetch = isFunction(window.fetch) && isFunction(window.ReadableByteStream)
  
 +exports.blobConstructor = false
 +try {
 +	new Blob([new ArrayBuffer(1)])
 +	exports.blobConstructor = true
 +} catch (e) {}
 +
  var xhr = new window.XMLHttpRequest()
  xhr.open('GET', '/')
  
diff --cc package.json
index bbc4baa,246ff0c..4545bf3
--- a/package.json
+++ b/package.json
@@@ -16,13 -14,11 +16,14 @@@
    "author": "John Hiesey",
    "license": "MIT",
    "dependencies": {
 +    "builtin-status-codes": "~1.0.0",
      "foreach": "^2.0.5",
+     "inherits": "^2.0.1",
 -    "object-keys": "^1.0.4"
 +    "object-keys": "1.0.4",
 +    "xtend": "^4.0.0"
    },
    "devDependencies": {
 +    "basic-auth": "^1.0.3",
      "brfs": "^1.4.0",
      "express": "^4.13.0",
      "tape": "^4.0.0",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-stream-http.git