diff --git a/0f34844009075391c55419a3afb90e469facf35e.patch b/0f34844009075391c55419a3afb90e469facf35e.patch new file mode 100644 index 0000000..1cd41bf --- /dev/null +++ b/0f34844009075391c55419a3afb90e469facf35e.patch @@ -0,0 +1,41 @@ +From 0f34844009075391c55419a3afb90e469facf35e Mon Sep 17 00:00:00 2001 +From: Graham Dumpleton +Date: Tue, 14 May 2019 16:14:07 +1000 +Subject: [PATCH] Changed functions to pre/post actions when forking. + +--- + src/server/mod_wsgi.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/server/mod_wsgi.c b/src/server/mod_wsgi.c +index 2e4bb24..bf55945 100644 +--- a/src/server/mod_wsgi.c ++++ b/src/server/mod_wsgi.c +@@ -4345,8 +4345,13 @@ static void wsgi_python_child_init(apr_pool_t *p) + * do it if Python was initialised in parent process. + */ + +- if (wsgi_python_initialized && !wsgi_python_after_fork) ++ if (wsgi_python_initialized && !wsgi_python_after_fork) { ++#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) ++ PyOS_AfterFork_Child(); ++#else + PyOS_AfterFork(); ++#endif ++ } + + /* Finalise any Python objects required by child process. */ + +@@ -10422,6 +10427,12 @@ static int wsgi_start_process(apr_pool_t *p, WSGIDaemonProcess *daemon) + wsgi_exit_daemon_process(0); + } + ++ if (wsgi_python_initialized) { ++#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) ++ PyOS_AfterFork_Parent(); ++#endif ++ } ++ + apr_pool_note_subprocess(p, &daemon->process, APR_KILL_AFTER_TIMEOUT); + apr_proc_other_child_register(&daemon->process, wsgi_manage_process, + daemon, NULL, p); diff --git a/b03b02df6318afe26052db5b0365732152cacea2.patch b/b03b02df6318afe26052db5b0365732152cacea2.patch new file mode 100644 index 0000000..ff5b5b5 --- /dev/null +++ b/b03b02df6318afe26052db5b0365732152cacea2.patch @@ -0,0 +1,55 @@ +From b03b02df6318afe26052db5b0365732152cacea2 Mon Sep 17 00:00:00 2001 +From: Graham Dumpleton +Date: Tue, 14 May 2019 16:14:42 +1000 +Subject: [PATCH] Use official APIs for accessing interpreter list. + +--- + src/server/wsgi_interp.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/src/server/wsgi_interp.c b/src/server/wsgi_interp.c +index 4a94850..3fbca04 100644 +--- a/src/server/wsgi_interp.c ++++ b/src/server/wsgi_interp.c +@@ -338,9 +338,10 @@ static PyObject *ShutdownInterpreter_call( + + PyThreadState_Swap(NULL); + +- tstate = tstate->interp->tstate_head; ++ tstate = PyInterpreterState_ThreadHead(tstate->interp); ++ + while (tstate) { +- tstate_next = tstate->next; ++ tstate_next = PyThreadState_Next(tstate); + if (tstate != tstate_save) { + PyThreadState_Swap(tstate); + PyThreadState_Clear(tstate); +@@ -436,9 +437,13 @@ InterpreterObject *newInterpreterObject(const char *name) + */ + + if (!name) { ++#if PY_MAJOR_VERSION > 3 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7) ++ interp = PyInterpreterState_Main(); ++#else + interp = PyInterpreterState_Head(); +- while (interp->next) +- interp = interp->next; ++ while (PyInterpreterState_Next(interp)) ++ interp = PyInterpreterState_Next(interp); ++#endif + + name = ""; + } +@@ -1883,9 +1888,10 @@ static void Interpreter_dealloc(InterpreterObject *self) + + PyThreadState_Swap(NULL); + +- tstate = tstate->interp->tstate_head; ++ tstate = PyInterpreterState_ThreadHead(tstate->interp); ++ + while (tstate) { +- tstate_next = tstate->next; ++ tstate_next = PyThreadState_Next(tstate); + if (tstate != tstate_save) { + PyThreadState_Swap(tstate); + PyThreadState_Clear(tstate); diff --git a/mod_wsgi.spec b/mod_wsgi.spec index 8deae7e..0f53854 100644 --- a/mod_wsgi.spec +++ b/mod_wsgi.spec @@ -30,6 +30,11 @@ Source1: wsgi.conf Source2: wsgi-python3.conf Patch1: mod_wsgi-4.5.20-exports.patch +# Python 3.8 support +# https://bugzilla.redhat.com/show_bug.cgi?id=1705480 +Patch2: https://github.com/GrahamDumpleton/mod_wsgi/commit/0f34844009075391c55419a3afb90e469facf35e.patch +Patch3: https://github.com/GrahamDumpleton/mod_wsgi/commit/b03b02df6318afe26052db5b0365732152cacea2.patch + BuildRequires: httpd-devel BuildRequires: gcc @@ -78,8 +83,7 @@ Obsoletes: mod_wsgi < %{version}-%{release} %endif %prep -%setup -qn %{name}-%{version} -%patch1 -p1 -b .exports +%autosetup -p1 -n %{name}-%{version} : Python2=%{with_python2} Python3=%{with_python3}