Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jmar777/node
...
head fork: jmar777/node
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 2 contributors
View
7 deps/uv/src/unix/kqueue.c
@@ -69,11 +69,12 @@ static void uv__fs_event(EV_P_ ev_io* w, int revents) {
handle->cb(handle, NULL, events, 0);
- uv__fs_event_stop(handle);
+ if (handle->fd == -1)
+ return;
/* File watcher operates in one-shot mode, re-arm it. */
- if (handle->fd != -1)
- uv__fs_event_start(handle);
+ uv__fs_event_stop(handle);
+ uv__fs_event_start(handle);
}
View
7 lib/net.js
@@ -480,7 +480,7 @@ Socket.prototype.write = function(data, arg1, arg2) {
Socket.prototype._write = function(data, encoding, cb) {
timers.active(this);
- if (!this._handle) throw new Error('This socket is closed.');
+ if (!this._handle) return this.emit('error', new Error('This socket is closed.'));
// `encoding` is unused right now, `data` is always a buffer.
var writeReq = this._handle.write(data);
@@ -886,10 +886,7 @@ function onconnection(clientHandle) {
Server.prototype.close = function(cb) {
- if (!this._handle) {
- // Throw error. Follows net_legacy behaviour.
- throw new Error('Not running');
- }
+ if (!this._handle) return this.emit('error', new Error('This server is not running.'));
if (cb) {
this.once('close', cb);
View
8 test/simple/test-fs-watch.js
@@ -24,14 +24,6 @@ var assert = require('assert');
var path = require('path');
var fs = require('fs');
-
-if (process.platform === 'darwin') {
- assert(false,
- 'This test is known to fail on OS X\n' +
- 'See: https://github.com/joyent/node/issues/2813');
-}
-
-
var expectFilePath = process.platform == 'win32' || process.platform == 'linux';
var watchSeenOne = 0;

No commit comments for this range

Something went wrong with that request. Please try again.