delta/node.git/lib, branch master

Merge remote-tracking branch 'upstream/v0.12'

2015-07-27T09:52:49+00:00

tls: do not hang without `newSession` handler

2015-07-20T18:47:06+00:00

When listening for client hello parser events (like OCSP requests), do
not hang if `newSession` event handler is not present.

Fix: https://github.com/joyent/node/issues/8660
Fix: https://github.com/joyent/node/issues/25735

Reviewed-By: Fedor Indutny 
PR-URL: https://github.com/joyent/node/pull/25739

doc, comments: Grammar and spelling fixes

2015-06-29T17:27:51+00:00

Reviewed-By: James M Snell 
PR-URL: https://github.com/joyent/node/pull/25592

Merge remote-tracking branch 'upstream/v0.12'

2015-06-22T21:00:36+00:00

Conflicts:
	src/node_version.h

Merge remote-tracking branch 'upstream/v0.10' into v0.12

2015-06-22T18:11:51+00:00

Conflicts:
	AUTHORS
	ChangeLog
	lib/timers.js
	src/node_version.h
	test/common.js

tls: revert disable RC4 and cipher lists changes

2015-06-19T05:37:10+00:00

This reverts commit 67d9a56251c4491beacb666ba5833574d0cf0d12.

This commit actually reverts both
67d9a56251c4491beacb666ba5833574d0cf0d12 and
02a549ed2b2afe85d8ff0335b6684ad54023afb7 (both related to ciphers list
changes). It does it in one commit because reverting
02a549ed2b2afe85d8ff0335b6684ad54023afb7 results in an empty commit.

These changes are not yet ready to be released, and before they are we
want to be able to publish new releases. We're reverting them so that we
can submit a new PR that will contain all these changes plus what's
necessary to be able to land them properly.

Conflicts:
	src/node.cc

PR: #25511
PR-URL: https://github.com/joyent/node/pull/25511
Reviewed-By: Shigeki Ohtsu

timers: fix timeout when added in timer's callback

2015-06-17T18:36:38+00:00

When a timer is added in another timer's callback, its underlying timer
handle will be started with a timeout that is actually incorrect.

The reason is that  the value that represents the current time is not
updated between the time the original callback is called and the time
the added timer is processed by timers.listOnTimeout. That leads the
logic in timers.listOnTimeout to do an incorrect computation that makes
the added timer fire with a timeout of scheduledTimeout +
timeSpentInCallback.

This change fixes that and make timers scheduled within other timers'
callbacks fire as expected.

Fixes #9333 and #15447.

PR: #17203
PR-URL: https://github.com/joyent/node/pull/17203
Reviewed-By: Fedor Indutny

_http_server.js: fix typo in comment

2015-06-04T06:27:38+00:00

Fix misspelling of 'response' on line 453

Reviewed-By: James M Snell 
PR-URL: https://github.com/joyent/node/pull/25472

Merge remote-tracking branch 'upstream/v0.12'

2015-05-14T18:46:13+00:00

Conflicts:
	src/node_version.h

tls,crypto: revert recent cipher lists changes

2015-05-13T22:37:32+00:00

Revert "disable RC4, add --cipher-list command line switch" and
"tls: make --enable-legacy-cipher-list=val less verbose"

This reverts commit f9291a94498c6f9d70a74a1e402f333383286120 and
b5737bb97775ff461266d28245df104dde0e6986.

There is still some work to be done to guarantee secure defaults and a
smooth upgrade path for v0.12.x users. Before this work is finished, we
want to be able to release new versions of v0.12.x. So instead of
waiting for these changes to be ready to ship, revert them and integrate
them when they're ready to be shipped.

Conflicts:
	src/node.cc

Reviewed-By: James M Snell 
PR-URL: https://github.com/joyent/node/pull/25296