From 8cd9ae315282a3d688c5216c2d07bd842705870e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 28 Jul 2021 09:00:04 +0200
Subject: update to 3.2.0 drop patch merged upstream raise dependency on
 libcouchbase 3.2

---
 32.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '32.patch')

diff --git a/32.patch b/32.patch
index d21d44f..7bd8db9 100644
--- a/32.patch
+++ b/32.patch
@@ -13,7 +13,7 @@ diff --git a/src/couchbase/cluster.c b/src/couchbase/cluster.c
 index 478cc3a..0c64366 100644
 --- a/src/couchbase/cluster.c
 +++ b/src/couchbase/cluster.c
-@@ -63,7 +63,11 @@ static void pcbc_cluster_connection_init(zval *return_value, pcbc_cluster_t *clu
+@@ -66,7 +66,11 @@ static void pcbc_cluster_connection_init(zval *return_value, pcbc_cluster_t *clu
      if (PCBCG(allow_fallback_to_bucket)) {
          url = php_url_parse(cluster->connstr);
          if (url && url->path) {
@@ -29,7 +29,7 @@ diff --git a/src/couchbase/pool.c b/src/couchbase/pool.c
 index 9dfac11..3f5d8bd 100644
 --- a/src/couchbase/pool.c
 +++ b/src/couchbase/pool.c
-@@ -151,11 +151,19 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -265,11 +265,19 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
              // rebuild connection string with username as the bucket
              smart_str buf = {0};
              if (url->scheme) {
@@ -49,7 +49,7 @@ index 9dfac11..3f5d8bd 100644
              }
              if (url->port) {
                  smart_str_appendc(&buf, ':');
-@@ -165,7 +173,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -279,7 +287,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
              smart_str_appends(&buf, bucketname);
              if (url->query) {
                  smart_str_appendc(&buf, '?');
@@ -61,7 +61,7 @@ index 9dfac11..3f5d8bd 100644
              }
              smart_str_0(&buf);
              PCBC_SMARTSTR_DUP(buf, *normalized);
-@@ -176,15 +188,27 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -290,15 +302,27 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
          }
          break;
      case LCB_TYPE_CLUSTER:
@@ -89,7 +89,7 @@ index 9dfac11..3f5d8bd 100644
              }
              if (url->port) {
                  smart_str_appendc(&buf, ':');
-@@ -192,7 +216,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -306,7 +330,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
              }
              if (url->query) {
                  smart_str_appendc(&buf, '?');
@@ -101,7 +101,7 @@ index 9dfac11..3f5d8bd 100644
              }
              smart_str_0(&buf);
              PCBC_SMARTSTR_DUP(buf, *normalized);
-@@ -246,7 +274,11 @@ static lcb_STATUS pcbc_connection_cache(smart_str *plist_key, pcbc_connection_t
+@@ -360,7 +388,11 @@ static lcb_STATUS pcbc_connection_cache(smart_str *plist_key, pcbc_connection_t
      zend_resource res;
      res.type = pcbc_res_couchbase;
      res.ptr = conn;
-- 
cgit