uWSGI 2.0.26__tar.gz → 2.0.27__tar.gz

{uwsgi-2.0.26 → uwsgi-2.0.27}/.github/workflows/test.yml

@@ -22,14 +22,18 @@ jobs:
       run: make unittests
 
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Install dependencies
       run: |
         sudo apt update -qq
         sudo apt install --no-install-recommends -qqyf \
-          libpcre2-dev libjansson-dev libcap2-dev
+          libpcre2-dev libjansson-dev libcap2-dev \
+          php-dev libphp-embed libargon2-dev libsodium-dev \
+          pypy3
     - uses: actions/checkout@v4
+    - name: Set env
+      run: echo "PROFILE=integration-tests" >> $GITHUB_ENV
     - name: Run integration tests
       run: make all tests
 
@@ -37,7 +41,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         test-suite: [python, deadlocks]
     steps:
     - name: Add deadnakes ppa

{uwsgi-2.0.26 → uwsgi-2.0.27}/PKG-INFO

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

uwsgi-2.0.27/buildconf/integration-tests.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+inherit = base
+main_plugin =
+plugins = python,php,pypy

{uwsgi-2.0.26 → uwsgi-2.0.27}/core/init.c

@@ -432,8 +432,8 @@ void sanitize_args() {
                 uwsgi.cores = uwsgi.async;
         }
 
+        uwsgi.has_threads = 1;
         if (uwsgi.threads > 1) {
-                uwsgi.has_threads = 1;
                 uwsgi.cores = uwsgi.threads;
         }
 

{uwsgi-2.0.26 → uwsgi-2.0.27}/core/loop.c

@@ -127,6 +127,7 @@ void *simple_loop_run(void *arg1) {
 	int main_queue = event_queue_init();
 
 	uwsgi_add_sockets_to_queue(main_queue, core_id);
+	event_queue_add_fd_read(main_queue, uwsgi.loop_stop_pipe[0]);
 
 	if (uwsgi.signal_socket > -1) {
 		event_queue_add_fd_read(main_queue, uwsgi.signal_socket);

{uwsgi-2.0.26 → uwsgi-2.0.27}/core/master_utils.c

@@ -54,6 +54,12 @@ void uwsgi_destroy_processes() {
 
         uwsgi_detach_daemons();
 
+	for (i = 1; i <= uwsgi.numproc; i++) {
+		if (uwsgi.workers[i].pid > 0) {
+			waitpid(uwsgi.workers[i].pid, &waitpid_status, 0);
+		}
+	}
+
         for (i = 0; i < ushared->gateways_cnt; i++) {
                 if (ushared->gateways[i].pid > 0) {
                         kill(ushared->gateways[i].pid, SIGKILL);

{uwsgi-2.0.26 → uwsgi-2.0.27}/core/uwsgi.c

@@ -197,7 +197,7 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"freebind", no_argument, 0, "put socket in freebind mode", uwsgi_opt_true, &uwsgi.freebind, 0},
 #endif
 	{"map-socket", required_argument, 0, "map sockets to specific workers", uwsgi_opt_add_string_list, &uwsgi.map_socket, 0},
-	{"enable-threads", no_argument, 'T', "enable threads", uwsgi_opt_true, &uwsgi.has_threads, 0},
+	{"enable-threads", no_argument, 'T', "enable threads (stub option this is true by default)", uwsgi_opt_true, &uwsgi.has_threads, 0},
 	{"no-threads-wait", no_argument, 0, "do not wait for threads cancellation on quit/reload", uwsgi_opt_true, &uwsgi.no_threads_wait, 0},
 
 	{"auto-procname", no_argument, 0, "automatically set processes name to something meaningful", uwsgi_opt_true, &uwsgi.auto_procname, 0},
@@ -1224,16 +1224,17 @@ void gracefully_kill(int signum) {
 
 	uwsgi_log("Gracefully killing worker %d (pid: %d)...\n", uwsgi.mywid, uwsgi.mypid);
 	uwsgi.workers[uwsgi.mywid].manage_next_request = 0;
+
 	if (uwsgi.threads > 1) {
-		struct wsgi_request *wsgi_req = current_wsgi_req();
-		wait_for_threads();
-		if (!uwsgi.workers[uwsgi.mywid].cores[wsgi_req->async_id].in_request) {
-			if (uwsgi.workers[uwsgi.mywid].shutdown_sockets)
-				uwsgi_shutdown_all_sockets();
-			exit(UWSGI_RELOAD_CODE);
+		// Stop event_queue_wait() in other threads.
+		// We use loop_stop_pipe only in threaded workers to avoid
+		// unintensional behavior changes in single threaded workers.
+		int fd;
+		if ((fd = uwsgi.loop_stop_pipe[1]) > 0) {
+			close(fd);
+			uwsgi.loop_stop_pipe[1] = 0;
 		}
 		return;
-		// never here
 	}
 
 	// still not found a way to gracefully reload in async mode
@@ -1265,6 +1266,17 @@ static void simple_goodbye_cruel_world() {
 		// Avoid showing same message from all threads.
 		uwsgi_log("...The work of process %d is done. Seeya!\n", getpid());
 	}
+
+	if (uwsgi.threads > 1) {
+		// Stop event_queue_wait() in other threads.
+		// We use loop_stop_pipe only in threaded workers to avoid
+		// unintensional behavior changes in single threaded workers.
+		int fd;
+		if ((fd = uwsgi.loop_stop_pipe[1]) > 0) {
+			close(fd);
+			uwsgi.loop_stop_pipe[1] = 0;
+		}
+	}
 }
 
 void goodbye_cruel_world() {
@@ -3539,6 +3551,10 @@ void uwsgi_ignition() {
 			exit(1);
 		}
 	}
+	if (pipe(&uwsgi.loop_stop_pipe[0])) {
+		uwsgi_error("pipe()")
+		exit(1);
+	}
 
 	// mark the worker as "accepting" (this is a mark used by chain reloading)
 	uwsgi.workers[uwsgi.mywid].accepting = 1;

{uwsgi-2.0.26 → uwsgi-2.0.27}/plugins/php/common.h

@@ -7,5 +7,7 @@
 
 #include "ext/session/php_session.h"
 
+#include "ext/standard/head.h"
+
 #include <uwsgi.h>
 

{uwsgi-2.0.26 → uwsgi-2.0.27}/plugins/php/php_plugin.c

@@ -489,6 +489,21 @@ PHP_FUNCTION(uwsgi_signal) {
         RETURN_NULL();
 }
 
+PHP_FUNCTION(uwsgi_disconnect) {
+
+	struct wsgi_request *wsgi_req = (struct wsgi_request *) SG(server_context);
+
+	php_output_end_all();
+	php_header();
+
+	uwsgi_disconnect(wsgi_req);
+
+	php_output_set_status(PHP_OUTPUT_DISABLED);
+
+	RETURN_NULL();
+}
+
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
@@ -507,6 +522,7 @@ zend_function_entry uwsgi_php_functions[] = {
 	PHP_FE(uwsgi_cache_del, arginfo_void)
 	PHP_FE(uwsgi_cache_clear, arginfo_void)
 	PHP_FE(uwsgi_cache_exists, arginfo_void)
+	PHP_FE(uwsgi_disconnect, arginfo_void)
 	{ NULL, NULL, NULL},
 };
 

{uwsgi-2.0.26 → uwsgi-2.0.27}/plugins/pypy/pypy_setup.py

@@ -1,7 +1,7 @@
 import sys
 import os
 sys.path.insert(0, '.')
-sys.path.extend(os.environ.get('PYTHONPATH','').split(os.pathsep))
+sys.path.extend(os.environ.get('PYTHONPATH', '').split(os.pathsep))
 import imp
 import traceback
 
@@ -48,15 +48,15 @@ uwsgi_cdef = []
 uwsgi_defines = []
 uwsgi_cflags = ffi.string(lib0.uwsgi_get_cflags()).split()
 for cflag in uwsgi_cflags:
-    if cflag.startswith('-D'):
-        line = cflag[2:]
+    if cflag.startswith(b'-D'):
+        line = cflag[2:].decode()
         if '=' in line:
             (key, value) = line.split('=', 1)
             uwsgi_cdef.append('#define %s ...' % key)
-            uwsgi_defines.append('#define %s %s' % (key, value.replace('\\"','"').replace('""','"')))            
+            uwsgi_defines.append('#define %s %s' % (key, value.replace('\\"','"').replace('""','"')))
         else:
             uwsgi_cdef.append('#define %s ...' % line)
-            uwsgi_defines.append('#define %s 1' % line)            
+            uwsgi_defines.append('#define %s 1' % line)
 uwsgi_dot_h = ffi.string(lib0.uwsgi_get_dot_h())
 
 # uwsgi definitions
@@ -166,16 +166,27 @@ struct uwsgi_server {
 	struct uwsgi_plugin *p[];
 	...;
 };
-struct uwsgi_server uwsgi;
+extern struct uwsgi_server uwsgi;
 
-struct uwsgi_plugin pypy_plugin;
+extern struct uwsgi_plugin pypy_plugin;
 
-const char *uwsgi_pypy_version;
+extern const char *uwsgi_pypy_version;
 
 char *uwsgi_binary_path();
 
 void *uwsgi_malloc(size_t);
 
+struct uwsgi_logvar {
+        char key[256];
+        uint8_t keylen;
+        char val[256];
+        uint8_t vallen;
+        struct uwsgi_logvar *next;
+};
+
+struct uwsgi_logvar *uwsgi_logvar_get(struct wsgi_request *, char *, uint8_t);
+void uwsgi_logvar_add(struct wsgi_request *, char *, uint8_t, char *, uint8_t);
+
 int uwsgi_response_prepare_headers(struct wsgi_request *, char *, size_t);
 int uwsgi_response_add_header(struct wsgi_request *, char *, uint16_t, char *, uint16_t);
 int uwsgi_response_write_body_do(struct wsgi_request *, char *, size_t);
@@ -237,7 +248,7 @@ void uwsgi_disconnect(struct wsgi_request *);
 
 int uwsgi_ready_fd(struct wsgi_request *);
 
-void set_user_harakiri(int);
+void set_user_harakiri(struct wsgi_request *, int);
 
 int uwsgi_metric_set(char *, char *, int64_t);
 int uwsgi_metric_inc(char *, char *, int64_t);
@@ -260,14 +271,13 @@ const char *uwsgi_pypy_version = UWSGI_VERSION;
 extern struct uwsgi_server uwsgi;
 extern struct uwsgi_plugin pypy_plugin;
 %s
-''' % ('\n'.join(uwsgi_defines), uwsgi_dot_h, hooks)
+''' % ('\n'.join(uwsgi_defines), uwsgi_dot_h.decode(), hooks)
 
 ffi.cdef(cdefines)
 lib = ffi.verify(cverify)
 libc = ffi.dlopen(None)
 
 
-
 """
 this is a global object point the the WSGI callable
 it sucks, i will fix it in the near future...
@@ -276,7 +286,7 @@ wsgi_application = None
 
 # fix argv if needed
 if len(sys.argv) == 0:
-    sys.argv.insert(0, ffi.string(lib.uwsgi_binary_path()))
+    sys.argv.insert(0, ffi.string(lib.uwsgi_binary_path()).decode())
 
 """
 execute source, we expose it as cffi callback to avoid deadlocks
@@ -293,7 +303,7 @@ load a wsgi module
 @ffi.callback("void(char *)")
 def uwsgi_pypy_loader(module):
     global wsgi_application
-    m = ffi.string(module)
+    m = ffi.string(module).decode()
     c = 'application'
     if ':' in m:
         m, c = m.split(':')
@@ -311,7 +321,7 @@ def uwsgi_pypy_file_loader(filename):
     global wsgi_application
     w = ffi.string(filename)
     c = 'application'
-    mod = imp.load_source('uwsgi_file_wsgi', w)
+    mod = imp.load_source('uwsgi_file_wsgi', w.decode())
     wsgi_application = getattr(mod, c)
 
 """
@@ -320,7 +330,7 @@ load a .ini paste app
 @ffi.callback("void(char *)")
 def uwsgi_pypy_paste_loader(config):
     global wsgi_application
-    c = ffi.string(config)
+    c = ffi.string(config).decode()
     if c.startswith('config:'):
         c = c[7:]
     if c[0] != '/':
@@ -329,7 +339,7 @@ def uwsgi_pypy_paste_loader(config):
         from logging.config import fileConfig
         fileConfig(c)
     except ImportError:
-        print "PyPy WARNING: unable to load logging.config"
+        print("PyPy WARNING: unable to load logging.config")
     from paste.deploy import loadapp
     wsgi_application = loadapp('config:%s' % c)
 
@@ -347,9 +357,9 @@ add an item to the pythonpath
 """
 @ffi.callback("void(char *)")
 def uwsgi_pypy_pythonpath(item):
-    path = ffi.string(item)
+    path = ffi.string(item).decode()
     sys.path.append(path)
-    print "added %s to pythonpath" % path
+    print("added %s to pythonpath" % path)
 
 
 """
@@ -443,15 +453,17 @@ def uwsgi_pypy_wsgi_handler(wsgi_req):
     def start_response(status, headers, exc_info=None):
         if exc_info:
             traceback.print_exception(*exc_info)
+        status = status.encode()
         lib.uwsgi_response_prepare_headers(wsgi_req, ffi.new("char[]", status), len(status))
         for hh in headers:
+            hh = (hh[0].encode(), hh[1].encode())
             lib.uwsgi_response_add_header(wsgi_req, ffi.new("char[]", hh[0]), len(hh[0]), ffi.new("char[]", hh[1]), len(hh[1]))
         return writer
 
     environ = {}
     iov = wsgi_req.hvec
     for i in range(0, wsgi_req.var_cnt, 2):
-        environ[ffi.string(ffi.cast("char*", iov[i].iov_base), iov[i].iov_len)] = ffi.string(ffi.cast("char*", iov[i+1].iov_base), iov[i+1].iov_len)
+        environ[ffi.string(ffi.cast("char*", iov[i].iov_base), iov[i].iov_len).decode()] = ffi.string(ffi.cast("char*", iov[i+1].iov_base), iov[i+1].iov_len).decode()
 
     environ['wsgi.version'] = (1, 0)
     scheme = 'http'
@@ -568,8 +580,8 @@ uwsgi.rpc = uwsgi_pypy_rpc
 
 def uwsgi_pypy_call(func, *args):
     node = None
-    if '@' in func:
-        (func, node) = func.split('@')
+    if b'@' in func:
+        (func, node) = func.split(b'@')
     return uwsgi_pypy_rpc(node, func, *args)
 uwsgi.call = uwsgi_pypy_call
     
@@ -708,7 +720,7 @@ uwsgi.suspend()
 def uwsgi_pypy_suspend():
     wsgi_req = uwsgi_pypy_current_wsgi_req()
     if lib.uwsgi.schedule_to_main:
-        lib.uwsgi.schedule_to_main(wsgi_req);
+        lib.uwsgi.schedule_to_main(wsgi_req)
 uwsgi.suspend = uwsgi_pypy_suspend
 
 """
@@ -723,7 +735,7 @@ def uwsgi_pypy_workers():
         worker['requests'] = lib.uwsgi.workers[i].requests
         worker['delta_requests'] = lib.uwsgi.workers[i].delta_requests
         worker['signals'] = lib.uwsgi.workers[i].signals
-        worker['exceptions'] = lib.uwsgi_worker_exceptions(i);
+        worker['exceptions'] = lib.uwsgi_worker_exceptions(i)
         worker['apps'] = []
         if lib.uwsgi.workers[i].cheaped:
             worker['status'] == 'cheap'
@@ -750,8 +762,8 @@ uwsgi.async_sleep(timeout)
 """
 def uwsgi_pypy_async_sleep(timeout):
     if timeout > 0:
-        wsgi_req = uwsgi_pypy_current_wsgi_req();
-        lib.async_add_timeout(wsgi_req, timeout);
+        wsgi_req = uwsgi_pypy_current_wsgi_req()
+        lib.async_add_timeout(wsgi_req, timeout)
 uwsgi.async_sleep = uwsgi_pypy_async_sleep
 
 """
@@ -770,7 +782,7 @@ uwsgi.connection_fd = lambda: uwsgi_pypy_current_wsgi_req().fd
 uwsgi.wait_fd_read(fd, timeout=0)
 """
 def uwsgi_pypy_wait_fd_read(fd, timeout=0):
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
     if lib.async_add_fd_read(wsgi_req, fd, timeout) < 0:
         raise Exception("unable to add fd %d to the event queue" % fd)
 uwsgi.wait_fd_read = uwsgi_pypy_wait_fd_read
@@ -779,7 +791,7 @@ uwsgi.wait_fd_read = uwsgi_pypy_wait_fd_read
 uwsgi.wait_fd_write(fd, timeout=0)
 """
 def uwsgi_pypy_wait_fd_write(fd, timeout=0):
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
     if lib.async_add_fd_write(wsgi_req, fd, timeout) < 0:
         raise Exception("unable to add fd %d to the event queue" % fd)
 uwsgi.wait_fd_write = uwsgi_pypy_wait_fd_write
@@ -788,7 +800,7 @@ uwsgi.wait_fd_write = uwsgi_pypy_wait_fd_write
 uwsgi.ready_fd()
 """
 def uwsgi_pypy_ready_fd():
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
     return lib.uwsgi_ready_fd(wsgi_req)
 uwsgi.ready_fd = uwsgi_pypy_ready_fd
     
@@ -800,7 +812,7 @@ def uwsgi_pypy_send(*args):
     if len(args) == 0:
         raise ValueError("uwsgi.send() takes at least 1 argument")
     elif len(args) == 1:
-        wsgi_req = uwsgi_pypy_current_wsgi_req();
+        wsgi_req = uwsgi_pypy_current_wsgi_req()
         fd = wsgi_req.fd
         data = args[0]
     else:
@@ -819,7 +831,7 @@ def uwsgi_pypy_recv(*args):
     if len(args) == 0:
         raise ValueError("uwsgi.recv() takes at least 1 argument")
     elif len(args) == 1:
-        wsgi_req = uwsgi_pypy_current_wsgi_req();
+        wsgi_req = uwsgi_pypy_current_wsgi_req()
         fd = wsgi_req.fd
         l = args[0]
     else:
@@ -846,8 +858,8 @@ uwsgi.disconnect = lambda: lib.uwsgi_disconnect(uwsgi_pypy_current_wsgi_req())
 uwsgi.websocket_recv()
 """
 def uwsgi_pypy_websocket_recv():
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
-    ub = lib.uwsgi_websocket_recv(wsgi_req);
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
+    ub = lib.uwsgi_websocket_recv(wsgi_req)
     if ub == ffi.NULL:
         raise IOError("unable to receive websocket message")
     ret = ffi.buffer(ub.buf, ub.pos)[:]
@@ -859,8 +871,8 @@ uwsgi.websocket_recv = uwsgi_pypy_websocket_recv
 uwsgi.websocket_recv_nb()
 """
 def uwsgi_pypy_websocket_recv_nb():
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
-    ub = lib.uwsgi_websocket_recv_nb(wsgi_req);
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
+    ub = lib.uwsgi_websocket_recv_nb(wsgi_req)
     if ub == ffi.NULL:
         raise IOError("unable to receive websocket message")
     ret = ffi.buffer(ub.buf, ub.pos)[:]
@@ -872,7 +884,7 @@ uwsgi.websocket_recv_nb = uwsgi_pypy_websocket_recv_nb
 uwsgi.websocket_handshake(key, origin)
 """
 def uwsgi_pypy_websocket_handshake(key='', origin='', proto=''):
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
     c_key = ffi.new('char[]', key)
     c_origin = ffi.new('char[]', origin)
     c_proto = ffi.new('char[]', proto)
@@ -884,7 +896,7 @@ uwsgi.websocket_handshake = uwsgi_pypy_websocket_handshake
 uwsgi.websocket_send(msg)
 """
 def uwsgi_pypy_websocket_send(msg):
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
     if lib.uwsgi_websocket_send(wsgi_req, ffi.new('char[]', msg), len(msg)) < 0:
         raise IOError("unable to send websocket message")
 uwsgi.websocket_send = uwsgi_pypy_websocket_send
@@ -893,7 +905,7 @@ uwsgi.websocket_send = uwsgi_pypy_websocket_send
 uwsgi.chunked_read(timeout=0)
 """
 def uwsgi_pypy_chunked_read(timeout=0):
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
     rlen = ffi.new("size_t*")
     chunk = lib.uwsgi_chunked_read(wsgi_req, rlen, timeout, 0)
     if chunk == ffi.NULL:
@@ -905,7 +917,7 @@ uwsgi.chunked_read = uwsgi_pypy_chunked_read
 uwsgi.chunked_read_nb()
 """
 def uwsgi_pypy_chunked_read_nb():
-    wsgi_req = uwsgi_pypy_current_wsgi_req();
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
     rlen = ffi.new("size_t*")
     chunk = lib.uwsgi_chunked_read(wsgi_req, rlen, 0, 1)
     if chunk == ffi.NULL:
@@ -915,14 +927,42 @@ def uwsgi_pypy_chunked_read_nb():
     return ffi.buffer(chunk, rlen[0])[:]
 uwsgi.chunked_read_nb = uwsgi_pypy_chunked_read_nb
 
-"""
-uwsgi.set_user_harakiri(sec)
-"""
-uwsgi.set_user_harakiri = lambda x: lib.set_user_harakiri(x)
+
+def uwsgi_pypy_set_user_harakiri(x):
+    """
+    uwsgi.set_user_harakiri(sec)
+    """
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
+    lib.set_user_harakiri(wsgi_req, x)
+uwsgi.set_user_harakiri = uwsgi_pypy_set_user_harakiri
+
+
+def uwsgi_pypy_get_logvar(key):
+    """
+    uwsgi.get_logvar(key)
+    """
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
+    c_key = ffi.new('char[]', key)
+    lv = lib.uwsgi_logvar_get(wsgi_req, c_key, len(key))
+    if lv:
+        return ffi.string(lv.val[0:lv.vallen])
+    return None
+uwsgi.get_logvar = uwsgi_pypy_get_logvar
+
+
+def uwsgi_pypy_set_logvar(key, val):
+    """
+    uwsgi.set_logvar(key, value)
+    """
+    wsgi_req = uwsgi_pypy_current_wsgi_req()
+    c_key = ffi.new('char[]', key)
+    c_val = ffi.new('char[]', val)
+    lib.uwsgi_logvar_add(wsgi_req, c_key, len(key), c_val, len(val))
+uwsgi.set_logvar = uwsgi_pypy_set_logvar
 
 
-print "Initialized PyPy with Python", sys.version
-print "PyPy Home:", sys.prefix
+print("Initialized PyPy with Python %s" % sys.version)
+print("PyPy Home: %s" % sys.prefix)
 
 
 """
@@ -939,7 +979,7 @@ def uwsgi_pypy_continulet_wrapper(cont):
 @ffi.callback("void()")
 def uwsgi_pypy_continulet_schedule():
     id = lib.uwsgi.wsgi_req.async_id
-    modifier1 = lib.uwsgi.wsgi_req.uh.modifier1;
+    modifier1 = lib.uwsgi.wsgi_req.uh.modifier1
 
     # generate a new continulet
     if not lib.uwsgi.wsgi_req.suspended:
@@ -961,7 +1001,7 @@ def uwsgi_pypy_continulet_schedule():
 @ffi.callback("void(struct wsgi_request *)")
 def uwsgi_pypy_continulet_switch(wsgi_req):
     id = wsgi_req.async_id
-    modifier1 = wsgi_req.uh.modifier1;
+    modifier1 = wsgi_req.uh.modifier1
 
     # this is called in the current continulet
     if lib.uwsgi.p[modifier1].suspend:
@@ -977,8 +1017,8 @@ def uwsgi_pypy_continulet_switch(wsgi_req):
     lib.uwsgi.wsgi_req = wsgi_req
     
 def uwsgi_pypy_setup_continulets():
-    if lib.uwsgi.async <= 1:
+    if lib.uwsgi["async"] < 1:
         raise Exception("pypy continulets require async mode !!!")
     lib.uwsgi.schedule_to_main = uwsgi_pypy_continulet_switch
     lib.uwsgi.schedule_to_req = uwsgi_pypy_continulet_schedule
-    print "*** PyPy Continulets engine loaded ***"
+    print("*** PyPy Continulets engine loaded ***")

{uwsgi-2.0.26 → uwsgi-2.0.27}/plugins/python/python_plugin.c

@@ -424,7 +424,7 @@ void uwsgi_python_post_fork() {
 	// reset python signal flags so child processes can trap signals
 	// Necessary if uwsgi fork hooks not called to update interpreter state
 	if (!up.call_uwsgi_fork_hooks && up.call_osafterfork) {
-#ifdef HAS_NOT_PyOS_AfterFork_Child
+#ifdef HAS_NOT_PYOS_FORK_STABLE_API
 		PyOS_AfterFork();
 #else
 		PyOS_AfterFork_Child();
@@ -1332,11 +1332,10 @@ void uwsgi_python_pre_uwsgi_fork() {
 		// Acquire the gil and import lock before forking in order to avoid
 		// deadlocks in workers
 		UWSGI_GET_GIL
-#if defined UWSGI_PY312
-		PyInterpreterState *interp = PyInterpreterState_Get();
-		_PyImport_AcquireLock(interp);
-#else
+#ifdef HAS_NOT_PYOS_FORK_STABLE_API
 		_PyImport_AcquireLock();
+#else
+		PyOS_BeforeFork();
 #endif
 	}
 }
@@ -1349,17 +1348,16 @@ void uwsgi_python_post_uwsgi_fork(int step) {
 	if (uwsgi.has_threads) {
 		if (step == 0) {
 			// Release locks within master process
-#if defined UWSGI_PY312
-			PyInterpreterState *interp = PyInterpreterState_Get();
-			_PyImport_ReleaseLock(interp);
-#else
+#ifdef HAS_NOT_PYOS_FORK_STABLE_API
 			_PyImport_ReleaseLock();
+#else
+			PyOS_AfterFork_Parent();
 #endif
 			UWSGI_RELEASE_GIL
 		}
 		else {
 			// Ensure thread state and locks are cleaned up in child process
-#ifdef HAS_NOT_PyOS_AfterFork_Child
+#ifdef HAS_NOT_PYOS_FORK_STABLE_API
 			PyOS_AfterFork();
 #else
 			PyOS_AfterFork_Child();
@@ -1610,7 +1608,11 @@ void uwsgi_python_suspend(struct wsgi_request *wsgi_req) {
 	PyGILState_Release(pgst);
 
 	if (wsgi_req) {
-#ifdef UWSGI_PY312
+#ifdef 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;
+#elif defined UWSGI_PY312
 		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->cframe;
@@ -1623,7 +1625,11 @@ void uwsgi_python_suspend(struct wsgi_request *wsgi_req) {
 #endif
 	}
 	else {
-#ifdef UWSGI_PY312
+#ifdef 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;
+#elif defined UWSGI_PY312
 		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->cframe;
@@ -1863,7 +1869,11 @@ void uwsgi_python_resume(struct wsgi_request *wsgi_req) {
 	PyGILState_Release(pgst);
 
 	if (wsgi_req) {
-#ifdef UWSGI_PY312
+#ifdef 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];
+#elif defined UWSGI_PY312
 		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->cframe = up.current_frame[wsgi_req->async_id];
@@ -1876,7 +1886,11 @@ void uwsgi_python_resume(struct wsgi_request *wsgi_req) {
 #endif
 	}
 	else {
-#ifdef UWSGI_PY312
+#ifdef 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;
+#elif defined UWSGI_PY312
 		tstate->c_recursion_remaining = up.current_main_c_recursion_remaining;
 		tstate->py_recursion_remaining = up.current_main_py_recursion_remaining;
 		tstate->cframe = up.current_main_frame;
@@ -2090,7 +2104,7 @@ static int uwsgi_python_worker() {
 	// ensure signals can be used again from python
 	// Necessary if fork hooks have been not used to update interpreter state
 	if (!up.call_osafterfork && !up.call_uwsgi_fork_hooks)
-#ifdef HAS_NOT_PyOS_AfterFork_Child
+#ifdef HAS_NOT_PYOS_FORK_STABLE_API
 		PyOS_AfterFork();
 #else
 		PyOS_AfterFork_Child();

{uwsgi-2.0.26 → uwsgi-2.0.27}/plugins/python/pyutils.c

@@ -83,12 +83,12 @@ struct uwsgi_buffer *uwsgi_python_backtrace(struct wsgi_request *wsgi_req) {
 	ub = uwsgi_buffer_new(4096);
 	Py_ssize_t i;
 	// we have to build a uwsgi array with 5 items (4 are taken from the python tb)
-	for(i=0;i< PyList_Size(result);i++) {
-		PyObject *t = PyList_GetItem(result, i);
-		PyObject *tb_filename = PyTuple_GetItem(t, 0);
-		PyObject *tb_lineno = PyTuple_GetItem(t, 1);
-		PyObject *tb_function = PyTuple_GetItem(t, 2);
-		PyObject *tb_text = PyTuple_GetItem(t, 3);
+	for(i=0;i< PySequence_Size(result);i++) {
+		PyObject *t = PySequence_GetItem(result, i);
+		PyObject *tb_filename = PySequence_GetItem(t, 0);
+		PyObject *tb_lineno = PySequence_GetItem(t, 1);
+		PyObject *tb_function = PySequence_GetItem(t, 2);
+		PyObject *tb_text = PySequence_GetItem(t, 3);
 
 		int64_t line_no = PyInt_AsLong(tb_lineno);
 #ifdef PYTHREE