summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames M Snell <jasnell@gmail.com>2015-06-23 20:42:49 -0700
committerJames M Snell <jasnell@gmail.com>2015-08-05 08:44:55 -0700
commit936c9ffb0fa8e023b40e20882c16aaaef0ba4178 (patch)
treef92d3b160166f4726ffd40dec487a15b3c9bf09a /lib
parentd88194d261ddf7f0b4b821158244ad0b4d0f1279 (diff)
downloadandroid-node-v8-936c9ffb0fa8e023b40e20882c16aaaef0ba4178.tar.gz
android-node-v8-936c9ffb0fa8e023b40e20882c16aaaef0ba4178.tar.bz2
android-node-v8-936c9ffb0fa8e023b40e20882c16aaaef0ba4178.zip
doc: multiple documentation updates cherry picked from v0.12
* doc: improve http.abort description * doc: mention that mode is ignored if file exists * docs: Fix default options for fs.createWriteStream() * Documentation update about Buffer initialization * doc: add a note about readable in flowing mode * doc: Document http.request protocol option * doc, comments: Grammar and spelling fixes * updated documentation for fs.createReadStream * Update child_process.markdown, spelling * doc: Clarified read method with specified size argument. * docs:events clarify emitter.listener() behavior * doc: two minor stream doc improvements * doc: clarify Readable._read and Readable.push * doc: stream.unshift does not reset reading state * doc: readable event clarification * doc: additional refinement to readable event Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noorduis <ben@strongloop.com> PR-URL: https://github.com/nodejs/io.js/pull/2302
Diffstat (limited to 'lib')
-rw-r--r--lib/_http_client.js4
-rw-r--r--lib/url.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/_http_client.js b/lib/_http_client.js
index a7d714f7e0..50d1052b44 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -359,7 +359,7 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
var req = socket._httpMessage;
- // propogate "domain" setting...
+ // propagate "domain" setting...
if (req.domain && !res.domain) {
debug('setting "res.domain"');
res.domain = req.domain;
@@ -465,7 +465,7 @@ function tickOnSocket(req, socket) {
socket.parser = parser;
socket._httpMessage = req;
- // Setup "drain" propogation.
+ // Setup "drain" propagation.
httpSocketSetup(socket);
// Propagate headers limit from request object to parser
diff --git a/lib/url.js b/lib/url.js
index 55c5248e47..45155fee93 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -587,7 +587,7 @@ Url.prototype.resolveObject = function(relative) {
if (psychotic) {
result.hostname = result.host = srcPath.shift();
//occationaly the auth can get stuck only in host
- //this especialy happens in cases like
+ //this especially happens in cases like
//url.resolveObject('mailto:local1@domain1', 'local2@domain2')
var authInHost = result.host && result.host.indexOf('@') > 0 ?
result.host.split('@') : false;
@@ -669,7 +669,7 @@ Url.prototype.resolveObject = function(relative) {
result.hostname = result.host = isAbsolute ? '' :
srcPath.length ? srcPath.shift() : '';
//occationaly the auth can get stuck only in host
- //this especialy happens in cases like
+ //this especially happens in cases like
//url.resolveObject('mailto:local1@domain1', 'local2@domain2')
var authInHost = result.host && result.host.indexOf('@') > 0 ?
result.host.split('@') : false;