Merge branch 'release/4.5.15'

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.5.15
    release-notes/version-4.5.14
    release-notes/version-4.5.13
    release-notes/version-4.5.12

docs/release-notes/version-4.5.15.rst

@@ -0,0 +1,15 @@
+==============
+Version 4.5.15
+==============
+
+Version 4.5.15 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.5.15
+
+Bugs Fixed
+----------
+
+* Incorrect version for mod_wsgi was being reported in server token.
+
+* On 32 bit platforms, when reading from request content, all input would
+  be returned and the chunk size would be ignored.

src/server/mod_wsgi.c

@@ -1235,7 +1235,11 @@ static apr_int64_t Input_read_from_input(InputObject *self, char *buffer,
 
 static PyObject *Input_read(InputObject *self, PyObject *args)
 {
-    apr_off_t size = -1;
+#if defined(HAVE_LONG_LONG)
+    PY_LONG_LONG size = -1;
+#else
+    long size = -1;
+#endif
 
     PyObject *result = NULL;
     char *buffer = NULL;
@@ -1249,8 +1253,13 @@ static PyObject *Input_read(InputObject *self, PyObject *args)
         return NULL;
     }
 
+#if defined(HAVE_LONG_LONG)
+    if (!PyArg_ParseTuple(args, "|L:read", &size))
+        return NULL;
+#else
     if (!PyArg_ParseTuple(args, "|l:read", &size))
         return NULL;
+#endif
 
 #if defined(MOD_WSGI_WITH_DAEMONS)
     if (wsgi_idle_timeout && !self->ignore_activity) {
@@ -1512,7 +1521,11 @@ static PyObject *Input_read(InputObject *self, PyObject *args)
 
 static PyObject *Input_readline(InputObject *self, PyObject *args)
 {
-    apr_off_t size = -1;
+#if defined(HAVE_LONG_LONG)
+    PY_LONG_LONG size = -1;
+#else
+    long size = -1;
+#endif
 
     PyObject *result = NULL;
     char *buffer = NULL;
@@ -1525,8 +1538,13 @@ static PyObject *Input_readline(InputObject *self, PyObject *args)
         return NULL;
     }
 
+#if defined(HAVE_LONG_LONG)
+    if (!PyArg_ParseTuple(args, "|L:readline", &size))
+        return NULL;
+#else
     if (!PyArg_ParseTuple(args, "|l:readline", &size))
         return NULL;
+#endif
 
     if (self->seen_error) {
         PyErr_SetString(PyExc_IOError, "Apache/mod_wsgi request data read "

src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 5
-#define MOD_WSGI_MICROVERSION_NUMBER 13
-#define MOD_WSGI_VERSION_STRING "4.5.14"
+#define MOD_WSGI_MICROVERSION_NUMBER 15
+#define MOD_WSGI_VERSION_STRING "4.5.15"
 
 /* ------------------------------------------------------------------------- */