From 829a9b8cba0680f1d451551e12491e7b0e1ea92f Mon Sep 17 00:00:00 2001
From: Fedor Indutny
Date: Thu, 13 Feb 2014 17:17:59 +0400
Subject: [PATCH 1/3] zlib: introduce pending close state
zlib should not crash in `close()` if the write is still in progress.
fix #7101
---
src/node_zlib.cc | 15 ++++++++-
test/simple/test-zlib-close-after-write.js | 38 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 test/simple/test-zlib-close-after-write.js
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index d522676284..5c8578d86e 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -72,18 +72,25 @@ class ZCtx : public ObjectWrap {
, flush_(0)
, chunk_size_(0)
, write_in_progress_(false)
+ , pending_close_(false)
, mode_(mode)
{
}
~ZCtx() {
+ assert(!write_in_progress_ && "write in progress");
Close();
}
void Close() {
- assert(!write_in_progress_ && "write in progress");
+ if (write_in_progress_) {
+ pending_close_ = true;
+ return;
+ }
+
+ pending_close_ = false;
assert(init_done_ && "close before init");
assert(mode_ <= UNZIP);
@@ -122,6 +129,7 @@ class ZCtx : public ObjectWrap {
assert(ctx->mode_ != NONE && "already finalized");
assert(!ctx->write_in_progress_ && "write already in progress");
+ assert(!ctx->pending_close_ && "close is pending");
ctx->write_in_progress_ = true;
ctx->Ref();
@@ -279,6 +287,8 @@ class ZCtx : public ObjectWrap {
MakeCallback(ctx->handle_, callback_sym, ARRAY_SIZE(args), args);
ctx->Unref();
+ if (ctx->pending_close_)
+ ctx->Close();
}
static void Error(ZCtx *ctx, const char *msg_) {
@@ -299,6 +309,8 @@ class ZCtx : public ObjectWrap {
// no hope of rescue.
ctx->write_in_progress_ = false;
ctx->Unref();
+ if (ctx->pending_close_)
+ ctx->Close();
}
static Handle New(const Arguments& args) {
@@ -495,6 +507,7 @@ class ZCtx : public ObjectWrap {
int chunk_size_;
bool write_in_progress_;
+ bool pending_close_;
uv_work_t work_req_;
node_zlib_mode mode_;
diff --git a/test/simple/test-zlib-close-after-write.js b/test/simple/test-zlib-close-after-write.js
new file mode 100644
index 0000000000..f0f176008f
--- /dev/null
+++ b/test/simple/test-zlib-close-after-write.js
@@ -0,0 +1,38 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common.js');
+var assert = require('assert');
+var zlib = require('zlib');
+
+var closed = false;
+
+zlib.gzip('hello', function(err, out) {
+ var unzip = zlib.createGunzip();
+ unzip.write(out);
+ unzip.close(function() {
+ closed = true;
+ });
+});
+
+process.on('exit', function() {
+ assert(closed);
+});
From 217bb0c9641f8b999f8a07d5fd9141e8c6cd1164 Mon Sep 17 00:00:00 2001
From: isaacs
Date: Sun, 16 Feb 2014 20:43:16 -0800
Subject: [PATCH 2/3] npm: upgrade to 1.4.3
---
deps/npm/AUTHORS | 41 +++
deps/npm/CONTRIBUTING.md | 10 +-
deps/npm/README.md | 57 +++--
deps/npm/doc/misc/npm-disputes.md | 19 +-
deps/npm/doc/misc/npm-faq.md | 28 ++-
deps/npm/html/doc/README.html | 59 ++---
deps/npm/html/doc/api/npm-bin.html | 2 +-
deps/npm/html/doc/api/npm-bugs.html | 2 +-
deps/npm/html/doc/api/npm-commands.html | 2 +-
deps/npm/html/doc/api/npm-config.html | 2 +-
deps/npm/html/doc/api/npm-deprecate.html | 2 +-
deps/npm/html/doc/api/npm-docs.html | 2 +-
deps/npm/html/doc/api/npm-edit.html | 2 +-
deps/npm/html/doc/api/npm-explore.html | 2 +-
deps/npm/html/doc/api/npm-help-search.html | 2 +-
deps/npm/html/doc/api/npm-init.html | 2 +-
deps/npm/html/doc/api/npm-install.html | 2 +-
deps/npm/html/doc/api/npm-link.html | 2 +-
deps/npm/html/doc/api/npm-load.html | 2 +-
deps/npm/html/doc/api/npm-ls.html | 2 +-
deps/npm/html/doc/api/npm-outdated.html | 2 +-
deps/npm/html/doc/api/npm-owner.html | 2 +-
deps/npm/html/doc/api/npm-pack.html | 2 +-
deps/npm/html/doc/api/npm-prefix.html | 2 +-
deps/npm/html/doc/api/npm-prune.html | 2 +-
deps/npm/html/doc/api/npm-publish.html | 2 +-
deps/npm/html/doc/api/npm-rebuild.html | 2 +-
deps/npm/html/doc/api/npm-repo.html | 2 +-
deps/npm/html/doc/api/npm-restart.html | 2 +-
deps/npm/html/doc/api/npm-root.html | 2 +-
deps/npm/html/doc/api/npm-run-script.html | 2 +-
deps/npm/html/doc/api/npm-search.html | 2 +-
deps/npm/html/doc/api/npm-shrinkwrap.html | 2 +-
deps/npm/html/doc/api/npm-start.html | 2 +-
deps/npm/html/doc/api/npm-stop.html | 2 +-
deps/npm/html/doc/api/npm-submodule.html | 2 +-
deps/npm/html/doc/api/npm-tag.html | 2 +-
deps/npm/html/doc/api/npm-test.html | 2 +-
deps/npm/html/doc/api/npm-uninstall.html | 2 +-
deps/npm/html/doc/api/npm-unpublish.html | 2 +-
deps/npm/html/doc/api/npm-update.html | 2 +-
deps/npm/html/doc/api/npm-version.html | 2 +-
deps/npm/html/doc/api/npm-view.html | 2 +-
deps/npm/html/doc/api/npm-whoami.html | 2 +-
deps/npm/html/doc/api/npm.html | 4 +-
deps/npm/html/doc/cli/npm-adduser.html | 2 +-
deps/npm/html/doc/cli/npm-bin.html | 2 +-
deps/npm/html/doc/cli/npm-bugs.html | 2 +-
deps/npm/html/doc/cli/npm-build.html | 2 +-
deps/npm/html/doc/cli/npm-bundle.html | 2 +-
deps/npm/html/doc/cli/npm-cache.html | 2 +-
deps/npm/html/doc/cli/npm-completion.html | 2 +-
deps/npm/html/doc/cli/npm-config.html | 2 +-
deps/npm/html/doc/cli/npm-dedupe.html | 2 +-
deps/npm/html/doc/cli/npm-deprecate.html | 2 +-
deps/npm/html/doc/cli/npm-docs.html | 2 +-
deps/npm/html/doc/cli/npm-edit.html | 2 +-
deps/npm/html/doc/cli/npm-explore.html | 2 +-
deps/npm/html/doc/cli/npm-help-search.html | 2 +-
deps/npm/html/doc/cli/npm-help.html | 2 +-
deps/npm/html/doc/cli/npm-init.html | 2 +-
deps/npm/html/doc/cli/npm-install.html | 2 +-
deps/npm/html/doc/cli/npm-link.html | 2 +-
deps/npm/html/doc/cli/npm-ls.html | 4 +-
deps/npm/html/doc/cli/npm-outdated.html | 2 +-
deps/npm/html/doc/cli/npm-owner.html | 2 +-
deps/npm/html/doc/cli/npm-pack.html | 2 +-
deps/npm/html/doc/cli/npm-prefix.html | 2 +-
deps/npm/html/doc/cli/npm-prune.html | 2 +-
deps/npm/html/doc/cli/npm-publish.html | 2 +-
deps/npm/html/doc/cli/npm-rebuild.html | 2 +-
deps/npm/html/doc/cli/npm-repo.html | 2 +-
deps/npm/html/doc/cli/npm-restart.html | 2 +-
deps/npm/html/doc/cli/npm-rm.html | 2 +-
deps/npm/html/doc/cli/npm-root.html | 2 +-
deps/npm/html/doc/cli/npm-run-script.html | 2 +-
deps/npm/html/doc/cli/npm-search.html | 2 +-
deps/npm/html/doc/cli/npm-shrinkwrap.html | 2 +-
deps/npm/html/doc/cli/npm-star.html | 2 +-
deps/npm/html/doc/cli/npm-stars.html | 2 +-
deps/npm/html/doc/cli/npm-start.html | 2 +-
deps/npm/html/doc/cli/npm-stop.html | 2 +-
deps/npm/html/doc/cli/npm-submodule.html | 2 +-
deps/npm/html/doc/cli/npm-tag.html | 2 +-
deps/npm/html/doc/cli/npm-test.html | 2 +-
deps/npm/html/doc/cli/npm-uninstall.html | 2 +-
deps/npm/html/doc/cli/npm-unpublish.html | 2 +-
deps/npm/html/doc/cli/npm-update.html | 2 +-
deps/npm/html/doc/cli/npm-version.html | 2 +-
deps/npm/html/doc/cli/npm-view.html | 2 +-
deps/npm/html/doc/cli/npm-whoami.html | 2 +-
deps/npm/html/doc/cli/npm.html | 4 +-
deps/npm/html/doc/files/npm-folders.html | 2 +-
deps/npm/html/doc/files/npm-global.html | 2 +-
deps/npm/html/doc/files/npm-json.html | 2 +-
deps/npm/html/doc/files/npmrc.html | 2 +-
deps/npm/html/doc/files/package.json.html | 2 +-
deps/npm/html/doc/index.html | 2 +-
deps/npm/html/doc/misc/npm-coding-style.html | 2 +-
deps/npm/html/doc/misc/npm-config.html | 2 +-
deps/npm/html/doc/misc/npm-developers.html | 2 +-
deps/npm/html/doc/misc/npm-disputes.html | 21 +-
deps/npm/html/doc/misc/npm-faq.html | 30 ++-
deps/npm/html/doc/misc/npm-index.html | 2 +-
deps/npm/html/doc/misc/npm-registry.html | 2 +-
deps/npm/html/doc/misc/npm-scripts.html | 2 +-
deps/npm/html/doc/misc/removing-npm.html | 2 +-
deps/npm/html/doc/misc/semver.html | 2 +-
deps/npm/lib/cache.js | 91 +++++--
deps/npm/lib/dedupe.js | 22 +-
deps/npm/lib/install.js | 4 +-
deps/npm/lib/link.js | 6 +-
deps/npm/lib/ls.js | 3 +-
deps/npm/lib/npm.js | 10 +-
deps/npm/lib/outdated.js | 109 +++++---
deps/npm/lib/prune.js | 3 +-
deps/npm/lib/rebuild.js | 3 +-
deps/npm/lib/shrinkwrap.js | 17 ++
deps/npm/lib/unbuild.js | 2 +-
.../lib/utils/completion/installed-deep.js | 8 +-
deps/npm/lib/utils/gently-rm.js | 16 ++
deps/npm/lib/utils/tar.js | 2 +-
deps/npm/lib/view.js | 2 +-
deps/npm/man/man1/npm-README.1 | 58 +++--
deps/npm/man/man1/npm-ls.1 | 2 +-
deps/npm/man/man1/npm.1 | 2 +-
deps/npm/man/man3/npm.3 | 2 +-
deps/npm/man/man7/npm-disputes.7 | 17 +-
deps/npm/man/man7/npm-faq.7 | 28 ++-
deps/npm/node_modules/glob/package.json | 2 +-
.../node_modules/graceful-fs/graceful-fs.js | 2 +
.../npm/node_modules/graceful-fs/package.json | 10 +-
.../graceful-fs/test/readdir-sort.js | 21 ++
deps/npm/node_modules/nopt/README.md | 8 +-
deps/npm/node_modules/nopt/lib/nopt.js | 213 +---------------
deps/npm/node_modules/nopt/package.json | 12 +-
deps/npm/node_modules/nopt/test/basic.js | 235 ++++++++++++++++++
.../npm-registry-client/lib/adduser.js | 3 +-
.../npm-registry-client/lib/deprecate.js | 2 +-
.../npm-registry-client/lib/get.js | 8 +-
.../npm-registry-client/lib/publish.js | 7 +-
.../npm-registry-client/lib/star.js | 2 +-
.../npm-registry-client/lib/unpublish.js | 3 +-
.../npm-registry-client/package.json | 10 +-
.../test/adduser-update.js | 2 +-
.../npm-registry-client/test/publish-again.js | 2 +-
.../npm/node_modules/read-installed/README.md | 13 +-
.../node_modules/read-installed/package.json | 26 +-
.../read-installed/read-installed.js | 28 +--
.../node_modules/read-installed/test/basic.js | 29 ++-
.../node_modules/read-installed/test/dev.js | 22 ++
.../strong-task-emitter/package.json | 10 +
.../read-installed/test/noargs.js | 21 ++
.../read-installed/test/peer-dep-at-latest.js | 14 ++
deps/npm/package.json | 12 +-
deps/npm/scripts/install.sh | 11 +-
deps/npm/test/tap/dedupe.js | 3 +-
deps/npm/test/tap/dedupe/package.json | 4 +-
deps/npm/test/tap/git-cache-locking.js | 43 ++++
deps/npm/test/tap/install-at-locally.js | 43 ++++
.../package@1.2.3/package.json | 5 +
deps/npm/test/tap/npm-api-not-loaded-error.js | 47 ++++
deps/npm/test/tap/outdated-color.js | 41 +++
deps/npm/test/tap/outdated-git.js | 3 +-
deps/npm/test/tap/outdated-git/package.json | 3 +-
deps/npm/test/tap/outdated.js | 24 +-
deps/npm/test/tap/prune.js | 107 ++++++++
deps/npm/test/tap/prune/package.json | 13 +
deps/npm/test/tap/repo.js | 52 ++++
.../npm/test/tap/shrinkwrap-dev-dependency.js | 66 +++++
.../desired-shrinkwrap-results.json | 12 +
.../shrinkwrap-dev-dependency/package.json | 12 +
.../tap/shrinkwrap-shared-dev-dependency.js | 58 +++++
.../desired-shrinkwrap-results.json | 12 +
.../package.json | 11 +
175 files changed, 1556 insertions(+), 609 deletions(-)
create mode 100644 deps/npm/node_modules/graceful-fs/test/readdir-sort.js
create mode 100644 deps/npm/node_modules/nopt/test/basic.js
create mode 100644 deps/npm/node_modules/read-installed/test/dev.js
create mode 100644 deps/npm/node_modules/read-installed/test/fixtures/peer-at-latest/node_modules/strong-task-emitter/package.json
create mode 100644 deps/npm/node_modules/read-installed/test/noargs.js
create mode 100644 deps/npm/node_modules/read-installed/test/peer-dep-at-latest.js
create mode 100644 deps/npm/test/tap/git-cache-locking.js
create mode 100644 deps/npm/test/tap/install-at-locally.js
create mode 100644 deps/npm/test/tap/install-at-locally/package@1.2.3/package.json
create mode 100644 deps/npm/test/tap/npm-api-not-loaded-error.js
create mode 100644 deps/npm/test/tap/outdated-color.js
create mode 100644 deps/npm/test/tap/prune.js
create mode 100644 deps/npm/test/tap/prune/package.json
create mode 100644 deps/npm/test/tap/repo.js
create mode 100644 deps/npm/test/tap/shrinkwrap-dev-dependency.js
create mode 100644 deps/npm/test/tap/shrinkwrap-dev-dependency/desired-shrinkwrap-results.json
create mode 100644 deps/npm/test/tap/shrinkwrap-dev-dependency/package.json
create mode 100644 deps/npm/test/tap/shrinkwrap-shared-dev-dependency.js
create mode 100644 deps/npm/test/tap/shrinkwrap-shared-dev-dependency/desired-shrinkwrap-results.json
create mode 100644 deps/npm/test/tap/shrinkwrap-shared-dev-dependency/package.json
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
index 890b29f085..3c0c0b0ba8 100644
--- a/deps/npm/AUTHORS
+++ b/deps/npm/AUTHORS
@@ -115,3 +115,44 @@ Vaz Allen
elisee
Evan You
Wil Moore III
+Dylan Greene
+zeke
+Andrew Horton
+Denis Gladkikh
+Daniel Santiago
+Alex Kocharin
+Evan Lucas
+Steve Mason
+Quinn Slack
+Sébastien Santoro
+CamilleM
+Tom Huang
+Sergey Belov
+Younghoon Park
+Yazhong Liu
+Mikola Lysenko
+Rafael de Oleza
+Yeonghoon Park
+Franck Cuny
+Alan Shaw
+Alex Rodionov
+Alexej Yaroshevich
+Elan Shanker
+François Frisch
+Gabriel Falkenberg
+Jason Diamond
+Jess Martin
+Jon Spencer
+Matt Colyer
+Matt McClure
+Maximilian Antoni
+Nicholas Kinsey
+Paulo Cesar
+Quim Calpe
+Robert Gieseke
+Spain Train
+TJ Holowaychuk
+Thom Blake
+Trevor Burnham
+bitspill
+Neil Gentleman
diff --git a/deps/npm/CONTRIBUTING.md b/deps/npm/CONTRIBUTING.md
index 7a60ed2a2b..0a5b53a125 100644
--- a/deps/npm/CONTRIBUTING.md
+++ b/deps/npm/CONTRIBUTING.md
@@ -1,5 +1,9 @@
## Before you submit a new issue
-* Check if there's a simple solution in the [Troubleshooting](https://github.com/npm/npm/wiki/Troubleshooting) wiki.
-* [Search for similar issues](https://github.com/npm/npm/search?q=Similar%20issues&type=Issues).
-* Ensure your new issue conforms to the [Contributing Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines).
+* Check if there's a simple solution in the
+ [Troubleshooting](https://github.com/npm/npm/wiki/Troubleshooting)
+ wiki.
+* [Search for similar
+ issues](https://github.com/npm/npm/search?q=Similar%20issues&type=Issues).
+* Ensure your new issue conforms to the [Contributing
+ Guidelines](https://github.com/npm/npm/wiki/Contributing-Guidelines).
diff --git a/deps/npm/README.md b/deps/npm/README.md
index e2f0f79b5b..ceea97e8ba 100644
--- a/deps/npm/README.md
+++ b/deps/npm/README.md
@@ -169,51 +169,54 @@ help config` to learn about all the options you can set there.
## More Docs
-Check out the [docs](https://npmjs.org/doc/),
-especially the [faq](https://npmjs.org/doc/faq.html).
+Check out the [docs](https://www.npmjs.org/doc/),
+especially the [faq](https://www.npmjs.org/doc/faq.html).
You can use the `npm help` command to read any of them.
If you're a developer, and you want to use npm to publish your program,
-you should [read this](https://npmjs.org/doc/developers.html)
+you should [read this](https://www.npmjs.org/doc/developers.html)
## Legal Stuff
-"npm" and "the npm registry" are owned by Isaac Z. Schlueter.
+"npm" and "The npm Registry" are owned by npm, Inc.
All rights reserved. See the included LICENSE file for more details.
-"Node.js" and "node" are trademarks owned by Joyent, Inc. npm is not
-officially part of the Node.js project, and is neither owned by nor
-officially affiliated with Joyent, Inc.
+"Node.js" and "node" are trademarks owned by Joyent, Inc.
-The packages in the npm registry are not part of npm itself, and are the
-sole property of their respective maintainers. While every effort is
-made to ensure accountability, there is absolutely no guarantee,
-warrantee, or assertion made as to the quality, fitness for a specific
-purpose, or lack of malice in any given npm package. Modules
-published on the npm registry are not affiliated with or endorsed by
-Joyent, Inc., Isaac Z. Schlueter, Ryan Dahl, or the Node.js project.
+Modules published on the npm registry are not officially endorsed by
+npm, Inc. or the Node.js project.
-If you have a complaint about a package in the npm registry, and cannot
-resolve it with the package owner, please express your concerns to
-Isaac Z. Schlueter at .
+Data published to the npm registry is not part of npm itself, and is
+the sole property of the publisher. While every effort is made to
+ensure accountability, there is absolutely no guarantee, warrantee, or
+assertion expressed or implied as to the quality, fitness for a
+specific purpose, or lack of malice in any given npm package.
-### In plain english
+If you have a complaint about a package in the public npm registry,
+and cannot [resolve it with the package
+owner](https://www.npmjs.org/doc/misc/npm-disputes.html), please email
+ and explain the situation.
-This is mine; not my employer's, not Node's, not Joyent's, not Ryan
-Dahl's.
+Any data published to The npm Registry (including user account
+information) may be removed or modified at the sole discretion of the
+npm server administrators.
+
+### In plainer english
+
+npm is the property of npm, Inc.
If you publish something, it's yours, and you are solely accountable
-for it. Not me, not Node, not Joyent, not Ryan Dahl.
+for it.
-If other people publish something, it's theirs. Not mine, not Node's,
-not Joyent's, not Ryan Dahl's.
+If other people publish something, it's theirs.
-Yes, you can publish something evil. It will be removed promptly if
-reported, and we'll lose respect for you. But there is no vetting
-process for published modules.
+Users can publish Bad Stuff. It will be removed promptly if reported.
+But there is no vetting process for published modules, and you use
+them at your own risk. Please inspect the source.
-If this concerns you, inspect the source before using packages.
+If you publish Bad Stuff, we may delete it from the registry, or even
+ban your account in extreme cases. So don't do that.
## BUGS
diff --git a/deps/npm/doc/misc/npm-disputes.md b/deps/npm/doc/misc/npm-disputes.md
index 6e9f4bfcd5..9fb1eaab45 100644
--- a/deps/npm/doc/misc/npm-disputes.md
+++ b/deps/npm/doc/misc/npm-disputes.md
@@ -4,7 +4,7 @@ npm-disputes(7) -- Handling Module Name Disputes
## SYNOPSIS
1. Get the author email with `npm owner ls `
-2. Email the author, CC .
+2. Email the author, CC
3. After a few weeks, if there's no resolution, we'll sort it out.
Don't squat on package names. Publish code or move out of the way.
@@ -42,15 +42,16 @@ Joe's appropriate course of action in each case is the same.
1. `npm owner ls foo`. This will tell Joe the email address of the
owner (Bob).
-2. Joe emails Bob, explaining the situation **as respectfully as possible**,
- and what he would like to do with the module name. He adds
- isaacs to the CC list of the email. Mention in the email
- that Bob can run `npm owner add joe foo` to add Joe as an owner of
- the `foo` package.
+2. Joe emails Bob, explaining the situation **as respectfully as
+ possible**, and what he would like to do with the module name. He
+ adds the npm support staff to the CC list of
+ the email. Mention in the email that Bob can run `npm owner add
+ joe foo` to add Joe as an owner of the `foo` package.
3. After a reasonable amount of time, if Bob has not responded, or if
- Bob and Joe can't come to any sort of resolution, email isaacs
- and we'll sort it out. ("Reasonable" is usually about 4
- weeks, but extra time is allowed around common holidays.)
+ Bob and Joe can't come to any sort of resolution, email support
+ and we'll sort it out. ("Reasonable" is
+ usually at least 4 weeks, but extra time is allowed around common
+ holidays.)
## REASONING
diff --git a/deps/npm/doc/misc/npm-faq.md b/deps/npm/doc/misc/npm-faq.md
index c2288389c5..80e3d1ad4b 100644
--- a/deps/npm/doc/misc/npm-faq.md
+++ b/deps/npm/doc/misc/npm-faq.md
@@ -3,7 +3,7 @@ npm-faq(7) -- Frequently Asked Questions
## Where can I find these docs in HTML?
-, or run:
+, or run:
npm config set viewer browser
@@ -68,7 +68,8 @@ program that uses it.
## Whatever, I really want the old style 'everything global' style.
-Write your own package manager, then. It's not that hard.
+Write your own package manager. You could probably even wrap up `npm`
+in a shell script if you really wanted to.
npm will not help you do something that is known to be a bad idea.
@@ -310,13 +311,17 @@ Go to .
Either the registry is down, or node's DNS isn't able to reach out.
-To check if the registry is down, open up
-in a web browser. This will also tell you if you are just unable to
-access the internet for some reason.
+To check if the registry is down, open up
+ in a web browser. This will also tell
+you if you are just unable to access the internet for some reason.
-If the registry IS down, let me know by emailing or posting
-an issue at . We'll have
-someone kick it or something.
+If the registry IS down, let us know by emailing
+or posting an issue at . If it's
+down for the world (and not just on your local network) then we're
+probably already being pinged about it.
+
+You can also often get a faster response by visiting the #npm channel
+on Freenode IRC.
## Why no namespaces?
@@ -330,9 +335,12 @@ There is not sufficient need to impose namespace rules on everyone.
## Who does npm?
-`npm view npm author`
+npm was originally written by Isaac Z. Schlueter, and many others have
+contributed to it, some of them quite substantially.
-`npm view npm contributors`
+The npm open source project, The npm Registry, and [the community
+website](https://www.npmjs.org) are maintained and operated by the
+good folks at [npm, Inc.](https://www.npmjs.com)
## I have a question or request not addressed here. Where should I put it?
diff --git a/deps/npm/html/doc/README.html b/deps/npm/html/doc/README.html
index d457ec95eb..747c1c2e75 100644
--- a/deps/npm/html/doc/README.html
+++ b/deps/npm/html/doc/README.html
@@ -175,51 +175,54 @@ help config to learn about all the options you can set there.
More Docs
-Check out the docs,
-especially the faq.
+Check out the docs,
+especially the faq.
You can use the npm help
command to read any of them.
If you're a developer, and you want to use npm to publish your program,
-you should read this
+you should read this
Legal Stuff
-"npm" and "the npm registry" are owned by Isaac Z. Schlueter.
+
"npm" and "The npm Registry" are owned by npm, Inc.
All rights reserved. See the included LICENSE file for more details.
-"Node.js" and "node" are trademarks owned by Joyent, Inc. npm is not
-officially part of the Node.js project, and is neither owned by nor
-officially affiliated with Joyent, Inc.
+"Node.js" and "node" are trademarks owned by Joyent, Inc.
-The packages in the npm registry are not part of npm itself, and are the
-sole property of their respective maintainers. While every effort is
-made to ensure accountability, there is absolutely no guarantee,
-warrantee, or assertion made as to the quality, fitness for a specific
-purpose, or lack of malice in any given npm package. Modules
-published on the npm registry are not affiliated with or endorsed by
-Joyent, Inc., Isaac Z. Schlueter, Ryan Dahl, or the Node.js project.
+Modules published on the npm registry are not officially endorsed by
+npm, Inc. or the Node.js project.
-If you have a complaint about a package in the npm registry, and cannot
-resolve it with the package owner, please express your concerns to
-Isaac Z. Schlueter at i@izs.me.
+Data published to the npm registry is not part of npm itself, and is
+the sole property of the publisher. While every effort is made to
+ensure accountability, there is absolutely no guarantee, warrantee, or
+assertion expressed or implied as to the quality, fitness for a
+specific purpose, or lack of malice in any given npm package.
-In plain english
+If you have a complaint about a package in the public npm registry,
+and cannot resolve it with the package
+owner, please email
+support@npmjs.com and explain the situation.
-This is mine; not my employer's, not Node's, not Joyent's, not Ryan
-Dahl's.
+Any data published to The npm Registry (including user account
+information) may be removed or modified at the sole discretion of the
+npm server administrators.
+
+In plainer english
+
+npm is the property of npm, Inc.
If you publish something, it's yours, and you are solely accountable
-for it. Not me, not Node, not Joyent, not Ryan Dahl.
+for it.
-If other people publish something, it's theirs. Not mine, not Node's,
-not Joyent's, not Ryan Dahl's.
+If other people publish something, it's theirs.
-Yes, you can publish something evil. It will be removed promptly if
-reported, and we'll lose respect for you. But there is no vetting
-process for published modules.
+Users can publish Bad Stuff. It will be removed promptly if reported.
+But there is no vetting process for published modules, and you use
+them at your own risk. Please inspect the source.
-If this concerns you, inspect the source before using packages.
+If you publish Bad Stuff, we may delete it from the registry, or even
+ban your account in extreme cases. So don't do that.
BUGS
@@ -239,7 +242,7 @@ will no doubt tell you to put the output in a gist or email.
-
+