Commit Graph

20511 Commits

Author SHA1 Message Date
Feng Lee 0b13cd78e6 Version 2.2 2017-03-22 10:48:24 +08:00
Feng Lee f0e6fc16c7 Version 2.2 2017-03-22 10:48:12 +08:00
Feng Lee ee79412007 Merge pull request #778 from emqtt/proxy-protocol
Support Proxy protocol V1/2
2017-03-22 10:20:57 +08:00
Feng Lee 942edad3c5 Merge branch 'emq22' into proxy-protocol 2017-03-22 10:18:44 +08:00
Feng Lee b3cb875eb2 Depends on the 'emq22' branch of esockd, mochiweb 2017-03-22 10:13:17 +08:00
黄丹 e56ba41027 Update arg sslopts 2017-03-16 10:03:58 +08:00
Feng Lee 076b3c0068 Upgrade esockd library to v4.2 2017-03-13 17:10:54 +08:00
Feng Lee 3ebcb71e9f Upgrade esockd library to v4.2 2017-03-13 17:03:34 +08:00
Feng Lee dbbe499769 Merge pull request #943 from emqtt/emq20
Version 2.1.0-beta.2 updates
2017-03-13 16:56:39 +08:00
Feng Lee ecbc1cf56b Format the 'dep_' lines 2017-03-13 16:51:46 +08:00
Feng Lee b5446ceb4d Change the 'ssl' to 'sslopts' 2017-03-13 16:35:36 +08:00
Feng Lee 764e506f8d Merge branch 'emq20' of github.com:emqtt/emqttd into emq20 2017-03-13 16:32:32 +08:00
Feng Lee d31a0ea7dc Merge pull request #944 from emqtt/develop
V2.1.0-beta.2: Add more test cases
2017-03-13 16:31:58 +08:00
Feng Lee f48def7657 Merge branch 'emq20' of github.com:emqtt/emqttd into emq20 2017-03-13 16:31:13 +08:00
Feng Lee 2e6e97b006 Fix the syntax error 2017-03-13 16:30:41 +08:00
HuangDan 433c2304ac Merge branch 'emq20' into develop 2017-03-13 16:08:32 +08:00
HuangDan 524dce40dd Fix test case 2017-03-13 16:08:22 +08:00
Feng Lee c17d936b20 Merge branch 'master' into emq20 2017-03-13 16:03:37 +08:00
Feng Lee 1de9496b4e Upgrade Erlang/OTP to R19+ 2017-03-13 16:01:48 +08:00
Feng Lee 82bb7766ac Add env, maintainers, licenses properties 2017-03-13 15:55:00 +08:00
Feng Lee d099d0b53c Add emqttd_gc:maybe_force_gc/3 API and tune the min hibernate interval 2017-03-13 15:36:58 +08:00
Feng Lee 6557dbe967 Change 'ssl' option to 'sslopts' 2017-03-13 15:08:29 +08:00
Feng Lee 056dc747ad Depend on emq20 branch of esockd library 2017-03-13 14:56:59 +08:00
Feng Lee 05396f0ade Add pbkdf2 dependencies and fix the building errors 2017-03-13 13:30:49 +08:00
Feng Lee 90e46325df Fix the crash caused by keepalive:start/3 2017-03-13 12:42:02 +08:00
Feng Lee 0df59934c7 Fix the GPROC_POOL macro 2017-03-13 12:14:57 +08:00
Feng Lee bb91bc04c6 Merge pull request #941 from callbay/issue#935
Fix Issue#935
2017-03-13 11:41:22 +08:00
Feng Lee 9b6c91cbad Merge pull request #940 from emqtt/emq20
V2.1.0-beta.2:Support pbkdf2 hash
2017-03-13 10:13:09 +08:00
Frank Feng 7cb3b7ca8a Id -> I 2017-03-12 23:07:45 +08:00
Frank Feng 6472457342 Match {error,einval} 2017-03-12 23:06:57 +08:00
huangpengju 61a71e7559 update emqttd_auth_mod.erl code format 2017-03-12 11:49:26 +08:00
Feng Lee bd8b446a54 Merge pull request #938 from emqtt/pbkdf2
Support pbkdf2 hash
2017-03-10 08:21:14 +08:00
huangpengju b5ff80499a Update emqttd_auth_mod.erl 2017-03-09 09:29:31 +08:00
huangpengju 78b0f66910 Update Makefile 2017-03-09 09:29:03 +08:00
huangpengju 25c25826a7 Update Makefile 2017-03-09 09:28:28 +08:00
huangpj fba79b3e25 support pbkdf2 2017-03-08 18:01:59 +08:00
Feng Lee e008d149d3 Update comments and misc fix 2017-03-06 18:57:29 +08:00
Feng Lee 7c90e08f57 Fix the subscrptions print 2017-03-06 18:48:29 +08:00
Feng Lee 14d28d59bd Rename the 'Timestamp' variable to 'TS' 2017-03-06 18:47:50 +08:00
Feng Lee f2a818a4a4 Rename the PUBSUB macro to PS 2017-03-06 18:46:09 +08:00
Feng Lee dae3d22bef Remove the io:format line 2017-03-06 18:43:44 +08:00
Feng Lee 99c83dbe21 Add 'mqtt.listener.tcp.tune_buffer' config 2017-03-06 18:28:16 +08:00
Feng Lee 35e08df735 Change the default QoS of will message to QOS_1 2017-03-06 18:17:07 +08:00
Feng Lee c3919a64e6 Format 'trie_node' record 2017-03-06 18:13:07 +08:00
Feng Lee 98e15ebbf4 Prepare for MQTT/5.0 2017-03-06 18:11:09 +08:00
Feng Lee 3d0bc15e93 Use the '?assertEqual' macro and update Copyright info 2017-03-06 18:06:15 +08:00
huangdan 4de8c0921e Add test case 2017-03-04 16:23:13 +08:00
turtleDeng 80a7cbf09e Merge pull request #930 from buxizhizhoum/master
Edit the note of tick timer
2017-03-04 11:47:34 +08:00
buxizhizhoum 93719a13f3 Edit the note of tick timer 2017-03-03 22:05:26 +08:00
Feng Lee c412f6d5ed Merge pull request #920 from phanimahesh/master
Please add src/emqttd.app.src
2017-02-27 23:57:42 +08:00