yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into emq20

This commit is contained in:
Feng Lee 2017-01-12 11:01:17 +08:00 committed by GitHub
parent 96d053dbd1 0cd4afaa8e
commit a5de6d0d1a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/emq.conf
View File

@ -234,6 +234,7 @@ mqtt.listener.https.handshake_timeout = 15
mqtt.listener.https.keyfile = {{ runner_etc_dir }}/certs/key.pem mqtt.listener.https.keyfile = {{ runner_etc_dir }}/certs/key.pem
mqtt.listener.https.certfile = {{ runner_etc_dir }}/certs/cert.pem mqtt.listener.https.certfile = {{ runner_etc_dir }}/certs/cert.pem
## mqtt.listener.https.cacertfile = {{ runner_etc_dir }}/certs/cacert.pem ## mqtt.listener.https.cacertfile = {{ runner_etc_dir }}/certs/cacert.pem
## mqtt.listener.https.verify = verify_peer ## mqtt.listener.https.verify = verify_peer
## mqtt.listener.https.fail_if_no_peer_cert = true ## mqtt.listener.https.fail_if_no_peer_cert = true

2
src/emqttd_http.erl
View File

@ -98,7 +98,7 @@ http_publish(Req) ->
Msg = emqttd_message:make(ClientId, Qos, Topic, Payload), Msg = emqttd_message:make(ClientId, Qos, Topic, Payload),
emqttd:publish(Msg#mqtt_message{retain = Retain}) emqttd:publish(Msg#mqtt_message{retain = Retain})
end, Topics), end, Topics),
Req:ok({"text/plain", <<"ok">>}); Req:ok({"text/plain", <<"OK">>});
{false, _} -> {false, _} ->
Req:respond({400, [], <<"Bad QoS">>}); Req:respond({400, [], <<"Bad QoS">>});
{_, false} -> {_, false} ->