Fix qos0 messages not being queued when queue_qos0_message enabled.

Closes #2224. Thanks to Luigi Caiffa.
eclipse · Jun 9, 2021 · 99d7299 · 99d7299
1 parent ea7e2a6
commit 99d7299
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -15,6 +15,8 @@ Broker:
 - Fix non-reachable bridge blocking the broker on Windows. Closes #2172.
 - Fix possible corruption of pollfd array on Windows when bridges were 
  reconnecting. Closes #2173.
+- Fix QoS 0 messages not being queued when `queue_qos0_messages` was enabled.
+ Closes #2224.
 
 Clients:
 - If sending mosquitto_sub output to a pipe, mosquitto_sub will now detect

diff --git a/src/database.c b/src/database.c
@@ -110,7 +110,7 @@ bool db__ready_for_queue(struct mosquitto *context, int qos, struct mosquitto_ms
  return true;
  }
 
- if(qos == 0){
+ if(qos == 0 && db.config->queue_qos0_messages == false){
  return false; /* This case is handled in db__ready_for_flight() */
  }else{
  source_bytes = (ssize_t)msg_data->msg_bytes12;

diff --git a/www/posts/2021/06/version-2-0-11-released.md b/www/posts/2021/06/version-2-0-11-released.md
@@ -27,6 +27,8 @@ release.
 - Fix non-reachable bridge blocking the broker on Windows. Closes #2172.
 - Fix possible corruption of pollfd array on Windows when bridges were
  reconnecting. Closes [#2173].
+- Fix QoS 0 messages not being queued when `queue_qos0_messages` was enabled.
+ Closes [#2224].
 
 # Clients
 - If sending mosquitto_sub output to a pipe, mosquitto_sub will now detect
@@ -41,3 +43,4 @@ release.
 [#2173]: https://github.com/eclipse/mosquitto/issues/2173
 [#2187]: https://github.com/eclipse/mosquitto/issues/2187
 [#2207]: https://github.com/eclipse/mosquitto/issues/2207
+[#2224]: https://github.com/eclipse/mosquitto/issues/2224