amqplib 0.10.0 → 0.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,6 +1,16 @@
1
1
  # Change log for amqplib
2
2
 
3
- ## Chagnes in v0.10.0
3
+ ## Changes in v0.10.1
4
+
5
+ git log v0.10.0..v0.10.1
6
+
7
+ * Allow servername to be specified via socket options as discussed in as discussed in
8
+ [issue 697](https://github.com/squaremo/amqp.node/issues/697)
9
+
10
+ ## Changes in v0.10.0
11
+
12
+ git log v0.9.1..v0.10.0
13
+
4
14
  * Use Native promises ([PR
5
15
  689](https://github.com/amqp-node/amqplib/pull/689), thank you
6
16
  @mohd-akram and @kibertoad)
package/lib/connect.js CHANGED
@@ -106,7 +106,7 @@ function connect(url, socketOptions, openCallback) {
106
106
  if (typeof url === 'object') {
107
107
  protocol = (url.protocol || 'amqp') + ':';
108
108
  sockopts.host = url.hostname;
109
- sockopts.servername = url.hostname;
109
+ sockopts.servername = sockopts.servername || url.hostname;
110
110
  sockopts.port = url.port || ((protocol === 'amqp:') ? 5672 : 5671);
111
111
 
112
112
  var user, pass;
@@ -131,7 +131,7 @@ function connect(url, socketOptions, openCallback) {
131
131
  var parts = URL(url, true); // yes, parse the query string
132
132
  protocol = parts.protocol;
133
133
  sockopts.host = parts.hostname;
134
- sockopts.servername = parts.hostname;
134
+ sockopts.servername = sockopts.servername || parts.hostname;
135
135
  sockopts.port = parseInt(parts.port) || ((protocol === 'amqp:') ? 5672 : 5671);
136
136
  var vhost = parts.pathname ? parts.pathname.substr(1) : null;
137
137
  fields = openFrames(vhost, parts.query, sockopts.credentials || credentialsFromUrl(parts), extraClientProperties);
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "amqplib",
3
3
  "homepage": "http://amqp-node.github.io/amqplib/",
4
4
  "main": "./channel_api.js",
5
- "version": "0.10.0",
5
+ "version": "0.10.1",
6
6
  "description": "An AMQP 0-9-1 (e.g., RabbitMQ) library and client.",
7
7
  "repository": {
8
8
  "type": "git",