Commit Graph

  • 701c632e07 Fix issue #1461 - keep the retain flag for new subscription Feng Lee 2018-01-23 11:09:42 +0800
  • a3e97f798b Update Copyright to 2018 Feng Lee 2018-01-16 08:57:46 +0800
  • 43712ea803 Merge branch 'master' into develop Feng Lee 2018-01-12 10:47:36 +0800
  • a1cbdc5122 Update emq.conf and emq.schema Feng Lee 2018-01-12 10:46:35 +0800
  • 56195670c6 Misc fix Feng Lee 2018-01-12 10:45:36 +0800
  • a992b50308
    Merge pull request #1442 from emqtt/emq24 v2.3.3 HeeeJianBo 2018-01-08 13:44:52 +0800
  • 12729771e7
    Merge pull request #1441 from emqtt/develop HeeeJianBo 2018-01-08 13:42:41 +0800
  • 6ad7b46885 Fix failed test HuangDan 2018-01-08 13:39:52 +0800
  • b98d67a6b4
    Merge pull request #1416 from emqtt/emq24 Feng Lee 2018-01-07 15:47:08 +0800
  • b041f05f08
    Merge pull request #1439 from emqtt/develop Feng Lee 2018-01-07 15:19:42 +0800
  • d4d234ca86
    Merge pull request #1429 from mingchuno/fix-broken-readme-link Feng Lee 2018-01-07 15:17:01 +0800
  • bfa9fc675c
    Merge pull request #1420 from HJianBo/issue_1216 Feng Lee 2018-01-07 14:02:54 +0800
  • 8df524c19a
    Merge pull request #1438 from emqtt/develop Feng Lee 2018-01-07 12:55:24 +0800
  • fde905d754
    Merge branch 'emq24' into develop Feng Lee 2018-01-07 12:53:30 +0800
  • 4e7a12a838 Fix #1430 - update the link to emqx-lwm2m project Feng Lee 2018-01-06 15:46:43 +0800
  • a779c9f9cb Add 'listener.wss.external.tls_versions' option Feng Lee 2018-01-04 20:25:26 +0800
  • fdc55de509 Change the type of 'mqtt.bridge.ping_down_interval' to ms duration Feng Lee 2018-01-04 16:09:45 +0800
  • 86fc80b983 Change the type of 'mqtt.broker.sys_interval' to ms duration Feng Lee 2018-01-04 16:09:10 +0800
  • 3a39706d84 Add more options for 'listener.wss.' Feng Lee 2018-01-04 16:05:44 +0800
  • b98a320124 Improve documentation for all options Feng Lee 2018-01-04 15:32:21 +0800
  • b2b78c178c Add documenation for SSL configurations Feng Lee 2018-01-04 12:25:05 +0800
  • 0076032815 fix wrong link in emq-retainer mingchun.or 2018-01-04 11:36:33 +0800
  • d26e746f5d Merge branch 'develop' of github.com:emqtt/emqttd into develop Feng Lee 2018-01-03 22:49:58 +0800
  • a17fae30e2 Add more documentation for MQTT listeners Feng Lee 2018-01-03 22:44:54 +0800
  • 0a7e93ea90 Export funtion fix #1428 turtled 2018-01-03 10:29:51 +0800
  • ad26eff421 Format print log turtled 2018-01-03 10:27:51 +0800
  • 052f9638cb Add more documentation for emq.conf Feng Lee 2018-01-02 20:47:25 +0800
  • 10ed4219db Update documentation for R2 configurations Feng Lee 2017-12-31 15:10:45 +0800
  • 5fbbff46b1 Fix issue #1216, redeliver pubrel packet now HeeeJianBo 2017-12-28 17:57:32 +0800
  • 953a7628a3 Version 2.3.3 Feng Lee 2017-12-28 11:34:29 +0800
  • ed5e4d1857 Change the default value of mqtt.keepalive_backoff to 0.75 Feng Lee 2017-12-27 21:30:17 +0800
  • d8f78c885d
    Merge pull request #1418 from HJianBo/develop Feng Lee 2017-12-27 15:18:16 +0800
  • 4c8b43e05d Improve impletament of emqttd_topic:match/2 HeeeJianBo 2017-12-27 15:11:55 +0800
  • d5c54276e2 Fix issue #1398 HeeeJianBo 2017-12-27 14:55:36 +0800
  • 6d2483d6c0 Merge develop branch to emq24 Feng Lee 2017-12-26 22:17:38 +0800
  • 013cc9705e Depends on ekka v0.2.1 Feng Lee 2017-12-26 22:15:09 +0800
  • bcec25092b Merge version 2.3.2 to X edition Feng Lee 2017-12-26 21:09:24 +0800
  • 985ab723df Support for zone configuration Feng Lee 2017-12-26 21:01:03 +0800
  • 1f2de7492c
    Merge pull request #1411 from emqtt/emq24 v2.3.2 huangdan 2017-12-26 00:45:59 +0800
  • 5aef79b1ad Fixed Conflicting files HuangDan 2017-12-26 00:44:45 +0800
  • a5c9c3c15d Update Makefile Feng Lee 2017-12-25 20:39:50 +0800
  • d5222dcc9b Add proxy_protocol, proxy_protocol_timeout options for ws/wss Feng Lee 2017-12-25 20:38:09 +0800
  • d7e56fa971 Upgrade the esockd library to v5.2 HuangDan 2017-12-25 17:31:23 +0800
  • db954aeb6d Support X.509 certificate based authentication with HAProxy Feng Lee 2017-12-15 19:23:50 +0800
  • 6f64eb469c Remove emqttd_ssl.erl Feng Lee 2017-12-07 17:58:24 +0800
  • b98007659e Merge the master branch Feng Lee 2017-12-07 17:57:18 +0800
  • f452469bc5
    Merge pull request #1388 from emqtt/emq24 Feng Lee 2017-12-07 17:53:58 +0800
  • a728d91cd0
    Merge pull request #1387 from emqtt/develop Feng Lee 2017-12-07 17:52:04 +0800
  • 80e248d753
    Merge pull request #1382 from emqtt/master Feng Lee 2017-12-07 17:48:36 +0800
  • ab6eb500ac
    Merge pull request #1386 from emqtt/peer_cert_as_username Feng Lee 2017-12-07 17:45:40 +0800
  • 73836939c8 Support for TLS with client certificate based authentication Feng Lee 2017-12-07 17:42:32 +0800
  • c8d6e9a012 Update test cases Feng Lee 2017-12-07 16:37:46 +0800
  • a904dfd4f2 Comment the ERTS_MINIMUM macro Feng Lee 2017-12-07 16:26:32 +0800
  • 6e5134a8b2 Merge with the enterprise edition Feng Lee 2017-12-07 16:24:48 +0800
  • f1640f5b85 Merge emq24 to X branch Feng Lee 2017-12-07 11:02:44 +0800
  • 85124242df Merge branch 'emq24' HuangDan 2017-12-06 21:23:38 +0800
  • ceafaad6b7 Update deps branch HuangDan 2017-12-06 21:22:36 +0800
  • 921dba4eb4 Merge branch 'develop' into emq24 HuangDan 2017-12-06 21:20:30 +0800
  • 896088b7e8 Router test cases migration from emqttd_SUITE to emqttd_route_SUITE HuangDan 2017-12-06 21:09:03 +0800
  • 0ba8d3e11d Depends on develop branch of esockd and mochiweb Feng Lee 2017-12-06 20:13:27 +0800
  • dd72083da5
    Merge pull request #1380 from emqtt/emq24 huangdan 2017-12-06 15:55:19 +0800
  • b5c063f3cb
    Merge pull request #1379 from emqtt/develop huangdan 2017-12-06 15:52:55 +0800
  • 4c52d99706 Fixed test cases for emqttd_router_SUITE HuangDan 2017-12-06 15:47:46 +0800
  • 9f1c3a5899 Compatible with esockd 4.x Feng Lee 2017-12-06 14:42:26 +0800
  • bcf345efbe Fix compile fail turtled 2017-12-06 10:27:55 +0800
  • ddf2965651 Rm emqttd.app.src turtled 2017-12-06 10:26:19 +0800
  • 24f05adb1a Fix compile fail turtled 2017-12-06 10:19:46 +0800
  • c3c5589452 Version 2.3.2 Feng Lee 2017-12-06 10:01:42 +0800
  • a86fe1c066
    Merge pull request #1376 from emqtt/send_timeout Feng Lee 2017-12-06 09:40:03 +0800
  • 51533dbe9e Shutdown the connection if an error occurred when sending data Feng Lee 2017-12-05 23:41:40 +0800
  • 8e41aeeeb8 Add send_timeout, send_timeout_close options Feng Lee 2017-12-05 19:47:17 +0800
  • a42fcb2c39 Fix conflicts turtled 2017-12-05 16:34:18 +0800
  • 37b7e6aee4
    Merge pull request #1369 from emqtt/emq24 v2.3.1 huangdan 2017-12-03 02:20:53 +0800
  • e3161619c6
    Merge pull request #1367 from emqtt/develop huangdan 2017-12-03 00:54:07 +0800
  • b8e0a4d5c4 Bump version to 2.3.1 HuangDan 2017-12-03 00:16:26 +0800
  • 0fe530a502 Depends on the develop branch of mochiweb Feng Lee 2017-12-02 18:00:56 +0800
  • bceb72853d Fix issue #1335 - Forward real client IP using a reverse proxy for websocket Feng Lee 2017-12-02 17:59:29 +0800
  • 4915195b1e Fix issue #1335 - Forward real client IP using a reverse proxy for websocket Feng Lee 2017-12-02 17:59:16 +0800
  • a5e06308e5
    Merge pull request #1366 from HJianBo/ws_proxy Feng Lee 2017-12-02 12:35:04 +0800
  • 0716b2b2d0 Enable the stats of session by default Feng Lee 2017-12-02 12:13:55 +0800
  • 70570dd943 Merge branch 'develop' into ws_proxy HeeeJianBo 2017-12-01 22:22:20 +0800
  • 5006dbba6e Add ws/wss proxy cofingurations for getting client original ip address HeeeJianBo 2017-12-01 22:12:27 +0800
  • c308037b1a Remove the unnecessary transactions to optimize session management Feng Lee 2017-12-01 17:16:59 +0800
  • d2a4e2c615 Should not exit arbitrarily if clientid conflicts in mnesia Feng Lee 2017-12-01 15:46:42 +0800
  • d9500412bf Update the topic's statistics Feng Lee 2017-12-01 09:10:46 +0800
  • ee5c33d0bd Fix the 'no function clause' exception for issue #1293 Feng Lee 2017-11-29 22:23:59 +0800
  • 26fb809dbe Fix issue#1293 - the retained flags should be propagated for bridge. Feng Lee 2017-11-29 14:09:46 +0800
  • 2611f660de Fix issue #1353 - the management API should listen on 0.0.0:8080 Feng Lee 2017-11-29 10:45:40 +0800
  • aaf19787af Remove the duplicated InfoHandler Feng Lee 2017-11-22 18:11:21 +0800
  • 99ed0e46b6 Remove RPC args Feng Lee 2017-11-22 17:07:11 +0800
  • 223f3d4da5 Remove RPC configurations Feng Lee 2017-11-22 16:44:00 +0800
  • 38c33e9c8b Merge with emqx Feng Lee 2017-11-21 22:41:05 +0800
  • 845c5eddc1 Merge with emqx Feng Lee 2017-11-21 22:41:02 +0800
  • e52c303014 Merge develop to X Feng Lee 2017-11-21 14:25:35 +0800
  • 2cec86eba7 Merge with version 2.3.0 Feng Lee 2017-11-21 14:14:12 +0800
  • db3a54e31a Fast close the invalid websocket in init/1 function Feng Lee 2017-11-20 14:15:51 +0800
  • 14771cdaee Fix issue #1340 - erlang:demonitor/1 the reference when erasing the monitor Feng Lee 2017-11-20 10:10:32 +0800
  • cb30f69a13
    Merge pull request #1343 from emqtt/emq24 v2.3.0 huangdan 2017-11-19 04:01:04 -0600
  • 6c5d2e7d69
    Merge pull request #1325 from emqtt/develop huangdan 2017-11-19 00:55:59 -0600
  • d794273bdb Merge the test cases Feng Lee 2017-11-19 14:27:26 +0800