Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-22 16:15:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix messages with an expiry interval missing the property.

Browse Source 
They would be be sent without an expiry interval property just before
they were expired.

Closes #1464. Thanks to Dustin Sallings.
This commit is contained in:
Roger A. Light
2019-10-31 12:56:13 +00:00
parent 06a27e799f
commit b622aaeee4
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.txt
+2
View File
@@ -11,6 +11,8 @@ Broker:
Closes #1459.
- Fix retained messages with an expiry interval not being expired after being
restored from persistence. Closes #1464.
- Fix messages with an expiry interval being sent without an expiry interval
property just before they were expired. Closes #1464.
Client library:
- Fix publish properties not being passed to on_message_v5 callback for QoS 2
src/subs.c
+1 -1
View File
@@ -987,7 +987,7 @@ static int retain__process(struct mosquitto_db *db, struct mosquitto__subhier *b
mosquitto_property *properties = NULL;
struct mosquitto_msg_store *retained;
if(branch->retained->message_expiry_time > 0 && now > branch->retained->message_expiry_time){
if(branch->retained->message_expiry_time > 0 && now >= branch->retained->message_expiry_time){
db__msg_store_ref_dec(db, &branch->retained);
branch->retained = NULL;
#ifdef WITH_SYS_TREE