From 70d526eef1c350b3af1fe17b3d247f952f20b7c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 May 2018 06:37:49 +0200 Subject: Update to 2.8.7 from Fedora: * Wed May 02 2018 Sergey Avseyev - 2.8.7-2 - Port patch for JSON datatype * Wed May 02 2018 Sergey Avseyev - 2.8.7-1 - Update to 2.8.7 --- ...4-initialize-flag-for-JSON-server-feature.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch (limited to '0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch') diff --git a/0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch b/0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch new file mode 100644 index 0000000..09354b9 --- /dev/null +++ b/0004-CCBC-924-initialize-flag-for-JSON-server-feature.patch @@ -0,0 +1,37 @@ +From 047c6b33d51831927a2f1f03bc5417d6d038f3e5 Mon Sep 17 00:00:00 2001 +From: Sergey Avseyev +Date: Thu, 3 May 2018 01:47:56 +0300 +Subject: [PATCH] CCBC-924: initialize flag for JSON server feature + +Otherwise it might be left uninitialized and the library will +send JSON datatype to servers, which do not support it. + +Change-Id: Ib316816d1db4a7071a4864c7293f4ad374b01eac +--- + src/mcserver/mcserver.cc | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mcserver/mcserver.cc b/src/mcserver/mcserver.cc +index 50739006..d73ee7e7 100644 +--- a/src/mcserver/mcserver.cc ++++ b/src/mcserver/mcserver.cc +@@ -691,6 +691,7 @@ Server::Server(lcb_t instance_, int ix) + instance(instance_), + settings(lcb_settings_ref2(instance_->settings)), + compsupport(0), ++ jsonsupport(0), + mutation_tokens(0), + connctx(NULL), + curhost(new lcb_host_t()) +@@ -720,7 +721,7 @@ Server::Server(lcb_t instance_, int ix) + + Server::Server() + : state(S_TEMPORARY), +- io_timer(NULL), instance(NULL), settings(NULL), compsupport(0), ++ io_timer(NULL), instance(NULL), settings(NULL), compsupport(0), jsonsupport(0), + mutation_tokens(0), connctx(NULL), connreq(NULL), curhost(NULL) + { + } +-- +2.17.0 + -- cgit