Add transfer_socket_ownership_to_handle helper and parity test for Get vs open_stream

Author: yhirose

httplib.h

@@ -1922,6 +1922,12 @@ class ClientImpl {
                  std::chrono::time_point<std::chrono::steady_clock> start_time,
                  std::function<bool(Stream &strm)> callback);
   virtual bool is_ssl() const;
+
+  // Helper: transfer the current `socket_` ownership into a StreamHandle's
+  // ClientConnection. This moves `socket_.sock`/`socket_.ssl` into
+  // `handle.connection_` and resets `socket_` to closed. This method MUST be
+  // called with `socket_mutex_` held.
+  void transfer_socket_ownership_to_handle(StreamHandle &handle);
 };
 
 class Client {
@@ -9716,13 +9722,8 @@ ClientImpl::open_stream(const std::string &method, const std::string &path,
 #endif
     }
 
-    // Transfer socket ownership to StreamHandle
-    handle.connection_->sock = socket_.sock;
-#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
-    handle.connection_->ssl = socket_.ssl;
-    socket_.ssl = nullptr;
-#endif
-    socket_.sock = INVALID_SOCKET;
+    // Transfer socket ownership to StreamHandle (centralized helper)
+    transfer_socket_ownership_to_handle(handle);
   }
 
   // Create appropriate stream for the transferred socket
@@ -9808,6 +9809,17 @@ ClientImpl::open_stream(const std::string &method, const std::string &path,
   return handle;
 }
 
+inline void
+ClientImpl::transfer_socket_ownership_to_handle(StreamHandle &handle) {
+  // Caller must hold socket_mutex_. Move socket_ contents into handle.
+  handle.connection_->sock = socket_.sock;
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+  handle.connection_->ssl = socket_.ssl;
+  socket_.ssl = nullptr;
+#endif
+  socket_.sock = INVALID_SOCKET;
+}
+
 inline bool ClientImpl::handle_request(Stream &strm, Request &req,
                                        Response &res, bool close_connection,
                                        Error &error) {

test/test.cc

@@ -146,6 +146,48 @@ TEST(BenchmarkTest, localhost) { performance_test("localhost"); }
 
 TEST(BenchmarkTest, v6) { performance_test("::1"); }
 
+TEST(ParityTest, GetVsOpenStream) {
+  Server svr;
+
+  const std::string path = "/parity";
+  const std::string content = "Parity test content: hello world";
+
+  svr.Get(path, [&](const Request & /*req*/, Response &res) {
+    res.set_content(content, "text/plain");
+  });
+
+  auto listen_thread = std::thread([&]() { svr.listen(HOST, PORT); });
+  auto se = detail::scope_exit([&] {
+    svr.stop();
+    listen_thread.join();
+    ASSERT_FALSE(svr.is_running());
+  });
+
+  svr.wait_until_ready();
+
+  Client cli(HOST, PORT);
+
+  // Non-stream path
+  auto r1 = cli.Get(path);
+  ASSERT_TRUE(r1);
+  EXPECT_EQ(StatusCode::OK_200, r1->status);
+  std::string body1 = r1->body;
+
+  // Stream path
+  auto h = cli.open_stream("GET", path);
+  ASSERT_TRUE(h.is_valid());
+  std::string body2;
+  char buf[128];
+  for (;;) {
+    auto n = h.read(buf, sizeof(buf));
+    if (n < 0) { break; }
+    if (n == 0) { break; }
+    body2.append(buf, static_cast<size_t>(n));
+  }
+
+  EXPECT_EQ(body1, body2);
+}
+
 class UnixSocketTest : public ::testing::Test {
 protected:
   void TearDown() override { std::remove(pathname_.c_str()); }