Merge branch 'dev' of github.com:emqtt/emqtt into dev

CHANGELOG.md

@@ -1,6 +1,11 @@
 eMQTT ChangeLog
 ==================
 
+v0.3.1-beta (2015-01-24)
+------------------------
+
+Feature: HTTP POST API to support 'qos', 'retain' parameters
+
 v0.3.0-alpha (2015-01-18)
 ------------------------
 

README.md

@@ -65,7 +65,7 @@ cd $INSTALL_DIR/emqtt
 
 ```
 
--sname emqtt
+-name emqtt@127.0.0.1
 
 -setcookie emqtt
 
@@ -124,13 +124,13 @@ eMQTT support http to publish message.
 Example:
 
 ```
-curl -v --basic -u user:passwd -d "qos=1&retain=0&topic=/a/b/c&message=hello from http..." -k http://localhost:8883/mqtt/publish
+curl -v --basic -u user:passwd -d "qos=1&retain=0&topic=/a/b/c&message=hello from http..." -k http://localhost:8083/mqtt/publish
 ```
 
 ### URL
 
 ```
-HTTP POST http://host:8883/mqtt/publish
+HTTP POST http://host:8083/mqtt/publish
 ```
 
 ### Parameters
@@ -157,5 +157,6 @@ feng at emqtt.io
 ## Thanks
 
 @hejin1026 (260495915 at qq.com)
+
 @desoulter (assoulter123 at gmail.com)
 

apps/emqtt/src/emqtt_http.erl

@@ -55,7 +55,7 @@ handle('POST', "/mqtt/publish", Req) ->
                                 retain  = Retain,
                                 topic   = Topic,
                                 payload = Message }),
-            Req:ok({"text/plan", <<"ok">>});
+            Req:ok({"text/plan", <<"ok\n">>});
        {false, _} ->
             Req:respond({400, [], <<"Bad QoS">>});
         {_, false} ->