OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'v0.6.14-release' into v0.6

Browse Source
This commit is contained in:
isaacs
2012-03-23 11:16:31 -07:00
parent 0dcc43316f e513ffef75
commit dbd0e2b386
9 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AUTHORS
View File

@@ -267,3 +267,8 @@ Philip Tellis <philip.tellis@gmail.com>
Christopher Jeffrey <chjjeffrey@gmail.com>
Seth Fitzsimmons <seth@mojodna.net>
Einar Otto Stangvik <einaros@gmail.com>
Paul Vorbach <paul@vorb.de>
tedsuo <ted@radicaldesigns.org>
Joshua Holbrook <josh.holbrook@gmail.com>
Rod Vagg <rod@vagg.org>
Bryan Cantrill <bryan@joyent.com>

25
ChangeLog
View File

@@ -1,4 +1,27 @@
2012.03.15 Version 0.6.13 (stable)
2012.03.22 Version 0.6.14 (stable)
* net: don't crash when queued write fails (Igor Zinkovsky)
* sunos: fix EMFILE on process.memoryUsage() (Bryan Cantrill)
* crypto: fix compile-time error with openssl 0.9.7e (Ben Noordhuis)
* unix: ignore ECONNABORTED errors from accept() (Ben Noordhuis)
* Add UV_ENOSPC and mappings to it (Bert Belder)
* http-parser: Fix response body is not read (koichik)
* Upgrade npm to 1.1.12
- upgrade node-gyp to 0.3.7
- work around AV-locked directories on Windows
- Fix isaacs/npm#2293 Don't try to 'uninstall' /
- Exclude symbolic links from packages.
- Fix isaacs/npm#2275 Spurious 'unresolvable cycle' error.
- Exclude/include dot files as if they were normal files
2012.03.15 Version 0.6.13 (stable), 9f7f86b534f8556290eb8cad915984ff4ca54996
* Windows: Many libuv test fixes (Bert Belder)

3
Makefile
View File

@@ -110,6 +110,9 @@ $(apidoc_dirs):
out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
cp $< $@
out/doc/%.html: doc/%.html
cat $< | sed -e 's|__VERSION__|'$(VERSION)'|g' > $@
out/doc/%: doc/%
cp -r $< $@

6
doc/about/index.html
View File

@@ -31,7 +31,7 @@
<li><a href="/#download" class="download">Download</a></li>
<li><a href="/about/" class="about current">About</a></li>
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html" class="docs">Docs</a></li>
<li><a href="http://nodejs.org/api/" class="docs">Docs</a></li>
<li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
<li><a href="/community/" class="community">Community</a></li>
<li><a href="/logos/" class="logos">Logos</a></li>
@@ -122,7 +122,7 @@ console.log('Server running at http://127.0.0.1:1337/');</pre>
<li><a href="/#download">Download</a></li>
<li><a href="/about/">About</a></li>
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html">Docs</a></li>
<li><a href="http://nodejs.org/api/">Docs</a></li>
<li><a href="http://blog.nodejs.org">Blog</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="/logos/">Logos</a></li>
@@ -130,7 +130,7 @@ console.log('Server running at http://127.0.0.1:1337/');</pre>
<li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
</ul>
<p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">license</a>.</p>
<p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a>.</p>
</div>

6
doc/community/index.html
View File

@@ -33,7 +33,7 @@
<li><a href="/#download" class="download">Download</a></li>
<li><a href="/about/" class="about">About</a></li>
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html" class="docs">Docs</a></li>
<li><a href="http://nodejs.org/api/" class="docs">Docs</a></li>
<li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
<li><a href="/community/" class="community current">Community</a></li>
<li><a href="/logos/" class="logos">Logos</a></li>
@@ -172,7 +172,7 @@
<li><a href="/#download">Download</a></li>
<li><a href="/about/">About</a></li>
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html">Docs</a></li>
<li><a href="http://nodejs.org/api/">Docs</a></li>
<li><a href="http://blog.nodejs.org">Blog</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="/logos/">Logos</a></li>
@@ -180,7 +180,7 @@
<li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
</ul>
<p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">license</a>.</p>
<p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a>.</p>
</div>
<script>

24
doc/index.html
View File

@@ -30,8 +30,8 @@
applications that run across distributed devices.</p>
<a href="#download" class="button" id="downloadbutton">Download</a>
<a href="http://nodejs.org/api/index.html" class="button" id="docsbutton">Docs</a>
<p class="version">v0.6.13</p>
<a href="api/" class="button" id="docsbutton">Docs</a>
<p class="version">__VERSION__</p>
</div>
<div id="quotes" class="clearfix">
<h2>Node.js in the Industry</h2>
@@ -78,15 +78,15 @@
<a href="#" id="download-close">X</a>
<img id="download-logo" src="http://nodejs.org/images/download-logo.png" alt="node.js">
<ul id="installers" class="clearfix">
<li><a href="http://nodejs.org/dist/v0.6.13/node-v0.6.13.msi">Windows Installer</a><br>node-v0.6.13.msi</li>
<li><a href="http://nodejs.org/dist/v0.6.13/node-v0.6.13.pkg">Macintosh Installer</a><br>node-v0.6.13.pkg</li>
<li id="source"><a href="http://nodejs.org/dist/v0.6.13/node-v0.6.13.tar.gz">Source Code</a><br>node-v0.6.13.tar.gz</li>
<li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.msi">Windows Installer</a><br>node-__VERSION__.msi</li>
<li><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.pkg">Macintosh Installer</a><br>node-__VERSION__.pkg</li>
<li id="source"><a href="http://nodejs.org/dist/__VERSION__/node-__VERSION__.tar.gz">Source Code</a><br>node-__VERSION__.tar.gz</li>
</ul>
<ul id="documentation">
<li><a href="https://raw.github.com/joyent/node/v0.6.13/ChangeLog">Change Log</a></li>
<li><a href="http://nodejs.org/docs/v0.6.13/api/index.html">Documentation</a></li>
<li><a href="http://nodejs.org/dist/v0.6.13">Other release files</a></li>
<li><a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">License</a></li>
<li><a href="https://raw.github.com/joyent/node/__VERSION__/ChangeLog">Change Log</a></li>
<li><a href="http://nodejs.org/docs/__VERSION__/api/">Documentation</a></li>
<li><a href="http://nodejs.org/dist/__VERSION__">Other release files</a></li>
<li><a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">License</a></li>
<li><a href="https://github.com/joyent/node">Git Repository</a></li>
<li><a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager">Installing
with a Package Manager</a>
@@ -188,7 +188,7 @@ server.listen(1337, '127.0.0.1');</pre>
<ul id="explore">
<li><a href="about/" class="explore">About</a><br><span>Technical overview</span></li>
<li><a href="http://search.npmjs.org/" class="explore">npm Registry</a><br><span>Modules, resources and more</span></li>
<li><a href="http://nodejs.org/api/index.html" class="explore">Documentation</a><br><span>API Specifications</span></li>
<li><a href="http://nodejs.org/api/" class="explore">Documentation</a><br><span>API Specifications</span></li>
<li><a href="http://blog.nodejs.org" class="explore">Node.js Blog</a><br><span>Insight, perspective and events</span></li>
<li><a href="community/" class="explore">Community</a><br><span>Mailing lists, blogs, and more</span></li>
<li><a href="logos/" class="explore">Logos</a><br><span>Logo and desktop background</span></li>
@@ -203,7 +203,7 @@ server.listen(1337, '127.0.0.1');</pre>
<li><a href="/#download">Download</a></li>
<li><a href="/about/">About</a></li>
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html">Docs</a></li>
<li><a href="http://nodejs.org/api/">Docs</a></li>
<li><a href="http://blog.nodejs.org">Blog</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="/logos/">Logos</a></li>
@@ -211,7 +211,7 @@ server.listen(1337, '127.0.0.1');</pre>
<!-- <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> -->
</ul>
<p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">license</a>.</p>
<p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a>.</p>
</div>

6
doc/logos/index.html
View File

@@ -31,7 +31,7 @@
<li><a href="/#download" class="download">Download</a></li>
<li><a href="/about/" class="about">About</a></li>
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html" class="docs">Docs</a></li>
<li><a href="http://nodejs.org/api/" class="docs">Docs</a></li>
<li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
<li><a href="/community/" class="community">Community</a></li>
<li><a href="/logos/" class="logos current">Logos</a></li>
@@ -74,7 +74,7 @@
<li><a href="/#download">Download</a></li>
<li><a href="/about/">About</a></li>
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html">Docs</a></li>
<li><a href="http://nodejs.org/api/">Docs</a></li>
<li><a href="http://blog.nodejs.org">Blog</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="/logos/">Logos</a></li>
@@ -82,7 +82,7 @@
<li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
</ul>
<p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="/trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/v0.6.13/LICENSE">View License</a></p>
<p>Copyright <a href="http://joyent.com">Joyent, Inc</a>., Node.js is a <a href="/trademark-policy.pdf">trademark of Joyent, Inc</a>., <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">View License</a></p>
</div>
<script>

6
doc/template.html
View File

@@ -20,7 +20,7 @@
<li><a href="/#download" class="download">Download</a></li>
<li><a href="/about/" class="about">About</a></li>
<li><a href="http://search.npmjs.org/" class="npm">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html" class="docs current">Docs</a></li>
<li><a href="http://nodejs.org/api/" class="docs current">Docs</a></li>
<li><a href="http://blog.nodejs.org" class="blog">Blog</a></li>
<li><a href="/community/" class="community">Community</a></li>
<li><a href="/logos/" class="logos">Logos</a></li>
@@ -58,7 +58,7 @@
<li><a href="/#download">Download</a></li>
<li><a href="/about/">About</a></li>
<li><a href="http://search.npmjs.org/">npm Registry</a></li>
<li><a href="http://nodejs.org/api/index.html">Docs</a></li>
<li><a href="http://nodejs.org/api/">Docs</a></li>
<li><a href="http://blog.nodejs.org">Blog</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="/logos/">Logos</a></li>
@@ -66,7 +66,7 @@
<li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
</ul>
<p>Copyright 2010-2012 <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a>.</p>
<p>Copyright <a href="http://joyent.com">Joyent, Inc</a>, Node.js is a <a href="/trademark-policy.pdf">trademark</a> of Joyent, Inc. View <a href="https://raw.github.com/joyent/node/__VERSION__/LICENSE">license</a>.</p>
</div>
<script src="../sh_main.js"></script>

2
src/node_version.h
View File

@@ -29,7 +29,7 @@
#define NODE_MAJOR_VERSION 0
#define NODE_MINOR_VERSION 6
#define NODE_PATCH_VERSION 14
#define NODE_VERSION_IS_RELEASE 0
#define NODE_VERSION_IS_RELEASE 1
#ifndef NODE_STRINGIFY
#define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)