Skip to content

Commit

Permalink
Merge pull request amqp-node#475 from squaremo/prep-v0.5.3
Browse files Browse the repository at this point in the history
Prep v0.5.3
  • Loading branch information
cressie176 authored Dec 2, 2018
2 parents 4cff063 + 8f0d5df commit c28c176
Show file tree
Hide file tree
Showing 6 changed files with 765 additions and 9 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ node_js:
- "8.9"
- "9.11"
- "10.10"
- "11.1"
- "node"

services:
Expand Down
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,49 @@
# Change log for amqplib

## Changes in v0.5.3

git log v0.5.2..v0.5.3

* Bump bitsyntax to remove some `Buffer` misuse deprecation notices
([PR 480])(https://github.com/squaremo/amqp.node/pull/480)
* Test on node 11.1
([PR 473])(https://github.com/squaremo/amqp.node/pull/464); thanks
@kibertoad
* Updated various dependencies
* Support queue mode during assertQueue
([PR 464])(https://github.com/squaremo/amqp.node/pull/464); thanks
@JoeTheFkingFrypan
* Expose serverProperties in the connection object
([PR 452])(https://github.com/squaremo/amqp.node/pull/452); thanks
@jfromaniello
* Test on Node 10
([PR 454])(https://github.com/squaremo/amqp.node/pull/454); thanks
@kibertoad
* Support amqplain credentials
([PR 451])(https://github.com/squaremo/amqp.node/pull/451); thanks
@jfromaniello
* Decorate channel errors with methodId and classId
([PR 447])(https://github.com/squaremo/amqp.node/pull/447); thanks
@MitMaro
* Resolve issues caused by Node 10 `readable` changes
([PR 442])(https://github.com/squaremo/amqp.node/pull/442)
* Bump uglify to 2.6.x and node to 9.1 due to nodejs/node#16781.
([PR 439])(https://github.com/squaremo/amqp.node/pull/439)
* Updated README with more modern Buffer syntax
([PR 438](https://github.com/squaremo/amqp.node/pull/438); thanks
@ravshansbox
* Support overflow option to assert queue
([PR 436])(https://github.com/squaremo/amqp.node/pull/436); thanks
to @honestserpent
* Replace instances of keyword `await`
([PR 396])(https://github.com/squaremo/amqp.node/pull/396),
as discussed in
[issue 235](https://github.com/squaremo/amqp.node/issues/235)
* Use 3rd party url for better decoding of username/password
([PR 395])(https://github.com/squaremo/amqp.node/pull/395),
as discussed in
[issue 385](https://github.com/squaremo/amqp.node/issues/385))

## Changes in v0.5.2

git log v0.5.1..v0.5.2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ JSON=amqp-rabbitmq-0.9.1.json
RABBITMQ_CODEGEN=https://raw.githubusercontent.com/rabbitmq/rabbitmq-codegen
AMQP_JSON=$(RABBITMQ_CODEGEN)/$(RABBITMQ_SRC_VERSION)/$(JSON)

NODEJS_VERSIONS='0.8' '0.9' '0.10' '0.11' '0.12' '1.6' '2.5' '3.3' '4.2' '5.5' '6.2' '8.9' '9.11' '10.7'
NODEJS_VERSIONS='0.8' '0.9' '0.10' '0.11' '0.12' '1.6' '2.5' '3.3' '4.2' '5.5' '6.2' '8.9' '9.11' '10.7' '11.1'

MOCHA=./node_modules/.bin/mocha
_MOCHA=./node_modules/.bin/_mocha
Expand Down
6 changes: 3 additions & 3 deletions lib/channel.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ C.toClosing = function(capturedStack, k) {
};

C._rejectPending = function() {
function rej(r) {
function rej(r) {
r(new Error("Channel ended, no reply will be forthcoming"));
}
if (this.reply !== null) rej(this.reply);
Expand Down Expand Up @@ -293,15 +293,15 @@ function acceptMessage(continuation) {
if (f.id === defs.BasicProperties) {
message.properties = f.fields;
totalSize = remaining = f.size;

// for zero-length messages, content frames aren't required.
if (totalSize === 0) {
message.content = Buffer.alloc(0);
continuation(message);
return acceptDeliveryOrReturn;
}
else {
return content;
return content;
}
}
else {
Expand Down
Loading

0 comments on commit c28c176

Please sign in to comment.