uWSGI 2.0.29__tar.gz → 2.0.30__tar.gz

{uwsgi-2.0.29 → uwsgi-2.0.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: uWSGI
-Version: 2.0.29
+Version: 2.0.30
 Summary: The uWSGI server
 Home-page: https://uwsgi-docs.readthedocs.io/en/latest/
 Author: Unbit

{uwsgi-2.0.29 → uwsgi-2.0.30}/core/uwsgi.c

@@ -3105,13 +3105,12 @@ next:
 	//init apps hook (if not lazy)
 	if (!uwsgi.lazy && !uwsgi.lazy_apps) {
 		uwsgi_init_all_apps();
+		// Register uwsgi atexit plugin callbacks after all applications have
+		// been loaded. This ensures plugin atexit callbacks are called prior
+		// to application registered atexit callbacks.
+		atexit(uwsgi_plugins_atexit);
 	}
 
-	// Register uwsgi atexit plugin callbacks after all applications have
-	// been loaded. This ensures plugin atexit callbacks are called prior
-	// to application registered atexit callbacks.
-	atexit(uwsgi_plugins_atexit);
-
 	if (!uwsgi.master_as_root) {
 		uwsgi_as_root();
 	}
@@ -3452,6 +3451,11 @@ void uwsgi_worker_run() {
 
 	if (uwsgi.lazy || uwsgi.lazy_apps) {
 		uwsgi_init_all_apps();
+
+		// Register uwsgi atexit plugin callbacks after all applications have
+		// been loaded. This ensures plugin atexit callbacks are called prior
+		// to application registered atexit callbacks.
+		atexit(uwsgi_plugins_atexit);
 	}
 
 	// some apps could be mounted only on specific workers

{uwsgi-2.0.29 → uwsgi-2.0.30}/plugins/python/python_plugin.c

@@ -1166,7 +1166,9 @@ void uwsgi_python_init_apps() {
 
 	// prepare for stack suspend/resume
 	if (uwsgi.async > 1) {
-#ifdef UWSGI_PY312
+#ifdef UWSGI_PY314
+		up.current_py_recursion_remaining = uwsgi_malloc(sizeof(int)*uwsgi.async);
+#elif defined UWSGI_PY312
 		up.current_c_recursion_remaining = uwsgi_malloc(sizeof(int)*uwsgi.async);
 		up.current_py_recursion_remaining = uwsgi_malloc(sizeof(int)*uwsgi.async);
 #elif defined UWSGI_PY311
@@ -1608,7 +1610,10 @@ void uwsgi_python_suspend(struct wsgi_request *wsgi_req) {
 	PyGILState_Release(pgst);
 
 	if (wsgi_req) {
-#ifdef UWSGI_PY313
+#ifdef UWSGI_PY314
+		up.current_py_recursion_remaining[wsgi_req->async_id] = tstate->py_recursion_remaining;
+		up.current_frame[wsgi_req->async_id] = tstate->current_frame;
+#elif defined UWSGI_PY313
 		up.current_c_recursion_remaining[wsgi_req->async_id] = tstate->c_recursion_remaining;
 		up.current_py_recursion_remaining[wsgi_req->async_id] = tstate->py_recursion_remaining;
 		up.current_frame[wsgi_req->async_id] = tstate->current_frame;
@@ -1625,7 +1630,10 @@ void uwsgi_python_suspend(struct wsgi_request *wsgi_req) {
 #endif
 	}
 	else {
-#ifdef UWSGI_PY313
+#ifdef UWSGI_PY314
+		up.current_main_py_recursion_remaining = tstate->py_recursion_remaining;
+		up.current_main_frame = tstate->current_frame;
+#elif defined UWSGI_PY313
 		up.current_main_c_recursion_remaining = tstate->c_recursion_remaining;
 		up.current_main_py_recursion_remaining = tstate->py_recursion_remaining;
 		up.current_main_frame = tstate->current_frame;
@@ -1869,7 +1877,10 @@ void uwsgi_python_resume(struct wsgi_request *wsgi_req) {
 	PyGILState_Release(pgst);
 
 	if (wsgi_req) {
-#ifdef UWSGI_PY313
+#ifdef UWSGI_PY314
+		tstate->py_recursion_remaining = up.current_py_recursion_remaining[wsgi_req->async_id];
+		tstate->current_frame = up.current_frame[wsgi_req->async_id];
+#elif defined UWSGI_PY313
 		tstate->c_recursion_remaining = up.current_c_recursion_remaining[wsgi_req->async_id];
 		tstate->py_recursion_remaining = up.current_py_recursion_remaining[wsgi_req->async_id];
 		tstate->current_frame = up.current_frame[wsgi_req->async_id];
@@ -1886,7 +1897,10 @@ void uwsgi_python_resume(struct wsgi_request *wsgi_req) {
 #endif
 	}
 	else {
-#ifdef UWSGI_PY313
+#ifdef UWSGI_PY314
+		tstate->py_recursion_remaining = up.current_main_py_recursion_remaining;
+		tstate->current_frame = up.current_main_frame;
+#elif defined UWSGI_PY313
 		tstate->c_recursion_remaining = up.current_main_c_recursion_remaining;
 		tstate->py_recursion_remaining = up.current_main_py_recursion_remaining;
 		tstate->current_frame = up.current_main_frame;

{uwsgi-2.0.29 → uwsgi-2.0.30}/plugins/python/uwsgi_python.h

@@ -29,6 +29,10 @@
 #  define UWSGI_PY313
 #endif
 
+#if (PY_VERSION_HEX >= 0x030e0000)
+#  define UWSGI_PY314
+#endif
+
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 7
 #define HAS_NOT_PyMemoryView_FromBuffer
 #endif
@@ -172,7 +176,13 @@ struct uwsgi_python {
 
 	char *callable;
 
-#ifdef UWSGI_PY313
+#ifdef UWSGI_PY314
+	int *current_py_recursion_remaining;
+	struct _PyInterpreterFrame **current_frame;
+
+	int current_main_py_recursion_remaining;
+	struct _PyInterpreterFrame *current_main_frame;
+#elif defined UWSGI_PY313
 	int *current_c_recursion_remaining;
 	int *current_py_recursion_remaining;
 	struct _PyInterpreterFrame **current_frame;

{uwsgi-2.0.29 → uwsgi-2.0.30}/uwsgi.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name        = 'uwsgi'
   s.license     = 'GPL-2'
   s.version     = `python -c "import uwsgiconfig as uc; print uc.uwsgi_version"`.sub(/-dev-.*/,'')
-  s.date        = '2025-04-11'
+  s.date        = '2025-06-03'
   s.summary     = "uWSGI"
   s.description = "The uWSGI server for Ruby/Rack"
   s.authors     = ["Unbit"]

{uwsgi-2.0.29 → uwsgi-2.0.30}/uwsgiconfig.py

@@ -1,6 +1,6 @@
 # uWSGI build system
 
-uwsgi_version = '2.0.29'
+uwsgi_version = '2.0.30'
 
 import os
 import re