Zowe Suite v1.23.0

zowe · Jul 14, 2021 · acf31d8 · acf31d8
2 parents ead7f8e + e4d548a
commit acf31d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Zowe Common C Changelog
 
+## `1.23.0`
+
+- Bugfix: HTTP server did not send empty files correctly.
+
 ## `1.22.0`
 
 - Enhancement: Add "remoteStorage" pointer to dataservice struct, for accessing high availability remote storage in addition to or alternatively to local storage.

diff --git a/c/httpserver.c b/c/httpserver.c
@@ -4420,7 +4420,7 @@ static int streamBinaryForFile2(HttpResponse *response, Socket *socket, UnixFile
       zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG2,
               "Binary streaming has ended. (return = 0x%x, reason = 0x%x)\n",
               returnCode, reasonCode);
-      return 0;
+      break;
     }
 
     char *encodedBuffer = NULL;
@@ -4494,7 +4494,12 @@ static int streamTextForFile2(HttpResponse *response, Socket *socket, UnixFile *
       printf("WARNING: UTF8 might not be aligned properly: preserve 3 bytes for the next read cycle to fix UTF boundaries\n");
 #endif
       int bytesRead = fileRead(in,buffer,bufferSize,&returnCode,&reasonCode);
-
+      if (bytesRead <= 0) {
+        zowelog(NULL, LOG_COMP_HTTPSERVER, ZOWE_LOG_DEBUG2,
+                "Text streaming has ended. (return = 0x%x, reason = 0x%x)\n",
+                returnCode, reasonCode);
+        break;
+      }
       unsigned int inLen, outLen;
       int rc;
       char *inPtr, *outPtr;