[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-twister] 01/02: Undo last #5337 fix attemp.
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-twister] 01/02: Undo last #5337 fix attemp. |
Date: |
Thu, 20 Sep 2018 15:23:36 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository twister.
commit 3af28f777be32de53c85044c41f285332791005d
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Sep 20 12:26:23 2018 +0200
Undo last #5337 fix attemp.
---
src/twister/taler-twister-service.c | 60 ++-----------------------------------
1 file changed, 3 insertions(+), 57 deletions(-)
diff --git a/src/twister/taler-twister-service.c
b/src/twister/taler-twister-service.c
index 046687a..6fde9a3 100644
--- a/src/twister/taler-twister-service.c
+++ b/src/twister/taler-twister-service.c
@@ -190,11 +190,6 @@ struct HttpRequest
* Request processing state machine.
*/
enum RequestState state;
-
- /**
- * Did we pause the curl download?
- */
- int curl_download_suspended;
};
@@ -462,11 +457,8 @@ curl_download_cb (void *ptr,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Curl download proceeding\n");
- if (REQUEST_STATE_DOWNLOAD_STARTED != hr->state)
- {
- hr->curl_download_suspended = GNUNET_YES;
- return CURL_WRITEFUNC_PAUSE;
- }
+ if (REQUEST_STATE_DOWNLOAD_STARTED != hr->state)
+ return CURL_WRITEFUNC_PAUSE;
GNUNET_assert
(REQUEST_STATE_DOWNLOAD_STARTED == hr->state);
@@ -520,12 +512,6 @@ curl_upload_cb (void *buf,
if (0 == hr->io_len)
{
hr->state = REQUEST_STATE_DOWNLOAD_STARTED;
- if (GNUNET_YES == hr->curl_download_suspended)
- {
- curl_easy_pause (hr->curl,
- CURLPAUSE_CONT);
- hr->curl_download_suspended = GNUNET_NO;
- }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Completed CURL UPLOAD\n");
return 0; /* upload finished, can now download */
@@ -543,12 +529,6 @@ curl_upload_cb (void *buf,
if (0 == hr->io_len)
{
hr->state = REQUEST_STATE_DOWNLOAD_STARTED;
- if (GNUNET_YES == hr->curl_download_suspended)
- {
- curl_easy_pause (hr->curl,
- CURLPAUSE_CONT);
- hr->curl_download_suspended = GNUNET_NO;
- }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Completed CURL UPLOAD\n");
}
@@ -748,7 +728,6 @@ curl_task_download (void *cls)
curl_download_prepare ();
}
-
static int
curl_progress_cb (void *clientp,
double dltotal,
@@ -1436,12 +1415,6 @@ create_response (void *cls,
MHD_HTTP_METHOD_HEAD))
{
hr->state = REQUEST_STATE_DOWNLOAD_STARTED;
- if (GNUNET_YES == hr->curl_download_suspended)
- {
- curl_easy_pause (hr->curl,
- CURLPAUSE_CONT);
- hr->curl_download_suspended = GNUNET_NO;
- }
curl_easy_setopt (hr->curl,
CURLOPT_NOBODY,
1L);
@@ -1450,12 +1423,6 @@ create_response (void *cls,
MHD_HTTP_METHOD_OPTIONS))
{
hr->state = REQUEST_STATE_DOWNLOAD_STARTED;
- if (GNUNET_YES == hr->curl_download_suspended)
- {
- curl_easy_pause (hr->curl,
- CURLPAUSE_CONT);
- hr->curl_download_suspended = GNUNET_NO;
- }
curl_easy_setopt (hr->curl,
CURLOPT_CUSTOMREQUEST,
"OPTIONS");
@@ -1464,12 +1431,6 @@ create_response (void *cls,
MHD_HTTP_METHOD_GET))
{
hr->state = REQUEST_STATE_DOWNLOAD_STARTED;
- if (GNUNET_YES == hr->curl_download_suspended)
- {
- curl_easy_pause (hr->curl,
- CURLPAUSE_CONT);
- hr->curl_download_suspended = GNUNET_NO;
- }
curl_easy_setopt (hr->curl,
CURLOPT_HTTPGET,
1L);
@@ -1524,12 +1485,6 @@ create_response (void *cls,
MHD_HEADER_KIND,
&con_val_iter,
hr);
-
- if (0 == strcasecmp (meth,
- MHD_HTTP_METHOD_POST))
- hr->headers = curl_slist_append (hr->headers,
- "Expect: 100-continue");
-
curl_easy_setopt (hr->curl,
CURLOPT_HTTPHEADER,
hr->headers);
@@ -1537,17 +1492,8 @@ create_response (void *cls,
curl_download_prepare ();
/* means (?) upload is over. */
- if (0 == hr->io_len)
- {
- /* FIXME: gnunet-gns-proxy has an extra check here... */
+ if (0 == hr->io_len) /* FIXME: gnunet-gns-proxy has an extra check here...
*/
hr->state = REQUEST_STATE_DOWNLOAD_STARTED;
- if (GNUNET_YES == hr->curl_download_suspended)
- {
- curl_easy_pause (hr->curl,
- CURLPAUSE_CONT);
- hr->curl_download_suspended = GNUNET_NO;
- }
- }
return MHD_YES;
}
--
To stop receiving notification emails like this one, please contact
address@hidden