Merge remote-tracking branch 'couchbase/unstable' into HEAD

Change-Id: I3c4c205601068344ba03030686fd2fb44d3aa544
couchbase · Sep 19, 2022 · ce2baec · ce2baec
2 parents 1da0691 + ecacbbd
commit ce2baec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/couch_dcp/src/couch_dcp_consumer.erl b/src/couch_dcp/src/couch_dcp_consumer.erl
@@ -44,7 +44,7 @@ parse_header(<<?DCP_MAGIC_RESPONSE,
                Opcode,
                KeyLength:?DCP_SIZES_KEY_LENGTH,
                _ExtraLength,
-               0,
+               _,
                Status:?DCP_SIZES_STATUS,
                BodyLength:?DCP_SIZES_BODY,
                RequestId:?DCP_SIZES_OPAQUE,

diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
@@ -54,7 +54,14 @@ start_link(https) ->
     start_link(https, Options).
 start_link(Name, Options) ->
     % couch_secondary_sup will restart us when config settings change.
+    case config_profile:get_bool({couchdb, enabled}) of
+        true ->
+            do_start_link(Name, Options);
+        false ->
+            ignore
+    end.
 
+do_start_link(Name, Options) ->
     Field = case misc:is_ipv6() of
                 true -> "ip6_bind_address";
                 false -> "ip4_bind_address"