Skip to content

Commit a597063

Browse files
committed
implement CURLOPT_TIMEOUT_MS option for DELETE and PUT
- sync to original change in 4-1 branch: donders-research-data-management@4308e30 - the corresponding functions in core take an additional KeyValPair_t* input argument. - the keyword 'timeout' of the new argument defines the CURL timeout in milliseconds.
1 parent 6e1041b commit a597063

File tree

6 files changed

+481
-322
lines changed

6 files changed

+481
-322
lines changed

microservices/core/include/irods_ms_plugin_curl.hpp

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
#define IRODS_MS_PLUGIN_CURL_HPP_
99

1010
// =-=-=-=-=-=-=-
11-
#include "apiHeaderAll.h"
12-
#include "msParam.h"
11+
#include "apiHeaderAll.hpp"
12+
#include "msParam.hpp"
13+
#include "reGlobalsExtern.hpp"
1314
#include "irods_ms_plugin.hpp"
1415
#include "irods_server_api_call.hpp"
1516
#include "microservice.hpp"
@@ -33,6 +34,7 @@
3334
#define IRODS_CURL_DATA_KW "data"
3435
#define IRODS_CURL_HEADERS_KW "headers"
3536

37+
#define IRODS_CURL_TIMEOUT_MS_KW "timeout"
3638

3739
// Input struct for curl write callback function.
3840
// Does not go over the wire as far as iRODS is concerned.
@@ -76,13 +78,12 @@ class irodsCurl {
7678

7779
irods::error get_str( char*, char** );
7880

79-
irods::error del( char*, char** );
81+
irods::error del( char*, keyValPair_t*, char** );
8082

81-
irods::error put( char*, keyValPair_t*, char** );
83+
irods::error put( char*, keyValPair_t*, keyValPair_t*, char** );
8284

8385
irods::error post( char*, keyValPair_t*, char** );
8486

85-
8687
// Callback progress function for the curl handler
8788
static int progress( void*, double, double, double, double );
8889

0 commit comments

Comments
 (0)