mod-wsgi 6.0.3.dev1__tar.gz → 6.0.5.dev1__tar.gz

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.3.dev1
+Version: 6.0.5.dev1
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.5.dev1}/mod_wsgi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.3.dev1
+Version: 6.0.5.dev1
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.5.dev1}/src/express/management/commands/runmodwsgi.py

@@ -7,9 +7,12 @@ import subprocess
 from django.core.management.base import BaseCommand, CommandError
 
 import mod_wsgi.express
+import mod_wsgi.express.options
+import mod_wsgi.express.server
 
 def check_percentage(string):
-    if value is not None and value < 0 or value > 1:
+    value = float(string)
+    if value < 0 or value > 1:
         import argparse
         msg = '%s option value needs to be within the range 0 to 1.' % string
         raise argparse.ArgumentTypeError(msg)
@@ -48,6 +51,20 @@ class Command(BaseCommand):
                         elif attr == 'default':
                             if getattr(option, attr) != ('NO', 'DEFAULT'):
                                 kwargs[attr] = getattr(option, attr)
+                        elif attr == 'help':
+                            # optparse displays help text literally, but
+                            # argparse expands it with '%'-formatting. Escape
+                            # any literal '%' (e.g. the '%{GLOBAL}' token) and
+                            # translate the optparse '%default'/'%prog' tokens
+                            # to their argparse equivalents.
+                            help_text = getattr(option, attr)
+                            if help_text is not None:
+                                help_text = help_text.replace('%', '%%')
+                                help_text = help_text.replace(
+                                        '%%default', '%(default)s')
+                                help_text = help_text.replace(
+                                        '%%prog', '%(prog)s')
+                                kwargs[attr] = help_text
                         else:
                             if getattr(option, attr) is not None:
                                 kwargs[attr] = getattr(option, attr)

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.5.dev1}/src/server/wsgi_remote.c

@@ -1923,25 +1923,11 @@ static apr_status_t wsgi_socket_read(apr_socket_t *sock, void *vbuf,
 
 #define WSGI_MAX_REQUEST_FRAME (16 * 1024 * 1024)
 
-/*
- * Size of the stack-resident preread buffer. Realistic CGI-style
- * environments easily fit inside this, so in the common case the
- * length prefix and the entire payload arrive in a single recv()
- * and no second syscall is needed.
- */
-
-#define WSGI_REQUEST_FRAME_PREREAD 4096
-
 static apr_status_t wsgi_read_strings(apr_socket_t *sock, char ***s,
                                       apr_pool_t *p)
 {
     apr_status_t rv;
 
-    char preread[WSGI_REQUEST_FRAME_PREREAD];
-    apr_size_t got;
-    apr_size_t len;
-    apr_size_t payload_have;
-
     apr_size_t total;
 
     apr_size_t n;
@@ -1953,31 +1939,22 @@ static apr_status_t wsgi_read_strings(apr_socket_t *sock, char ***s,
     char *nul;
 
     /*
-     * Opportunistic first read into a stack buffer. Each daemon
-     * connection is per-request, so there is no risk of
-     * over-reading into a following request.
+     * Read the length prefix and then exactly that many payload bytes.
+     * Both reads are bounded to the framed size on purpose. The request
+     * body that the Apache child sends immediately afterwards on the
+     * same connection is framed as chunked transfer encoding and is
+     * consumed later by the daemon's HTTP_IN dechunk filter reading the
+     * very same socket. Reading even one byte past the environment
+     * frame here would swallow the leading body bytes, leaving the
+     * dechunk filter with a truncated stream that fails the body read
+     * with APR_INCOMPLETE. This matters when the deferred-content
+     * handshake is disabled (script reloading off and no queue timeout),
+     * where the child sends the environment frame and the body back to
+     * back in a single burst.
      */
 
-    len = sizeof(preread);
-    if ((rv = apr_socket_recv(sock, preread, &len)) != APR_SUCCESS)
+    if ((rv = wsgi_socket_read(sock, &total, sizeof(total))) != APR_SUCCESS)
         return rv;
-    got = len;
-
-    /*
-     * Top up until we have at least the length prefix. In practice
-     * the first recv() already covers this, but stream sockets can
-     * deliver short reads so handle the case explicitly.
-     */
-
-    while (got < sizeof(total))
-    {
-        len = sizeof(preread) - got;
-        if ((rv = apr_socket_recv(sock, preread + got, &len)) != APR_SUCCESS)
-            return rv;
-        got += len;
-    }
-
-    memcpy(&total, preread, sizeof(total));
 
     /*
      * Reject frames too small to hold the string count or larger than
@@ -1991,23 +1968,8 @@ static apr_status_t wsgi_read_strings(apr_socket_t *sock, char ***s,
     offset = buffer;
     end = buffer + total;
 
-    /*
-     * Copy whatever payload arrived with the length prefix, clamped
-     * at total defensively. Fall back to a blocking read for any
-     * remainder that did not fit in the preread buffer.
-     */
-
-    payload_have = got - sizeof(total);
-    if (payload_have > total)
-        payload_have = total;
-    memcpy(buffer, preread + sizeof(total), payload_have);
-
-    if (payload_have < total)
-    {
-        if ((rv = wsgi_socket_read(sock, buffer + payload_have,
-                                   total - payload_have)) != APR_SUCCESS)
-            return rv;
-    }
+    if ((rv = wsgi_socket_read(sock, buffer, total)) != APR_SUCCESS)
+        return rv;
 
     memcpy(&n, offset, sizeof(n));
     offset += sizeof(n);

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.5.dev1}/src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 6
 #define MOD_WSGI_MINORVERSION_NUMBER 0
-#define MOD_WSGI_MICROVERSION_NUMBER 3
-#define MOD_WSGI_VERSION_STRING "6.0.3.dev1"
+#define MOD_WSGI_MICROVERSION_NUMBER 5
+#define MOD_WSGI_VERSION_STRING "6.0.5.dev1"
 
 /* ------------------------------------------------------------------------- */