Skip to content

Commit 18d179c

Browse files
committed
Merge remote-tracking branch 'ry/v0.6' into master
Conflicts: ChangeLog deps/uv/src/unix/udp.c deps/uv/src/win/fs.c deps/uv/src/win/udp.c deps/uv/test/test-fs.c doc/index.html doc/logos/index.html doc/template.html src/node_version.h
2 parents 33b7fc2 + 7e0bf7d commit 18d179c

File tree

152 files changed

+2022
-498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+2022
-498
lines changed

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,3 +258,6 @@ Michael Bernstein <[email protected]>
258258
Guillermo Rauch <[email protected]>
259259
Dan Williams <[email protected]>
260260
Brandon Benvie <[email protected]>
261+
Nicolas LaCasse <[email protected]>
262+
Dan VerWeire <[email protected]>
263+
Matthew Fitzsimmons <[email protected]>

ChangeLog

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@
3232
* Bug fixes
3333

3434

35+
2012.01.27, Version 0.6.9 (stable)
36+
37+
* dgram: Bring back missing functionality for Unix (Dan VerWeire, Roman Shtylman, Ben Noordhuis)
38+
- Note: Windows UDP support not yet complete.
39+
40+
* http: Fix parser memory leak (koichik)
41+
42+
* zlib: Fix #2365 crashes on invalid input (Nicolas LaCasse)
43+
44+
* module: fix --debug-brk on symlinked scripts (Fedor Indutny)
45+
46+
* Documentation Restyling (Matthew Fitzsimmons)
47+
48+
* Update npm to 1.1.0-3 (isaacs)
49+
50+
* Windows: fix regression in stat() calls to C:\ (Bert Belder)
51+
52+
3553
2012.01.19, Version 0.6.8 (stable), d18cebaf8a7ac701dabd71a3aa4eb0571db6a645
3654

3755
* Update V8 to 3.6.6.19

Makefile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,33 @@ website_files = \
102102
out/doc/sh_main.js \
103103
out/doc/sh_javascript.min.js \
104104
out/doc/sh_vim-dark.css \
105+
out/doc/sh.css \
105106
out/doc/logo.png \
106-
out/doc/sponsored.png \
107107
out/doc/favicon.ico \
108108
out/doc/pipe.css \
109109
out/doc/about/index.html \
110110
out/doc/close-downloads.png \
111111
out/doc/community/index.html \
112112
out/doc/community/not-invented-here.png \
113+
out/doc/logos/index.html \
114+
out/doc/microsoft-logo.png \
115+
out/doc/ryan-speaker.jpg \
113116
out/doc/download-logo.png \
114117
out/doc/ebay-logo.png \
118+
out/doc/footer-logo-alt.png \
115119
out/doc/footer-logo.png \
120+
out/doc/icons-interior.png \
116121
out/doc/icons.png \
122+
out/doc/home-icons.png \
123+
out/doc/joyent-logo_orange_nodeorg-01.png \
117124
out/doc/linkedin-logo.png \
118-
out/doc/logos/index.html \
125+
out/doc/logo-light.png \
126+
out/doc/mac_osx_nodejs_installer_logo.png \
119127
out/doc/microsoft-logo.png \
120128
out/doc/platform-icons.png \
121-
out/doc/ryan-speaker.jpg \
129+
out/doc/sponsored.png \
130+
out/doc/twitter-bird.png \
131+
out/doc/community-icons.png \
122132
out/doc/yahoo-logo.png
123133

124134
doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)

deps/npm/html/api/bin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>This function should not be used programmatically. Instead, just refer
2020
to the <code>npm.bin</code> member.</p>
2121
</div>
22-
<p id="footer">bin &mdash; [email protected]2</p>
22+
<p id="footer">bin &mdash; [email protected]3</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/bugs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>This command will launch a browser, so this command may not be the most
2626
friendly for programmatic use.</p>
2727
</div>
28-
<p id="footer">bugs &mdash; [email protected]2</p>
28+
<p id="footer">bugs &mdash; [email protected]3</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/commands.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2828

2929
<ul><li><a href="../doc/index.html">index(1)</a></li></ul>
3030
</div>
31-
<p id="footer">commands &mdash; [email protected]2</p>
31+
<p id="footer">commands &mdash; [email protected]3</p>
3232
<script>
3333
;(function () {
3434
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/config.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3333

3434
<ul><li><a href="../api/npm.html">npm(3)</a></li></ul>
3535
</div>
36-
<p id="footer">config &mdash; [email protected]2</p>
36+
<p id="footer">config &mdash; [email protected]3</p>
3737
<script>
3838
;(function () {
3939
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/deprecate.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3030

3131
<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../api/unpublish.html">unpublish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
3232
</div>
33-
<p id="footer">deprecate &mdash; [email protected]2</p>
33+
<p id="footer">deprecate &mdash; [email protected]3</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/docs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>This command will launch a browser, so this command may not be the most
2626
friendly for programmatic use.</p>
2727
</div>
28-
<p id="footer">docs &mdash; [email protected]2</p>
28+
<p id="footer">docs &mdash; [email protected]3</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/edit.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3030
<p>Since this command opens an editor in a new process, be careful about where
3131
and how this is used.</p>
3232
</div>
33-
<p id="footer">edit &mdash; [email protected]2</p>
33+
<p id="footer">edit &mdash; [email protected]3</p>
3434
<script>
3535
;(function () {
3636
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/explore.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2424

2525
<p>The first element in the 'args' parameter must be a package name. After that is the optional command, which can be any number of strings. All of the strings will be combined into one, space-delimited command.</p>
2626
</div>
27-
<p id="footer">explore &mdash; [email protected]2</p>
27+
<p id="footer">explore &mdash; [email protected]3</p>
2828
<script>
2929
;(function () {
3030
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/help-search.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3232

3333
<p>The silent parameter is not neccessary not used, but it may in the future.</p>
3434
</div>
35-
<p id="footer">help-search &mdash; [email protected]2</p>
35+
<p id="footer">help-search &mdash; [email protected]3</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/init.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3535

3636
<p><a href="../doc/json.html">json(1)</a></p>
3737
</div>
38-
<p id="footer">init &mdash; [email protected]2</p>
38+
<p id="footer">init &mdash; [email protected]3</p>
3939
<script>
4040
;(function () {
4141
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/install.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525
<p>Finally, 'callback' is a function that will be called when all packages have been
2626
installed or when an error has been encountered.</p>
2727
</div>
28-
<p id="footer">install &mdash; [email protected]2</p>
28+
<p id="footer">install &mdash; [email protected]3</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/link.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3939
<p>Now, any changes to the redis package will be reflected in
4040
the package in the current working directory</p>
4141
</div>
42-
<p id="footer">link &mdash; [email protected]2</p>
42+
<p id="footer">link &mdash; [email protected]3</p>
4343
<script>
4444
;(function () {
4545
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/load.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3232

3333
<p>For a list of all the available command-line configs, see <code>npm help config</code></p>
3434
</div>
35-
<p id="footer">load &mdash; [email protected]2</p>
35+
<p id="footer">load &mdash; [email protected]3</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/ls.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ <h3 id="global">global</h3>
5353
This means that if a submodule a same dependency as a parent module, then the
5454
dependency will only be output once.</p>
5555
</div>
56-
<p id="footer">ls &mdash; [email protected]2</p>
56+
<p id="footer">ls &mdash; [email protected]3</p>
5757
<script>
5858
;(function () {
5959
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/npm.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 id="SYNOPSIS">SYNOPSIS</h2>
2424

2525
<h2 id="VERSION">VERSION</h2>
2626

27-
<p>1.1.0-2</p>
27+
<p>1.1.0-3</p>
2828

2929
<h2 id="DESCRIPTION">DESCRIPTION</h2>
3030

@@ -91,7 +91,7 @@ <h2 id="ABBREVS">ABBREVS</h2>
9191

9292
<pre><code>var cmd = npm.deref("unp") // cmd === "unpublish"</code></pre>
9393
</div>
94-
<p id="footer">npm &mdash; [email protected]2</p>
94+
<p id="footer">npm &mdash; [email protected]3</p>
9595
<script>
9696
;(function () {
9797
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/outdated.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919

2020
<p>If the 'packages' parameter is left out, npm will check all packages.</p>
2121
</div>
22-
<p id="footer">outdated &mdash; [email protected]2</p>
22+
<p id="footer">outdated &mdash; [email protected]3</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/owner.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3434

3535
<ul><li><a href="../api/publish.html">publish(3)</a></li><li><a href="../doc/registry.html">registry(1)</a></li></ul>
3636
</div>
37-
<p id="footer">owner &mdash; [email protected]2</p>
37+
<p id="footer">owner &mdash; [email protected]3</p>
3838
<script>
3939
;(function () {
4040
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/pack.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2525

2626
<p>If no arguments are supplied, then npm packs the current package folder.</p>
2727
</div>
28-
<p id="footer">pack &mdash; [email protected]2</p>
28+
<p id="footer">pack &mdash; [email protected]3</p>
2929
<script>
3030
;(function () {
3131
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/prefix.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2121

2222
<p>This function is not useful programmatically</p>
2323
</div>
24-
<p id="footer">prefix &mdash; [email protected]2</p>
24+
<p id="footer">prefix &mdash; [email protected]3</p>
2525
<script>
2626
;(function () {
2727
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/prune.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2323
<p>Extraneous packages are packages that are not listed on the parent
2424
package's dependencies list.</p>
2525
</div>
26-
<p id="footer">prune &mdash; [email protected]2</p>
26+
<p id="footer">prune &mdash; [email protected]3</p>
2727
<script>
2828
;(function () {
2929
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/publish.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3232

3333
<ul><li><a href="../doc/registry.html">registry(1)</a></li><li><a href="../doc/adduser.html">adduser(1)</a></li><li><a href="../api/owner.html">owner(3)</a></li></ul>
3434
</div>
35-
<p id="footer">publish &mdash; [email protected]2</p>
35+
<p id="footer">publish &mdash; [email protected]3</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/rebuild.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h2 id="CONFIGURATION">CONFIGURATION</h2>
2222

2323
<p>See <code>npm help build</code></p>
2424
</div>
25-
<p id="footer">rebuild &mdash; [email protected]2</p>
25+
<p id="footer">rebuild &mdash; [email protected]3</p>
2626
<script>
2727
;(function () {
2828
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/restart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2727

2828
<ul><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
2929
</div>
30-
<p id="footer">restart &mdash; [email protected]2</p>
30+
<p id="footer">restart &mdash; [email protected]3</p>
3131
<script>
3232
;(function () {
3333
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/root.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2121

2222
<p>This function is not useful programmatically.</p>
2323
</div>
24-
<p id="footer">root &mdash; [email protected]2</p>
24+
<p id="footer">root &mdash; [email protected]3</p>
2525
<script>
2626
;(function () {
2727
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/run-script.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
2929

3030
<ul><li><a href="../doc/scripts.html">scripts(1)</a></li><li><a href="../api/test.html">test(3)</a></li><li><a href="../api/start.html">start(3)</a></li><li><a href="../api/restart.html">restart(3)</a></li><li><a href="../api/stop.html">stop(3)</a></li></ul>
3131
</div>
32-
<p id="footer">run-script &mdash; [email protected]2</p>
32+
<p id="footer">run-script &mdash; [email protected]3</p>
3333
<script>
3434
;(function () {
3535
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/search.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
3232
and doesn't try to read your mind (it doesn't do any verb tense matching or the
3333
like).</p>
3434
</div>
35-
<p id="footer">search &mdash; [email protected]2</p>
35+
<p id="footer">search &mdash; [email protected]3</p>
3636
<script>
3737
;(function () {
3838
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/start.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>npm can run tests on multiple packages. Just specify multiple packages
2020
in the <code>packages</code> parameter.</p>
2121
</div>
22-
<p id="footer">start &mdash; [email protected]2</p>
22+
<p id="footer">start &mdash; [email protected]3</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/stop.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
1919
<p>npm can run stop on multiple packages. Just specify multiple packages
2020
in the <code>packages</code> parameter.</p>
2121
</div>
22-
<p id="footer">stop &mdash; [email protected]2</p>
22+
<p id="footer">stop &mdash; [email protected]3</p>
2323
<script>
2424
;(function () {
2525
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/submodule.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
3333

3434
<ul><li>npm help json</li><li>git help submodule</li></ul>
3535
</div>
36-
<p id="footer">submodule &mdash; [email protected]2</p>
36+
<p id="footer">submodule &mdash; [email protected]3</p>
3737
<script>
3838
;(function () {
3939
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/tag.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2929
used. For more information about how to set this config, check
3030
<code>man 3 npm-config</code> for programmatic usage or <code>man npm-config</code> for cli usage.</p>
3131
</div>
32-
<p id="footer">tag &mdash; [email protected]2</p>
32+
<p id="footer">tag &mdash; [email protected]3</p>
3333
<script>
3434
;(function () {
3535
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/test.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2222
<p>npm can run tests on multiple packages. Just specify multiple packages
2323
in the <code>packages</code> parameter.</p>
2424
</div>
25-
<p id="footer">test &mdash; [email protected]2</p>
25+
<p id="footer">test &mdash; [email protected]3</p>
2626
<script>
2727
;(function () {
2828
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/uninstall.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2222
<p>Finally, 'callback' is a function that will be called when all packages have been
2323
uninstalled or when an error has been encountered.</p>
2424
</div>
25-
<p id="footer">uninstall &mdash; [email protected]2</p>
25+
<p id="footer">uninstall &mdash; [email protected]3</p>
2626
<script>
2727
;(function () {
2828
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/unpublish.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2626
<p>If no version is specified, or if all versions are removed then
2727
the root package entry is removed from the registry entirely.</p>
2828
</div>
29-
<p id="footer">unpublish &mdash; [email protected]2</p>
29+
<p id="footer">unpublish &mdash; [email protected]3</p>
3030
<script>
3131
;(function () {
3232
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/update.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1>DESCRIPTION</h1>
1818

1919
<p>The 'packages' argument is an array of packages to update. The 'callback' parameter will be called when done or when an error occurs.</p>
2020
</div>
21-
<p id="footer">update &mdash; [email protected]2</p>
21+
<p id="footer">update &mdash; [email protected]3</p>
2222
<script>
2323
;(function () {
2424
var wrapper = document.getElementById("wrapper")

deps/npm/html/api/version.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 id="DESCRIPTION">DESCRIPTION</h2>
2424
parameter. The difference, however, is this function will fail if it does
2525
not have exactly one element. The only element should be a version number.</p>
2626
</div>
27-
<p id="footer">version &mdash; [email protected]2</p>
27+
<p id="footer">version &mdash; [email protected]3</p>
2828
<script>
2929
;(function () {
3030
var wrapper = document.getElementById("wrapper")

0 commit comments

Comments
 (0)