[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-twister] 03/03: remove marcello-fix logic for #5337
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-twister] 03/03: remove marcello-fix logic for #5337 |
Date: |
Thu, 20 Sep 2018 20:10:40 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository twister.
commit 51165a5b431fc5859afc81dba47833ad1e1f35d6
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Sep 20 20:10:25 2018 +0200
remove marcello-fix logic for #5337
---
src/twister/taler-twister-service.c | 64 -------------------------------------
1 file changed, 64 deletions(-)
diff --git a/src/twister/taler-twister-service.c
b/src/twister/taler-twister-service.c
index cf931df..377a98f 100644
--- a/src/twister/taler-twister-service.c
+++ b/src/twister/taler-twister-service.c
@@ -41,14 +41,6 @@
#include <taler/taler_util.h>
/**
- * Keep logic of Marcello's fix for #5337? Unclear how it works, and
- * may be superceeded by subsequent revisions, but kept for now to
- * easily identify what might fix the issue (until CG can actually
- * reproduce it nicely).
- */
-#define MARCELLO_FIX 0
-
-/**
* Log curl error.
*
* @param level log level
@@ -228,13 +220,6 @@ struct HttpRequest
*/
int curl_paused;
-#if MARCELLO_FIX
- /**
- * Indicates that the Web server returned a "Connection: close"
- * header line.
- */
- int connection_closed;
-#endif
};
@@ -433,17 +418,6 @@ curl_check_hdr (void *buffer,
*tok = '\0';
if (NULL != (tok = strchr (hdr_val, '\t')))
*tok = '\0';
-#if MARCELLO_FIX
- if ( (0 == strcasecmp (hdr_type,
- MHD_HTTP_HEADER_CONNECTION) &&
- (0 == strcasecmp (hdr_val,
- "close")) ) )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Server wants to close the TCP connection\n");
- hr->connection_closed = GNUNET_YES;
- }
-#endif
if (0 != strlen (hdr_val)) /* Rely in MHD to set those */
{
@@ -859,34 +833,6 @@ curl_task_download (void *cls)
}
-static int
-curl_progress_cb (void *clientp,
- double dltotal,
- double dlnow,
- double ultotal,
- double ulnow)
-{
- struct HttpRequest *hr = clientp;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Progress callback..\n");
-#if MARCELLO_FIX
- if ( (GNUNET_YES == hr->curl_paused) &&
- (GNUNET_YES == hr->connection_closed) )
- {
- hr->state = REQUEST_STATE_DOWNLOAD_STARTED;
- hr->curl_paused = GNUNET_NO;
- hr->connection_closed = GNUNET_NO;
- curl_easy_pause (hr->curl, CURLPAUSE_CONT);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Unpausing the download callback\n");
- curl_download_prepare ();
- }
-#endif
- return CURLE_OK;
-}
-
-
/* *************** MHD response generation ******************* */
@@ -1514,21 +1460,11 @@ create_response (void *cls,
hr->state = REQUEST_STATE_UPLOAD_STARTED;
curl_easy_setopt (hr->curl,
- CURLOPT_XFERINFOFUNCTION,
- &curl_progress_cb);
-
- curl_easy_setopt (hr->curl,
CURLOPT_XFERINFODATA,
hr);
-
- curl_easy_setopt (hr->curl,
- CURLOPT_NOPROGRESS,
- 0L);
-
curl_easy_setopt (hr->curl,
CURLOPT_POST,
1L);
-
curl_easy_setopt (hr->curl,
CURLOPT_VERBOSE,
1L);
--
To stop receiving notification emails like this one, please contact
address@hidden