summaryrefslogtreecommitdiffstats
path: root/32.patch
diff options
context:
space:
mode:
Diffstat (limited to '32.patch')
-rw-r--r--32.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/32.patch b/32.patch
index 7bd8db9..76e39f0 100644
--- a/32.patch
+++ b/32.patch
@@ -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
-@@ -265,11 +265,19 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -266,11 +266,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, ':');
-@@ -279,7 +287,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -280,7 +288,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);
-@@ -290,15 +302,27 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -291,15 +303,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, ':');
-@@ -306,7 +330,11 @@ static lcb_STATUS pcbc_normalize_connstr(lcb_INSTANCE_TYPE type, char *connstr,
+@@ -307,7 +331,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);
-@@ -360,7 +388,11 @@ static lcb_STATUS pcbc_connection_cache(smart_str *plist_key, pcbc_connection_t
+@@ -361,7 +389,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;