Fix deprecation warning in PyArg_ParseTuple().

GrahamDumpleton · Feb 13, 2021 · 2c9d1b3 · 2c9d1b3
1 parent 5ef3989
commit 2c9d1b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/docs/release-notes/version-4.8.0.rst b/docs/release-notes/version-4.8.0.rst
@@ -55,6 +55,11 @@ Bugs Fixed
   opens up security holes with the potential for user code to run as the
   ``root`` user when Python is initialized.
 
+* Fix a Python deprecation warning for ``PyArg_ParseTuple()`` which would
+  cause the process to crash when deprecation warnings were turned on
+  globally for an application. Crash was occuring whenever anything was
+  output to Apache error log via ``print()``.
+
 Features Changed
 ----------------
 

diff --git a/src/server/wsgi_logger.c b/src/server/wsgi_logger.c
@@ -223,7 +223,7 @@ static PyObject *Log_isatty(LogObject *self, PyObject *args)
     return Py_False;
 }
 
-static void Log_queue(LogObject *self, const char *msg, int len)
+static void Log_queue(LogObject *self, const char *msg, Py_ssize_t len)
 {
     const char *p = NULL;
     const char *q = NULL;
@@ -330,7 +330,7 @@ static void Log_queue(LogObject *self, const char *msg, int len)
 static PyObject *Log_write(LogObject *self, PyObject *args)
 {
     const char *msg = NULL;
-    int len = -1;
+    Py_ssize_t len = -1;
 
     WSGIThreadInfo *thread_info = NULL;
 

diff --git a/src/server/wsgi_python.h b/src/server/wsgi_python.h
@@ -21,6 +21,8 @@
 
 /* ------------------------------------------------------------------------- */
 
+#define PY_SSIZE_T_CLEAN 1
+
 #include <Python.h>
 
 #if !defined(PY_VERSION_HEX)