Adding more arguments to httpClientSessionInit to allow passing back rc

Signed-off-by: Gautham Kuppuswamy <[email protected]>
zowe · Aug 28, 2024 · 2cd1959 · 2cd1959
1 parent 785a454
commit 2cd1959
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
+2 −0		CHANGELOG.md
+9 −7		c/httpclient.c
+2 −1		c/qjsnet.c
+1 −1		h/httpclient.h