Fix

Author: gthea

src/main/java/io/split/android/client/network/RawHttpResponseParser.java

@@ -3,11 +3,9 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.Certificate;
@@ -33,44 +31,41 @@ class RawHttpResponseParser {
      */
     @NonNull
     public HttpResponse parseHttpResponse(@NonNull InputStream inputStream, Certificate[] serverCertificates) throws IOException {
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
-
-            // 1. Read and parse status line
-            String statusLine = reader.readLine();
-            if (statusLine == null) {
-                throw new IOException("No HTTP response received from server");
-            }
-
-            Logger.v("Parsing HTTP status line: " + statusLine);
-            int statusCode = parseStatusCode(statusLine);
-
-            // 2. Read and parse response headers
-            ParsedResponseHeaders responseHeaders = getParsedResponseHeaders(reader);
-
-            // 3. Determine charset from Content-Type header
-            Charset bodyCharset = extractCharsetFromContentType(responseHeaders.mContentType);
-
-            // 4. Read response body based on encoding type
-            String responseBody = readResponseBody(inputStream, responseHeaders.mIsChunked, bodyCharset, responseHeaders.mContentLength, responseHeaders.mConnectionClose);
-
-            // 5. Create and return HttpResponse
-            if (responseBody != null && !responseBody.trim().isEmpty()) {
-                return new HttpResponseImpl(statusCode, responseBody, serverCertificates);
-            } else {
-                return new HttpResponseImpl(statusCode, serverCertificates);
-            }
+        // 1. Read and parse status line
+        String statusLine = readLineFromStream(inputStream);
+        if (statusLine == null) {
+            throw new IOException("No HTTP response received from server");
+        }
+        
+        Logger.v("Parsing HTTP status line: " + statusLine);
+        int statusCode = parseStatusCode(statusLine);
+        
+        // 2. Read and parse response headers directly (single-pass)
+        ParsedResponseHeaders responseHeaders = parseHeadersDirectly(inputStream);
+        
+        // 3. Determine charset from Content-Type header
+        Charset bodyCharset = extractCharsetFromContentType(responseHeaders.mContentType);
+        
+        // 4. Read response body using the same InputStream (correctly positioned after headers)
+        String responseBody = readResponseBody(inputStream, responseHeaders.mIsChunked, bodyCharset, responseHeaders.mContentLength, responseHeaders.mConnectionClose);
+        
+        // 5. Create and return HttpResponse
+        if (responseBody != null && !responseBody.trim().isEmpty()) {
+            return new HttpResponseImpl(statusCode, responseBody, serverCertificates);
+        } else {
+            return new HttpResponseImpl(statusCode, serverCertificates);
         }
     }
 
     @NonNull
-    private static ParsedResponseHeaders getParsedResponseHeaders(BufferedReader reader) throws IOException {
-        int contentLength = 0;
+    private ParsedResponseHeaders parseHeadersDirectly(@NonNull InputStream inputStream) throws IOException {
+        int contentLength = -1;
         boolean isChunked = false;
         boolean connectionClose = false;
         String contentType = null;
         String headerLine;
-
-        while ((headerLine = reader.readLine()) != null && !headerLine.trim().isEmpty()) {
+        
+        while ((headerLine = readLineFromStream(inputStream)) != null && !headerLine.trim().isEmpty()) {
             Logger.v("Parsing HTTP header: " + headerLine);
             int colonIndex = headerLine.indexOf(':');
             if (colonIndex > 0) {
@@ -96,6 +91,8 @@ private static ParsedResponseHeaders getParsedResponseHeaders(BufferedReader rea
         return new ParsedResponseHeaders(contentLength, isChunked, connectionClose, contentType);
     }
 
+
+
     @Nullable
     private String readResponseBody(@NonNull InputStream inputStream, boolean isChunked, Charset bodyCharset, int contentLength, boolean connectionClose) throws IOException {
         String responseBody = null;
@@ -239,6 +236,10 @@ private String readUntilCloseWithCharset(InputStream inputStream, Charset charse
         return new String(bodyBytes.toByteArray(), charset);
     }
 
+    /**
+     * Reads a line from the input stream for chunked transfer encoding.
+     * This is only used for reading chunk size lines and trailers in chunked responses.
+     */
     private String readLineFromStream(InputStream inputStream) throws IOException {
         ByteArrayOutputStream lineBytes = new ByteArrayOutputStream();
         int b;

src/test/java/io/split/android/client/network/RawHttpResponseParserTest.java

@@ -23,7 +23,7 @@ public void httpResponseWithValidResponse() throws Exception {
         String rawHttpResponse =
             "HTTP/1.1 200 OK\r\n" +
             "Content-Type: application/json\r\n" +
-            "Content-Length: 26\r\n" +
+            "Content-Length: 25\r\n" +
             "\r\n" +
             "{\"message\":\"Hello World\"}";
 
@@ -133,14 +133,19 @@ public void responseWithEmptyStreamThrowsException() throws Exception {
     @Test
     public void responseWithChunkedEncodingHandlesCorrectly() throws Exception {
         String rawHttpResponse =
-            "HTTP/1.1 200 OK\r\n" +
-            "Transfer-Encoding: chunked\r\n" +
-            "\r\n" +
-            "1a\r\n" +
-            "This is chunked data!\r\n" +
-            "\r\n" +
-            "0\r\n" +
-            "\r\n";
+            // headers
+                "HTTP/1.1 200 OK\r\n" +
+                "Transfer-Encoding: chunked\r\n" +
+                "\r\n" +
+                // 1st chunk size
+                "15\r\n" +
+                // 1st chunk data
+                "This is chunked data!" +
+                "\r\n" +
+
+                // 2nd chunk size
+                "0\r\n" +
+                "\r\n";
 
         InputStream inputStream = new ByteArrayInputStream(rawHttpResponse.getBytes("UTF-8"));
         RawHttpResponseParser parser = new RawHttpResponseParser();