diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-06-05 07:28:39 -0700 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-06-05 07:28:39 -0700 |
| commit | 9920ae67b53283192a7396cad63f6d92b80f1a95 (patch) | |
| tree | 3c89c24c7a7759f9f46ff5e0eacd6c371ef1b562 /test/message | |
| parent | 2f8627528b7fa389793d1be68de3b27ebfbc3748 (diff) | |
| parent | a7dd0e51f326dfcc478cc897033e0cd7de62b65d (diff) | |
| download | node-new-9920ae67b53283192a7396cad63f6d92b80f1a95.tar.gz | |
Merge branch 'v0.10'
Conflicts:
ChangeLog
lib/events.js
lib/tls.js
src/node_constants.cc
src/node_crypto.cc
src/node_crypto.h
src/node_version.h
Diffstat (limited to 'test/message')
| -rw-r--r-- | test/message/stdin_messages.out | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/message/stdin_messages.out b/test/message/stdin_messages.out index ac5996e54f..de9da7f04c 100644 --- a/test/message/stdin_messages.out +++ b/test/message/stdin_messages.out @@ -9,7 +9,7 @@ SyntaxError: Strict mode code may not include a with statement at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket.<anonymous> (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) 42 @@ -25,7 +25,7 @@ Error: hello at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket.<anonymous> (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) @@ -39,7 +39,7 @@ Error: hello at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket.<anonymous> (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) 100 @@ -54,7 +54,7 @@ ReferenceError: y is not defined at Module._compile (module.js:*:*) at evalScript (node.js:*:*) at Socket.<anonymous> (node.js:*:*) - at Socket.EventEmitter.emit (events.js:*:*) + at Socket.emit (events.js:*:*) at _stream_readable.js:*:* at process._tickCallback (node.js:*:*) |