delta/node.git/doc/api/https.markdown, branch master

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

2015-01-12T23:59:37+00:00

Conflicts:
	AUTHORS
	ChangeLog
	configure
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/README.md
	deps/uv/config-unix.mk
	deps/uv/include/uv-private/uv-win.h
	deps/uv/include/uv.h
	deps/uv/src/unix/internal.h
	deps/uv/src/unix/kqueue.c
	deps/uv/src/unix/stream.c
	deps/uv/src/uv-common.c
	deps/uv/src/uv-common.h
	deps/uv/src/version.c
	deps/uv/src/win/poll.c
	deps/uv/test/test-osx-select.c
	deps/v8/src/debug-debugger.js
	deps/v8/src/isolate.cc
	deps/v8/src/isolate.h
	deps/v8/src/mirror-debugger.js
	doc/api/buffer.markdown
	doc/api/child_process.markdown
	doc/api/dns.markdown
	doc/api/tls.markdown
	doc/api/url.markdown
	lib/_stream_writable.js
	lib/assert.js
	lib/child_process.js
	lib/crypto.js
	lib/dgram.js
	lib/http.js
	lib/net.js
	lib/timers.js
	lib/tls.js
	src/node.cc
	src/node.h
	src/node.js
	src/node_crypto.cc
	src/node_version.h
	test/common.js
	test/simple/test-child-process-spawn-typeerror.js
	tools/certdata.txt

crypto: allow runtime opt in using SSLv2/SSLv3

2014-10-16T00:36:05+00:00

This change disables SSLv2/SSLv3 use by default, and introduces a
command line flag to opt into using SSLv2/SSLv3.

SSLv2 and SSLv3 are considered unsafe, and should only be used in
situations where compatibility with other components is required and
they cannot be upgrade to support newer forms of TLS.

doc: fix optional parameter parsing

2014-09-29T23:32:34+00:00

The parameter parser specifically looked for the old bracket syntax.
This generated a lot of warnings when building the docs. Those warnings
have been fixed by changing the parsing logic.

Signed-off-by: Trevor Norris

doc: fix brackets for optional parameters

2014-09-25T18:26:15+00:00

Documentation incorrectly used bracket notation for optional parameters.
This caused inconsistencies in usage because of examples like the
following:

    fs.write(fd, data[, position[, encoding]], callback)

This simply fixes all uses of bracket notation in documentation.

Signed-off-by: Trevor Norris 
Reviewed-by: Fedor Indutny

Merge remote-tracking branch 'origin/v0.10'

2013-05-29T21:12:11+00:00

Conflicts:
	deps/uv/ChangeLog
	deps/uv/src/unix/stream.c
	deps/uv/src/version.c
	lib/tls.js

https: Add `secureProtocol` docs

2013-05-28T19:43:37+00:00

Add `secureProtocol` parameter docs to the https.request method.

https: implement https.Server#setTimeout()

2013-04-30T11:10:56+00:00

Like commit d258fb0 ("http: More useful setTimeout API on server") but
this time for the https module.

Fixes #5361.

doc: https: Fix the link to tls.connect

2013-03-16T22:52:39+00:00

Merge remote-tracking branch 'ry/v0.8' into master

2012-12-14T00:57:58+00:00

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/test/test-spawn.c
	deps/uv/uv.gyp
	src/cares_wrap.cc
	src/node.cc
	src/node_version.h
	test/simple/test-buffer.js
	tools/gyp/pylib/gyp/common.py
	tools/install.py

doc: Fix missing link target to 'https.request()'

2012-11-28T02:11:40+00:00