From d1ae4436500b9d2b9509a17f2272121ed1c2eb0e Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 29 May 2015 16:05:17 +0800 Subject: [PATCH 1/4] 0.8.1 --- apps/emqtt/src/emqtt.app.src | 2 +- apps/emqttd/src/emqttd.app.src | 2 +- rel/reltool.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/emqtt/src/emqtt.app.src b/apps/emqtt/src/emqtt.app.src index 656a62d5b..488ebbb8e 100644 --- a/apps/emqtt/src/emqtt.app.src +++ b/apps/emqtt/src/emqtt.app.src @@ -1,7 +1,7 @@ {application, emqtt, [ {description, "Erlang MQTT Common Library"}, - {vsn, "0.9.0"}, + {vsn, "0.8.1"}, {modules, []}, {registered, []}, {applications, [ diff --git a/apps/emqttd/src/emqttd.app.src b/apps/emqttd/src/emqttd.app.src index 4decbcf7a..b7459e519 100644 --- a/apps/emqttd/src/emqttd.app.src +++ b/apps/emqttd/src/emqttd.app.src @@ -1,7 +1,7 @@ {application, emqttd, [ {description, "Erlang MQTT Broker"}, - {vsn, "0.9.0"}, + {vsn, "0.8.1"}, {modules, []}, {registered, []}, {applications, [kernel, diff --git a/rel/reltool.config b/rel/reltool.config index 9deb03833..ace833401 100644 --- a/rel/reltool.config +++ b/rel/reltool.config @@ -4,7 +4,7 @@ {lib_dirs, ["../apps", "../deps", "../plugins"]}, {erts, [{mod_cond, derived}, {app_file, strip}]}, {app_file, strip}, - {rel, "emqttd", "0.9.0", + {rel, "emqttd", "0.8.1", [ kernel, stdlib, From 37a89c3a443885354d88d494e4053eeb59904aca Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 29 May 2015 16:07:43 +0800 Subject: [PATCH 2/4] allow all for websocket --- rel/files/emqttd.config | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rel/files/emqttd.config b/rel/files/emqttd.config index 628c53bc1..39e92334e 100644 --- a/rel/files/emqttd.config +++ b/rel/files/emqttd.config @@ -174,10 +174,7 @@ %% Maximum number of concurrent clients {max_clients, 512}, %% Socket Access Control - {access, [ - {allow, "127.0.0.1"}, - {deny, all} - ]}, + {access, [{allow, all}]}, %% Socket Options {sockopts, [ {backlog, 1024} From a5e594e1e3c5ed0eeecc34acaa7e3df17e00fcf1 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 29 May 2015 16:32:48 +0800 Subject: [PATCH 3/4] 0.8.1 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c1610db3..c32652458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,15 @@ emqttd ChangeLog 0.8.1-alpha (2015-05-28) ------------------------- +Client [Presence](https://github.com/emqtt/emqttd/wiki/Presence) Support and [$SYS Topics](https://github.com/emqtt/emqttd/wiki/$SYS-Topics) Redesigned! + Bugfix: issue #138 - when client disconnected normally, broker will not publish disconnected $SYS message Bugfix: fix websocket url in emqttd/priv/www/websocket.html -Improve: issue #136 - $SYS topics result should not include $SYS messages +Improve: etc/emqttd.config to allow websocket connections from any hosts + +Improve: rel/reltool.config to exclude unnecessary apps. 0.8.0-alpha (2015-05-25) From dabddbb6d4ff6c4339bcdfb26e672f7bd8b03059 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Fri, 29 May 2015 16:36:39 +0800 Subject: [PATCH 4/4] up --- tests/org.eclipse.paho.mqtt.testing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/org.eclipse.paho.mqtt.testing b/tests/org.eclipse.paho.mqtt.testing index 17afdf7fb..bdc690db8 160000 --- a/tests/org.eclipse.paho.mqtt.testing +++ b/tests/org.eclipse.paho.mqtt.testing @@ -1 +1 @@ -Subproject commit 17afdf7fb8e148f376d63592bbf3dd4ccdf19e84 +Subproject commit bdc690db847cec1c682e604dca571c72ff756305