celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject [celix] branch master updated: Fix reusing connections for etcdlib
Date Mon, 07 Sep 2020 12:48:45 GMT
This is an automated email from the ASF dual-hosted git repository.

oipo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to refs/heads/master by this push:
     new 64d9111  Fix reusing connections for etcdlib
64d9111 is described below

commit 64d91119e2161d5c167807c3a5c9808ec32fcd21
Author: Michael de Lang <kingoipo@gmail.com>
AuthorDate: Mon Sep 7 14:19:37 2020 +0200

    Fix reusing connections for etcdlib
    
    Setting the curl opts POST and POSTFIELDS resulted in CURL adding the expect: 100-continue
header in a GET request. This confuses etcd and curl enough to never send a reply.
---
 libs/etcdlib/src/etcd.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/libs/etcdlib/src/etcd.c b/libs/etcdlib/src/etcd.c
index 3f771f8..a69061f 100644
--- a/libs/etcdlib/src/etcd.c
+++ b/libs/etcdlib/src/etcd.c
@@ -664,8 +664,6 @@ static size_t WriteHeaderCallback(void *contents, size_t size, size_t
nmemb, voi
     return realsize;
 }
 
-
-
 static int performRequest(CURL **curl, pthread_mutex_t *mutex, char* url, request_t request,
void* reqData, void* repData) {
 	CURLcode res = 0;
 	if(mutex != NULL) {
@@ -673,22 +671,21 @@ static int performRequest(CURL **curl, pthread_mutex_t *mutex, char*
url, reques
     }
 	if(*curl == NULL) {
         *curl = curl_easy_init();
-        curl_easy_setopt(*curl, CURLOPT_NOSIGNAL, 1);
-        curl_easy_setopt(*curl, CURLOPT_TIMEOUT, DEFAULT_CURL_TIMEOUT);
-        curl_easy_setopt(*curl, CURLOPT_CONNECTTIMEOUT, DEFAULT_CURL_CONNECT_TIMEOUT);
-        curl_easy_setopt(*curl, CURLOPT_FOLLOWLOCATION, 1L);
-        curl_easy_setopt(*curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
-        //curl_easy_setopt(*curl, CURLOPT_VERBOSE, 1L);
+    } else {
+	    curl_easy_reset(*curl);
     }
 
+    curl_easy_setopt(*curl, CURLOPT_NOSIGNAL, 1);
+    curl_easy_setopt(*curl, CURLOPT_TIMEOUT, DEFAULT_CURL_TIMEOUT);
+    curl_easy_setopt(*curl, CURLOPT_CONNECTTIMEOUT, DEFAULT_CURL_CONNECT_TIMEOUT);
+    curl_easy_setopt(*curl, CURLOPT_FOLLOWLOCATION, 1L);
+    //curl_easy_setopt(*curl, CURLOPT_VERBOSE, 1L);
     curl_easy_setopt(*curl, CURLOPT_URL, url);
+    curl_easy_setopt(*curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
     curl_easy_setopt(*curl, CURLOPT_WRITEDATA, repData);
     if (((struct MemoryStruct*)repData)->header) {
         curl_easy_setopt(*curl, CURLOPT_HEADERDATA, repData);
         curl_easy_setopt(*curl, CURLOPT_HEADERFUNCTION, WriteHeaderCallback);
-    } else {
-        curl_easy_setopt(*curl, CURLOPT_HEADERDATA, NULL);
-        curl_easy_setopt(*curl, CURLOPT_HEADERFUNCTION, NULL);
     }
 
     if (request == PUT) {
@@ -697,12 +694,8 @@ static int performRequest(CURL **curl, pthread_mutex_t *mutex, char*
url, reques
         curl_easy_setopt(*curl, CURLOPT_POSTFIELDS, reqData);
     } else if (request == DELETE) {
         curl_easy_setopt(*curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-        curl_easy_setopt(*curl, CURLOPT_POST, 0);
-        curl_easy_setopt(*curl, CURLOPT_POSTFIELDS, NULL);
     } else if (request == GET) {
         curl_easy_setopt(*curl, CURLOPT_CUSTOMREQUEST, "GET");
-        curl_easy_setopt(*curl, CURLOPT_POST, 0);
-        curl_easy_setopt(*curl, CURLOPT_POSTFIELDS, NULL);
     }
 
 	res = curl_easy_perform(*curl);


Mime
View raw message