geventhttpclient 2.5.0__tar.gz → 2.5.1__tar.gz

{geventhttpclient-2.5.0/src/geventhttpclient.egg-info → geventhttpclient-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geventhttpclient
-Version: 2.5.0
+Version: 2.5.1
 Summary: HTTP client library for gevent
 Author-email: Antonin Amand <antonin.amand@gmail.com>
 License-Expression: MIT

{geventhttpclient-2.5.0 → geventhttpclient-2.5.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geventhttpclient"
-version = "2.5.0" # don't forget to update version __init__.py as well
+version = "2.5.1" # don't forget to update version __init__.py as well
 description = "HTTP client library for gevent"
 readme = "README.md"
 requires-python = ">=3.11"

{geventhttpclient-2.5.0 → geventhttpclient-2.5.1}/src/geventhttpclient/__init__.py

@@ -1,6 +1,6 @@
 # package
 
-__version__ = "2.5.0"  # don't forget to update version in pyproject.toml as well
+__version__ = "2.5.1"  # don't forget to update version in pyproject.toml as well
 
 from geventhttpclient.api import delete, get, head, options, patch, post, put, request
 from geventhttpclient.client import HTTPClient

{geventhttpclient-2.5.0 → geventhttpclient-2.5.1}/src/geventhttpclient/client.py

@@ -72,6 +72,9 @@ def _uses_chunked_transfer(header_fields: Mapping[str, Any], body: Any) -> bool:
             and TRANSFER_ENCODING_CHUNKED in str(value).lower()
         ):
             return True
+    if body is None:
+        # No body at all; unknown-length streams are chunked, None is not.
+        return False
     return not isinstance(body, (bytes, bytearray, memoryview)) and _get_body_length(body) is None
 
 
@@ -348,7 +351,10 @@ class HTTPClient:
         :return:
         """
 
-        if isinstance(body, str):
+        if body is None:
+            # None means "no body", not a body of unknown length.
+            body = b""
+        elif isinstance(body, str):
             body = body.encode("utf-8")
 
         # the same case-insensitive merge `_build_request` performs before
@@ -425,15 +431,16 @@ class HTTPClient:
                     response._sent_request = request
                     return response
                 if chunked:
-                    sock.sendall(_request)
                     # Note: on retry, file-like/iterable bodies continue
                     # from their current position or are exhausted, same
                     # as with `sendfile` before.
                     if body:
+                        sock.sendall(_request)
                         for block in _iter_chunked(body, self.block_size):
                             sock.sendall(block)
                     else:
-                        sock.sendall(b"0\r\n\r\n")
+                        # Single write: a separate small write stalls on Nagle.
+                        sock.sendall(_request + b"0\r\n\r\n")
                 elif body:
                     if isinstance(body, bytes):
                         sock.sendall(_request + body)

{geventhttpclient-2.5.0 → geventhttpclient-2.5.1/src/geventhttpclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geventhttpclient
-Version: 2.5.0
+Version: 2.5.1
 Summary: HTTP client library for gevent
 Author-email: Antonin Amand <antonin.amand@gmail.com>
 License-Expression: MIT

{geventhttpclient-2.5.0 → geventhttpclient-2.5.1}/tests/test_client.py

@@ -6,6 +6,7 @@ import sys
 import gevent.pool
 import gevent.queue
 import gevent.server
+import gevent.socket
 import pytest
 
 from geventhttpclient import __version__
@@ -239,6 +240,60 @@ def test_post_chunked_request_empty_body_with_header():
         assert response.status_code == 200
 
 
+def test_request_body_none_is_not_chunked():
+    """Regression: body=None means "no body", not an unknown-length body (#248)."""
+
+    def handler(sock, addr):
+        # The request is complete after the headers; chunked would add `0\r\n\r\n`.
+        data = b""
+        while b"\r\n\r\n" not in data:
+            block = sock.recv(4096)
+            assert block, "connection closed before request was complete"
+            data += block
+        header, _, rest = data.partition(b"\r\n\r\n")
+        assert header.lower().startswith(b"get / http/1.1")
+        assert b"transfer-encoding" not in header.lower()
+        assert b"content-length" not in header.lower()
+        assert rest == b"", f"unexpected body bytes after headers: {rest!r}"
+        sock.sendall(b"HTTP/1.1 200 Ok\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
+
+    with server(handler):
+        client = HTTPClient(*LISTENER)
+        response = client.request(METHOD_GET, "/", body=None)
+        assert response.status_code == 200
+
+
+def test_chunked_empty_body_single_write(monkeypatch):
+    """An explicit chunked request without body must go out in a single write
+    (a second small write stalls on Nagle until the delayed ACK)."""
+
+    def handler(sock, addr):
+        data = b""
+        while not data.endswith(b"0\r\n\r\n"):
+            block = sock.recv(4096)
+            assert block, "connection closed before final chunk"
+            data += block
+        sock.sendall(b"HTTP/1.1 200 Ok\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
+
+    client_writes = []
+    original_sendall = gevent.socket.socket.sendall
+
+    def recording_sendall(sock, data):
+        if data.startswith(b"POST"):
+            client_writes.append(bytes(data))
+        return original_sendall(sock, data)
+
+    monkeypatch.setattr(gevent.socket.socket, "sendall", recording_sendall)
+    with server(handler):
+        client = HTTPClient(*LISTENER)
+        response = client.post("/", body=b"", headers={"Transfer-Encoding": "chunked"})
+        assert response.status_code == 200
+
+    assert len(client_writes) == 1
+    assert client_writes[0].startswith(b"POST / HTTP/1.1\r\n")
+    assert client_writes[0].endswith(b"\r\n\r\n0\r\n\r\n")
+
+
 def test_chunked_request_rejects_http_1_0():
     client = HTTPClient(*LISTENER, version=HTTPClient.HTTP_10)
     with pytest.raises(ValueError):