diff options
| author | Remi Collet <remi@remirepo.net> | 2020-02-04 17:40:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-02-04 17:40:07 +0100 |
| commit | 18c7e37c318883a27e8612ba291a70465bdbaeaa (patch) | |
| tree | f69389bcc445121ca2092faee6418d008ec9b909 | |
| parent | 566104f0a3bf34c619c3d0bc77e5a1783fd3ee01 (diff) | |
update to 2.6.2
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | c88f94839aab4cfe4507588fcd658184bcbce284.patch | 35 | ||||
| -rw-r--r-- | php-pecl-couchbase2.spec | 11 |
4 files changed, 7 insertions, 43 deletions
@@ -2,7 +2,7 @@ couchbase couchbase support => enabled -extension version => 2.6.1 +extension version => 2.6.2 libcouchbase runtime version => 2.10.5 (git: dabf6d58c2e89b4e75009a7f959e8ad30f85ff98) libcouchbase headers version => 2.10.5 (git: dabf6d58c2e89b4e75009a7f959e8ad30f85ff98) igbinary transcoder => enabled @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #108 couchbase version 2.6.1 ] { +Extension [ <persistent> extension #109 couchbase version 2.6.2 ] { - Dependencies { Dependency [ json (Required) ] diff --git a/c88f94839aab4cfe4507588fcd658184bcbce284.patch b/c88f94839aab4cfe4507588fcd658184bcbce284.patch deleted file mode 100644 index b1694b7..0000000 --- a/c88f94839aab4cfe4507588fcd658184bcbce284.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c88f94839aab4cfe4507588fcd658184bcbce284 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Mon, 20 Jan 2020 15:04:56 +0100 -Subject: [PATCH] fix possible segfault if htresp is null - -close #23 - -Change-Id: Ia4dea8793a86a4ded07ccecc52e625842c098811 -Reviewed-on: http://review.couchbase.org/121246 -Tested-by: Build Bot <build@couchbase.com> -Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com> ---- - src/couchbase/bucket/n1ql.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/couchbase/bucket/n1ql.c b/src/couchbase/bucket/n1ql.c -index 7d60b6b..8d8da13 100644 ---- a/src/couchbase/bucket/n1ql.c -+++ b/src/couchbase/bucket/n1ql.c -@@ -81,8 +81,13 @@ static void n1qlrow_callback(lcb_t instance, int ignoreme, const lcb_RESPN1QL *r - } - } - if (!reported) { -- pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %d: %.*s", (int)resp->htresp->htstatus, -- (int)resp->nrow, (char *)resp->row); -+ if (resp->htresp) { -+ pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %d: %.*s", (int)resp->htresp->htstatus, -+ (int)resp->nrow, (char *)resp->row); -+ } else { -+ pcbc_log(LOGARGS(instance, ERROR), "Failed to perform N1QL query. %.*s", -+ (int)resp->nrow, (char *)resp->row); -+ } - } - } - diff --git a/php-pecl-couchbase2.spec b/php-pecl-couchbase2.spec index d68aebc..d479323 100644 --- a/php-pecl-couchbase2.spec +++ b/php-pecl-couchbase2.spec @@ -25,14 +25,12 @@ Summary: Couchbase Server PHP extension Name: %{?sub_prefix}php-pecl-couchbase2 -Version: 2.6.1 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 2.6.2 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP URL: https://pecl.php.net/package/couchbase Source0: https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz -Patch0: https://github.com/couchbase/php-couchbase/commit/c88f94839aab4cfe4507588fcd658184bcbce284.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 5.6 BuildRequires: %{?scl_prefix}php-pear @@ -108,8 +106,6 @@ mv %{pecl_name}-%{version}%{?prever} NTS %{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} cd NTS -%patch0 -p1 -b .up - # Drop bundled library sed -e '/fastlz/d' -i ../package.xml rm -r fastlz @@ -244,6 +240,9 @@ fi %changelog +* Tue Feb 4 2020 Remi Collet <remi@remirepo.net> - 2.6.2-1 +- update to 2.6.2 + * Tue Jan 28 2020 Remi Collet <remi@remirepo.net> - 2.6.1-4 - add upstream patch to fix segfault in timeout |