Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v0.8'
Browse files Browse the repository at this point in the history 
Conflicts:
	configure
	deps/v8/build/common.gypi
  • Loading branch information
@bnoordhuis
bnoordhuis committed Oct 25, 2012
2 parents fa94f0f + 4b8629d commit 9b61f57
Show file tree
Hide file tree
Showing 6 changed files with 189 additions and 12 deletions.
8 changes: 8 additions & 0 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,12 @@ parser.add_option("--ninja",
dest="use_ninja",
help="Generate files for the ninja build system")

# Using --unsafe-optimizations voids your warranty.
parser.add_option("--unsafe-optimizations",
action="store_true",
dest="unsafe_optimizations",
help=optparse.SUPPRESS_HELP)

(options, args) = parser.parse_args()


Expand Down Expand Up @@ -344,6 +350,8 @@ def configure_node(o):
o['variables']['v8_no_strict_aliasing'] = 1 # work around compiler bugs
o['variables']['node_prefix'] = os.path.expanduser(options.prefix or '')
o['variables']['node_install_npm'] = b(not options.without_npm)
o['variables']['node_unsafe_optimizations'] = (
1 if options.unsafe_optimizations else 0)
o['default_configuration'] = 'Debug' if options.debug else 'Release'

host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
Expand Down
9 changes: 0 additions & 9 deletions deps/v8/build/common.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,6 @@
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
or OS=="android"', {
'cflags!': [
'-O2',
'-Os',
],
'cflags': [
'-fdata-sections',
'-ffunction-sections',
'-O3',
],
'conditions': [
[ 'gcc_version==44 and clang==0', {
'cflags': [
Expand Down
2 changes: 2 additions & 0 deletions doc/api/child_process.markdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ there is no IPC channel keeping it alive. When calling this method the
for stdio. (See below)
* `env` {Object} Environment key-value pairs
* `detached` {Boolean} The child will be a process group leader. (See below)
* `uid` {Number} Sets the user identity of the process. (See setuid(2).)
* `gid` {Number} Sets the group identity of the process. (See setgid(2).)
* return: {ChildProcess object}

Launches a new process with the given `command`, with command line arguments in `args`.
Expand Down
87 changes: 87 additions & 0 deletions doc/blog/release/v0.9.3.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
category: release
version: v0.9.3
date: Wed Oct 24 10:04:08 PDT 2012
slug: node-v0.9.3
title: Node v0.9.3 (Unstable)

2012.10.24, Version 0.9.3 (Unstable)

* V8: Upgrade to 3.13.7.4

* crypto: Default to buffers instead of binary strings (isaacs, Fedor Indutny)

* crypto: add getHashes() and getCiphers() (Ben Noordhuis)

* unix: add custom thread pool, remove libeio (Ben Noordhuis)

* util: make `inspect()` accept an "options" argument (Nathan Rajlich)

* https: fix renegotation attack protection (Ben Noordhuis)

* cluster: make 'listening' handler see actual port (Aaditya Bhatia)

* windows: use USERPROFILE to get the user's home dir (Bert Belder)

* path: add platform specific path delimiter (Paul Serby)

* http: add response.headersSent property (Pavel Lang)

* child_process: make .fork()'d child auto-exit (Ben Noordhuis)

* events: add 'removeListener' event (Ben Noordhuis)

* string_decoder: Add 'end' method, do base64 properly (isaacs)

* buffer: include encoding value in exception when invalid (Ricky Ng-Adam)

* http: make http.ServerResponse no longer emit 'end' (isaacs)

* streams: fix pipe is destructed by 'end' from destination (koichik)


Source Code: http://nodejs.org/dist/v0.9.3/node-v0.9.3.tar.gz

Macintosh Installer (Universal): http://nodejs.org/dist/v0.9.3/node-v0.9.3.pkg

Windows Installer: http://nodejs.org/dist/v0.9.3/node-v0.9.3-x86.msi

Windows x64 Installer: http://nodejs.org/dist/v0.9.3/x64/node-v0.9.3-x64.msi

Windows x64 Files: http://nodejs.org/dist/v0.9.3/x64/

Linux 32-bit Binary: http://nodejs.org/dist/v0.9.3/node-v0.9.3-linux-x86.tar.gz

Linux 64-bit Binary: http://nodejs.org/dist/v0.9.3/node-v0.9.3-linux-x64.tar.gz

Solaris 32-bit Binary: http://nodejs.org/dist/v0.9.3/node-v0.9.3-sunos-x86.tar.gz

Solaris 64-bit Binary: http://nodejs.org/dist/v0.9.3/node-v0.9.3-sunos-x64.tar.gz

Other release files: http://nodejs.org/dist/v0.9.3/

Website: http://nodejs.org/docs/v0.9.3/

Documentation: http://nodejs.org/docs/v0.9.3/api/

Shasums:

```
188b3ffacdc4342dc3c34e7ea8374acc3e186df0 node-v0.9.3-darwin-x64.tar.gz
94ae90f06a5bf72bb6efa8053c0beefde21f8bd7 node-v0.9.3-darwin-x86.tar.gz
ccb065fe242f15ffe35ecd7b22db33d11d6a5951 node-v0.9.3-linux-x64.tar.gz
0febfb1c37a3560b0140f7f952042aa4b4712974 node-v0.9.3-linux-x86.tar.gz
4362fdfefa0ed2985045883cea51ab802555c24c node-v0.9.3-sunos-x64.tar.gz
f43b6ce2a5da3bb384f6c115826cd2fea5f4bc2c node-v0.9.3-sunos-x86.tar.gz
ff6a7f8ff1a6d1af299a2702e09eec2cdfef474a node-v0.9.3-x86.msi
d47f953ee97047e1202350db2b11fb880ce2809b node-v0.9.3.pkg
34b7406e1da49bf0f0967e5a084157fdf8735078 node-v0.9.3.tar.gz
d0829f57b8460807cf58b2154b16176ef68189b1 node.exe
76007380d1f5cefd772b5890cd64f409ba85893e node.exp
fbe95014f9f4e2c5a38bc67b75511683f4a17fa9 node.lib
8c405af98ce922bf9bd82d29723aa343f3ca5488 node.pdb
04c1dce1188f4c52adfda0bc8219c478ed6553a8 x64/node-v0.9.3-x64.msi
fe6af3bd1405ecdef826a31a7c1333819aab4f3b x64/node.exe
abc9afb5ac40276346072f85601bd1a9e5135856 x64/node.exp
41622dce275f0f0f740485cca8d86ba3e63c884e x64/node.lib
8c34040ba4aa916d13c8313514cf93f99f5e3e34 x64/node.pdb
```
4 changes: 2 additions & 2 deletions lib/url.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ var protocolPattern = /^([a-z0-9.+-]+:)/i,
.concat(unwise).concat(autoEscape),
nonAuthChars = ['/', '@', '?', '#'].concat(delims),
hostnameMaxLen = 255,
hostnamePartPattern = /^[a-zA-Z0-9][a-z0-9A-Z_-]{0,62}$/,
hostnamePartStart = /^([a-zA-Z0-9][a-z0-9A-Z_-]{0,62})(.*)$/,
hostnamePartPattern = /^[a-z0-9A-Z_-]{0,63}$/,
hostnamePartStart = /^([a-z0-9A-Z_-]{0,63})(.*)$/,
// protocols that can allow "unsafe" and "unwise" chars.
unsafeProtocol = {
'javascript': true,
Expand Down
91 changes: 90 additions & 1 deletion test/simple/test-url.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,96 @@ var parseTests = {
'hash': '#abc',
'pathname': '/a/b',
'path': '/a/b?a=b'
}
},

'http://-lovemonsterz.tumblr.com/rss': {
'protocol': 'http:',
'slashes': true,
'host': '-lovemonsterz.tumblr.com',
'hostname': '-lovemonsterz.tumblr.com',
'href': 'http://-lovemonsterz.tumblr.com/rss',
'pathname': '/rss',
'path': '/rss',
},

'http://-lovemonsterz.tumblr.com:80/rss': {
'protocol': 'http:',
'slashes': true,
'port': '80',
'host': '-lovemonsterz.tumblr.com:80',
'hostname': '-lovemonsterz.tumblr.com',
'href': 'http://-lovemonsterz.tumblr.com:80/rss',
'pathname': '/rss',
'path': '/rss',
},

'http://user:[email protected]/rss': {
'protocol': 'http:',
'slashes': true,
'auth': 'user:pass',
'host': '-lovemonsterz.tumblr.com',
'hostname': '-lovemonsterz.tumblr.com',
'href': 'http://user:[email protected]/rss',
'pathname': '/rss',
'path': '/rss',
},

'http://user:[email protected]:80/rss': {
'protocol': 'http:',
'slashes': true,
'auth': 'user:pass',
'port': '80',
'host': '-lovemonsterz.tumblr.com:80',
'hostname': '-lovemonsterz.tumblr.com',
'href': 'http://user:[email protected]:80/rss',
'pathname': '/rss',
'path': '/rss',
},

'http://_jabber._tcp.google.com/test': {
'protocol': 'http:',
'slashes': true,
'host': '_jabber._tcp.google.com',
'hostname': '_jabber._tcp.google.com',
'href': 'http://_jabber._tcp.google.com/test',
'pathname': '/test',
'path': '/test',
},

'http://user:pass@_jabber._tcp.google.com/test': {
'protocol': 'http:',
'slashes': true,
'auth': 'user:pass',
'host': '_jabber._tcp.google.com',
'hostname': '_jabber._tcp.google.com',
'href': 'http://user:pass@_jabber._tcp.google.com/test',
'pathname': '/test',
'path': '/test',
},

'http://_jabber._tcp.google.com:80/test': {
'protocol': 'http:',
'slashes': true,
'port': '80',
'host': '_jabber._tcp.google.com:80',
'hostname': '_jabber._tcp.google.com',
'href': 'http://_jabber._tcp.google.com:80/test',
'pathname': '/test',
'path': '/test',
},

'http://user:pass@_jabber._tcp.google.com:80/test': {
'protocol': 'http:',
'slashes': true,
'auth': 'user:pass',
'port': '80',
'host': '_jabber._tcp.google.com:80',
'hostname': '_jabber._tcp.google.com',
'href': 'http://user:pass@_jabber._tcp.google.com:80/test',
'pathname': '/test',
'path': '/test',
},

};

for (var u in parseTests) {
Expand Down

0 comments on commit 9b61f57

Please sign in to comment.