diff --git a/CHANGELOG.md b/CHANGELOG.md index e67a67fa..443805b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to the ZSS package will be documented in this file. ## `2.18.1` - Bugfix: Support cross-memory server parameters longer than 128 characters (#684) - Enhancement: Expose new cross-memory server's functions in dynlink (#684) +- Enhancement: Adding more arguments to httpClientSessionInit to allow passing back rc (#727) ## `2.18.0` - Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEBUG instead of INFO.(#719) diff --git a/c/jwk.c b/c/jwk.c index 520cae2a..3e47b2e1 100644 --- a/c/jwk.c +++ b/c/jwk.c @@ -159,7 +159,7 @@ static Json *doRequest(ShortLivedHeap *slh, HttpClientSettings *clientSettings, *rc = JWK_STATUS_HTTP_CONTEXT_ERROR; break; } - *rsn = httpClientSessionInit(httpClientContext, &session); + *rsn = httpClientSessionInit2(httpClientContext, &session, rc); if (*rsn) { *rc = JWK_STATUS_HTTP_REQ_INIT_ERROR; break; diff --git a/c/storageApiml.c b/c/storageApiml.c index c9760221..d5691ca1 100644 --- a/c/storageApiml.c +++ b/c/storageApiml.c @@ -258,6 +258,7 @@ static int transformHttpStatus(int httpStatus) { static ApimlResponse *apimlDoRequest(ApimlStorage *storage, ApimlRequest *request, int *statusOut) { int status = 0; int statusCode = 0; + int rc = 0; TlsEnvironment *tlsEnv = storage->tlsEnv; HttpClientSettings *clientSettings = storage->clientSettings; HttpClientContext *httpClientContext = NULL; @@ -277,7 +278,7 @@ static ApimlResponse *apimlDoRequest(ApimlStorage *storage, ApimlRequest *reques *statusOut = STORAGE_STATUS_HTTP_ERROR; break; } - status = httpClientSessionInit(httpClientContext, &session); + status = httpClientSessionInit2(httpClientContext, &session, &rc); if (status) { zowelog(NULL, LOG_COMP_ID_APIML_STORAGE, ZOWE_LOG_DEBUG, "error initing session: %d\n", status); *statusOut = STORAGE_STATUS_HTTP_ERROR; diff --git a/deps/zowe-common-c b/deps/zowe-common-c index 02bd07fa..55c3fa4f 160000 --- a/deps/zowe-common-c +++ b/deps/zowe-common-c @@ -1 +1 @@ -Subproject commit 02bd07faee8578f49ab1a22c01813b8c131f710f +Subproject commit 55c3fa4f9cf694d17ccf62b38e76b217538c9f40