Merge branch 'v0.7.5-release'

nodejs · Feb 23, 2012 · c5cbc3d · c5cbc3d
2 parents c1fcb1d + d384b8b
commit c5cbc3d
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 36 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -267,3 +267,9 @@ Christopher Jeffrey <chjjeffrey@gmail.com>
 Paddy Byers <paddy.byers@gmail.com>
 Seth Fitzsimmons <seth@mojodna.net>
 Einar Otto Stangvik <einaros@gmail.com>
+Paul Vorbach <paul@vorb.de>
+Luke Gallagher <notfornoone@gmail.com>
+Tomasz Buchert <tomek.buchert@gmail.com>
+Myles Byrne <myles@myles.id.au>
+T.C. Hollingsworth <tchollingsworth@gmail.com>
+Cam Pedersen <diffference@gmail.com>
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,40 @@
-2012.02.14, Version 0.7.4 (unstable)
+2012.02.23, Version 0.7.5 (unstable)
+
+* startup speed improvements (Maciej Małecki)
+
+* crypto: add function getDiffieHellman() (Tomasz Buchert)
+
+* buffer: support decoding of URL-safe base64 (Ben Noordhuis)
+
+* Make QueryString.parse() even faster (Brian White)
+
+* url: decode url entities in auth section (Ben Noordhuis)
+
+* http: support PURGE request method (Ben Noordhuis)
+
+* http: Generate Date headers on responses (Mark Nottingham)
+
+* Fix #2762: Add callback to close function. (Mikeal Rogers)
+
+* dgram: fix out-of-bound memory read (Ben Noordhuis)
+
+* repl: add automatic loading of built-in libs (Brandon Benvie)
+
+* repl: remove double calls where possible (Fedor Indutny)
+
+* Readline improvements. Related: #2737 #2756 (Colton Baker)
+
+* build: disable -fomit-frame-pointer on solaris (Dave Pacheco)
+
+* build: arch detection improvements (Nathan Rajlich)
+
+* build: Make a fat binary for the OS X `make pkg`. (Nathan Rajlich)
+
+* jslint src/ and lib/ on 'make test' (isaacs)
+
+
+
+2012.02.14, Version 0.7.4 (unstable), de21de920cf93ec40736ada3792a7f85f3eadeda
 
 * Upgrade V8 to 3.9.5
 

diff --git a/configure b/configure
@@ -209,11 +209,8 @@ def configure_v8(o):
     o['libraries'] += ['-L%s' % options.shared_v8_libpath]
   if options.shared_v8_libname:
     o['libraries'] += ['-l%s' % options.shared_v8_libname]
-  elif options.shared_v8:
-    o['libraries'] += ['-lv8']
   if options.shared_v8_includes:
     o['include_dirs'] += [options.shared_v8_includes]
-    o['variables']['node_shared_v8_includes'] = options.shared_v8_includes
 
 
 def configure_cares(o):

diff --git a/doc/about/index.html b/doc/about/index.html
@@ -130,7 +130,7 @@ <h1>Node's goal is to provide an easy way to build scalable
             <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
         </ul>
 
-        <p>Copyright 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.7.4/LICENSE">license</a>.</p>
+        <p>Copyright 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.7.5/LICENSE">license</a>.</p>
     </div>
 
 

diff --git a/doc/community/index.html b/doc/community/index.html
@@ -180,7 +180,7 @@ <h2 class="irc">IRC</h2>
             <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
         </ul>
 
-        <p>Copyright 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.7.4/LICENSE">license</a>.</p>
+        <p>Copyright 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.7.5/LICENSE">license</a>.</p>
     </div>
 
     <script>

diff --git a/doc/index.html b/doc/index.html
@@ -31,7 +31,7 @@
 
         <a href="#download" class="button" id="downloadbutton">Download</a>
         <a href="http://nodejs.org/docs/latest/api/index.html" class="button" id="docsbutton">Docs</a>
-        <p class="version">v0.7.4</p> 
+        <p class="version">v0.7.5</p> 
     </div>
     <div id="quotes" class="clearfix">
         <h2>Node.js in the Industry</h2>
@@ -78,15 +78,15 @@ <h2>Node.js in the Industry</h2>
         <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.7.4/node-v0.7.4.msi">Windows Installer</a><br>node-v0.7.4.msi</li>
-            <li><a href="http://nodejs.org/dist/v0.7.4/node-v0.7.4.pkg">Macintosh Installer</a><br>node-v0.7.4.pkg</li>
-            <li id="source"><a href="http://nodejs.org/dist/v0.7.4/node-v0.7.4.tar.gz">Source Code</a><br>node-v0.7.4.tar.gz</li>
+            <li><a href="http://nodejs.org/dist/v0.7.5/node-v0.7.5.msi">Windows Installer</a><br>node-v0.7.5.msi</li>
+            <li><a href="http://nodejs.org/dist/v0.7.5/node-v0.7.5.pkg">Macintosh Installer</a><br>node-v0.7.5.pkg</li>
+            <li id="source"><a href="http://nodejs.org/dist/v0.7.5/node-v0.7.5.tar.gz">Source Code</a><br>node-v0.7.5.tar.gz</li>
         </ul>
         <ul id="documentation">
-            <li><a href="https://raw.github.com/joyent/node/v0.7.4/ChangeLog">Change Log</a></li>
-            <li><a href="http://nodejs.org/docs/v0.7.4/api/index.html">Documentation</a></li>
-            <li><a href="http://nodejs.org/dist/v0.7.4">Other release files</a></li>
-            <li><a href="https://raw.github.com/joyent/node/v0.7.4/LICENSE">License</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.7.5/ChangeLog">Change Log</a></li>
+            <li><a href="http://nodejs.org/docs/v0.7.5/api/index.html">Documentation</a></li>
+            <li><a href="http://nodejs.org/dist/v0.7.5">Other release files</a></li>
+            <li><a href="https://raw.github.com/joyent/node/v0.7.5/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>
@@ -211,7 +211,7 @@ <h2>Explore Node.js</h2>
             <!-- <li><a hrfe="http://twitter.com/nodejs" class="twitter">@nodejs</a></li> -->
         </ul>
 
-        <p>Copyright 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.7.4/LICENSE">license</a>.</p>
+        <p>Copyright 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.7.5/LICENSE">license</a>.</p>
     </div>
 
 

diff --git a/doc/logos/index.html b/doc/logos/index.html
@@ -82,7 +82,7 @@ <h2>Desktop Background</h2>
             <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.7.4/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/v0.7.5/LICENSE">View License</a></p>
     </div>
 
     <script>

diff --git a/doc/template.html b/doc/template.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>{{section}}Node.js v0.7.4 Manual &amp; Documentation</title>
+  <title>{{section}}Node.js v0.7.5 Manual &amp; Documentation</title>
   <link rel="stylesheet" href="assets/style.css">
   <link rel="stylesheet" href="assets/sh.css">
   <link rel="canonical" href="http://nodejs.org/docs/latest/api/{{filename}}.html">
@@ -31,7 +31,7 @@
 
         <div id="column1" class="interior">
         <header>
-          <h1>Node.js v0.7.4 Manual &amp; Documentation</h1>
+          <h1>Node.js v0.7.5 Manual &amp; Documentation</h1>
           <div id="gtoc">
             <p><a href="index.html" name="toc">Index</a> | <a href="all.html">View on single page</a></p>
           </div>
@@ -56,7 +56,7 @@ <h1>Node.js v0.7.4 Manual &amp; Documentation</h1>
             <li><a href="http://twitter.com/nodejs" class="twitter">@nodejs</a></li>
         </ul>
 
-        <p>Copyright 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.7.4/LICENSE">license</a>.</p>
+        <p>Copyright 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.7.5/LICENSE">license</a>.</p>
     </div>
 
   <script src="assets/sh_main.js"></script>

diff --git a/lib/querystring.js b/lib/querystring.js
@@ -192,7 +192,7 @@ QueryString.parse = QueryString.decode = function(qs, sep, eq, options) {
     try {
       k = decodeURIComponent(kstr);
       v = decodeURIComponent(vstr);
-    } catch(e) {
+    } catch (e) {
       k = QueryString.unescape(kstr, true);
       v = QueryString.unescape(vstr, true);
     }

diff --git a/node.gyp b/node.gyp
@@ -54,6 +54,7 @@
 
       'dependencies': [
         'deps/http_parser/http_parser.gyp:http_parser',
+        'deps/v8/tools/gyp/v8.gyp:v8',
         'deps/uv/uv.gyp:uv',
         'deps/zlib/zlib.gyp:zlib',
         'node_js2c#host',
@@ -109,6 +110,8 @@
         'src/stream_wrap.h',
         'src/v8_typed_array.h',
         'deps/http_parser/http_parser.h',
+        'deps/v8/include/v8.h',
+        'deps/v8/include/v8-debug.h',
         '<(SHARED_INTERMEDIATE_DIR)/node_natives.h',
         # javascript files to make for an even more pleasant IDE experience
         '<@(library_files)',
@@ -144,21 +147,6 @@
           ],
         }],
 
-        [ 'node_shared_v8=="true"', {
-          'sources': [
-            '<(node_shared_v8_includes)/v8.h',
-            '<(node_shared_v8_includes)/v8-debug.h',
-          ],
-        }],
-
-        [ 'node_shared_v8=="false"', {
-          'sources': [
-            'deps/v8/include/v8.h',
-            'deps/v8/include/v8-debug.h',
-          ],
-          'dependencies': [ 'deps/v8/tools/gyp/v8.gyp:v8' ],
-        }],
-
         [ 'OS=="win"', {
           'sources': [
             'tools/msvs/res/node.rc',

diff --git a/src/node_version.h b/src/node_version.h
@@ -29,7 +29,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 7
 #define NODE_PATCH_VERSION 5
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)