Merge branch 'release/4.6.1'

Author: GrahamDumpleton

docs/release-notes.rst

@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
    :maxdepth: 2
 
+   release-notes/version-4.6.1
    release-notes/version-4.6.0
 
    release-notes/version-4.5.24

docs/release-notes/version-4.6.1.rst

@@ -0,0 +1,13 @@
+=============
+Version 4.6.1
+=============
+
+Version 4.6.1 of mod_wsgi can be obtained from:
+
+  https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.6.1
+
+Bugs Fixed
+----------
+
+* APR version 1.4.X on RHEL/CentOS doesn't have ``apr_hash_this_key()``
+  function. Swap to using ``apr_hash_this()`` instead.

src/server/wsgi_interp.c

@@ -2613,21 +2613,25 @@ void wsgi_publish_process_stopping(char *reason)
         PyObject *event = NULL;
         PyObject *object = NULL;
 
-        interp = wsgi_acquire_interpreter((char *)apr_hash_this_key(hi));
+        const void *key;
 
-	event = PyDict_New();
+        apr_hash_this(hi, &key, NULL, NULL);
+
+        interp = wsgi_acquire_interpreter((char *)key);
+
+        event = PyDict_New();
 
 #if PY_MAJOR_VERSION >= 3
-	object = PyUnicode_DecodeLatin1(reason, strlen(reason), NULL);
+        object = PyUnicode_DecodeLatin1(reason, strlen(reason), NULL);
 #else
-	object = PyString_FromString(reason);
+        object = PyString_FromString(reason);
 #endif
-	PyDict_SetItemString(event, "shutdown_reason", object);
-	Py_DECREF(object);
+        PyDict_SetItemString(event, "shutdown_reason", object);
+        Py_DECREF(object);
 
-	wsgi_publish_event("process_stopping", event);
+        wsgi_publish_event("process_stopping", event);
 
-	Py_DECREF(event);
+        Py_DECREF(event);
 
         wsgi_release_interpreter(interp);
 

src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 4
 #define MOD_WSGI_MINORVERSION_NUMBER 6
-#define MOD_WSGI_MICROVERSION_NUMBER 0
-#define MOD_WSGI_VERSION_STRING "4.6.0"
+#define MOD_WSGI_MICROVERSION_NUMBER 1
+#define MOD_WSGI_VERSION_STRING "4.6.1"
 
 /* ------------------------------------------------------------------------- */