Merge branch 'develop' into feature/request-metrics

Author: GrahamDumpleton

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.4.22
    release-notes/version-4.4.21
    release-notes/version-4.4.20
    release-notes/version-4.4.19

docs/release-notes/version-4.4.22.rst

@@ -0,0 +1,19 @@
+==============
+Version 4.4.22
+==============
+
+Version 4.4.22 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.4.22
+
+For details on the availability of Windows binaries see:
+
+  https://github.com/GrahamDumpleton/mod_wsgi/tree/master/win32
+
+Bugs Fixed
+----------
+
+1. Stack traces logged at ``INFO`` level when a request timeout occurred
+were not displaying correctly when Python 3 was being used. It is possible
+that the logging code could also have caused the process to then crash as
+the process was shutting down.

src/server/mod_wsgi.c

@@ -8965,50 +8965,40 @@ static void wsgi_log_stack_traces(void)
                 while (current) {
                     int lineno;
 
-                    PyObject *filename = NULL;
-                    PyObject *name = NULL;
+                    char *filename = NULL;
+                    char *name = NULL;
 
                     lineno = current->f_lineno;
 
-#if PY_MAJOR_VERSION > 3
-                    filename = PyUnicode_EncodeUTF8(
-                            current->f_code->co_filename);
-                    name = PyUnicode_EncodeUTF8(
-                            current->f_code->co_name);
+#if PY_MAJOR_VERSION >= 3
+                    filename = PyUnicode_AsUTF8(current->f_code->co_filename);
+                    name = PyUnicode_AsUTF8(current->f_code->co_name);
 #else
-                    Py_INCREF(current->f_code->co_filename);
-                    filename = current->f_code->co_filename;
-                    Py_INCREF(current->f_code->co_name);
-                    name = current->f_code->co_name;
+                    filename = PyString_AsString(current->f_code->co_filename);
+                    name = PyString_AsString(current->f_code->co_name);
 #endif
 
                     if (current == (PyFrameObject *)frame) {
                         ap_log_error(APLOG_MARK, APLOG_INFO, 0, wsgi_server,
                                 "mod_wsgi (pid=%d): Thread %ld executing "
                                 "file \"%s\", line %d, in %s", getpid(),
-                                thread_id, PyString_AsString(filename),
-                                lineno, PyString_AsString(name));
+                                thread_id, filename, lineno, name);
                     }
                     else {
                         if (current->f_back) {
                             ap_log_error(APLOG_MARK, APLOG_INFO, 0, wsgi_server,
                                     "mod_wsgi (pid=%d): called from file "
                                     "\"%s\", line %d, in %s,", getpid(),
-                                    PyString_AsString(filename), lineno,
-                                    PyString_AsString(name));
+                                    filename, lineno, name);
                         }
                         else {
                             ap_log_error(APLOG_MARK, APLOG_INFO, 0, wsgi_server,
                                     "mod_wsgi (pid=%d): called from file "
                                     "\"%s\", line %d, in %s.", getpid(),
-                                    PyString_AsString(filename), lineno,
-                                    PyString_AsString(name));
+                                    filename, lineno, name);
                         }
                     }
 
-                    Py_DECREF(filename);
-                    Py_DECREF(name);
-
                     current = current->f_back;
                 }
             }

src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 4
-#define MOD_WSGI_MICROVERSION_NUMBER 21
-#define MOD_WSGI_VERSION_STRING "4.4.21"
+#define MOD_WSGI_MICROVERSION_NUMBER 22
+#define MOD_WSGI_VERSION_STRING "4.4.22"
 
 /* ------------------------------------------------------------------------- */