Skip to content

Update Holiday Extras hiring link #1107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ node_js:
- '0.12'
- '1.0'
- '1.8'
- '2.0'

sudo: false

Expand Down
2 changes: 1 addition & 1 deletion Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This file is a manually maintained list of changes for each release. Feel free
to add your changes here when sending pull requests. Also send corrections if
you spot any mistakes.

## HEAD
## v2.7.0 (2015-05-05)

* Destroy/end connections removed from the pool on error
* Delay implied connect until after `.query` argument validation
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ spend more time on it (ordered by time of contribution):
video encoding as a service, check it out)
* [Joyent](http://www.joyent.com/)
* [pinkbike.com](http://pinkbike.com/)
* [Holiday Extras](http://www.holidayextras.co.uk/) (they are [hiring](http://join.holidayextras.co.uk/vacancy/software-engineer/))
* [Holiday Extras](http://www.holidayextras.co.uk/) (they are [hiring](http://join.holidayextras.co.uk/vacancy/software-engineer-5/))
* [Newscope](http://newscope.com/) (they are [hiring](http://www.newscope.com/stellenangebote))

If you are interested in sponsoring a day or more of my time, please
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ environment:
- nodejs_version: "0.12"
- nodejs_version: "1.0"
- nodejs_version: "1.8"
- nodejs_version: "2.0"

services:
- mysql
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "mysql",
"description": "A node.js driver for mysql. It is written in JavaScript, does not require compiling, and is 100% MIT licensed.",
"version": "2.6.2",
"version": "2.7.0",
"license": "MIT",
"author": "Felix Geisendörfer <[email protected]> (http://debuggable.com/)",
"contributors": [
Expand Down
2 changes: 2 additions & 0 deletions test/FakeServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
var timer = setInterval(writeRow.bind(this), 20);

this._socket.on('close', cleanup);
this._socket.on('error', cleanup);

this._sendPacket(new Packets.ResultSetHeaderPacket({
fieldCount: 2
Expand All @@ -366,6 +367,7 @@ FakeConnection.prototype._writePacketStream = function _writePacketStream(count)
function cleanup() {
var socket = this._socket || this;
socket.removeListener('close', cleanup);
socket.removeListener('error', cleanup);
clearInterval(timer);
}

Expand Down
5 changes: 4 additions & 1 deletion test/unit/query/test-streaming-destroy.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ server.listen(common.fakeServerPort, function (err) {
count++;
assert.equal(count, 1);
connection.destroy();
server.destroy();

process.nextTick(function () {
server.destroy();
});
});
});