uWSGI 2.0.25.1__tar.gz → 2.0.27__tar.gz

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

@@ -7,13 +7,42 @@ on:
     branches: [ master, uwsgi-2.0 ]
 
 jobs:
-  python:
 
+  unittest:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt update -qq
+        sudo apt install --no-install-recommends -qqyf \
+          libpcre2-dev libjansson-dev libcap2-dev \
+          check
+    - uses: actions/checkout@v4
+    - name: Run unit tests
+      run: make unittests
+
+  test:
+    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 \
+          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
+
+  python:
     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"]
-        test-suite: [unittest, python, deadlocks]
+        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
       run: sudo add-apt-repository ppa:deadsnakes/ppa -y
@@ -22,34 +51,27 @@ jobs:
         sudo apt update -qq
         sudo apt install --no-install-recommends -qqyf python${{ matrix.python-version }}-dev \
           libpcre2-dev libjansson-dev libcap2-dev \
-          curl check
+          curl
     - name: Install distutils
       if: contains(fromJson('["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]'), matrix.python-version)
       run: |
         sudo apt install --no-install-recommends -qqyf python${{ matrix.python-version }}-distutils \
     - uses: actions/checkout@v4
-    - name: Run unit tests
-      if: matrix.test-suite == 'unittest'
-      run: make tests
     - name: Build uWSGI binary
-      if: matrix.test-suite != 'unittest'
       run: make
     - name: Build python${{ matrix.python-version }} plugin
-      if: matrix.test-suite != 'unittest'
       run: |
         PYTHON_VERSION=${{ matrix.python-version }}
         PYTHON_VERSION=python${PYTHON_VERSION//.}
         /usr/bin/python${{ matrix.python-version }} -V
         /usr/bin/python${{ matrix.python-version }} uwsgiconfig.py --plugin plugins/python base $PYTHON_VERSION
     - name: run smoke tests
-      if: matrix.test-suite != 'unittest'
       run: |
         PYTHON_VERSION=${{ matrix.python-version }}
         PYTHON_VERSION=python${PYTHON_VERSION//.}
         ./tests/gh-${{ matrix.test-suite }}.sh ${PYTHON_VERSION}
 
   rack:
-
     runs-on: ubuntu-20.04
     strategy:
       matrix:
@@ -59,11 +81,9 @@ jobs:
       run: |
         sudo apt update -qq
         sudo apt install --no-install-recommends -qqyf python3-dev \
-          libpcre3-dev libjansson-dev libcap2-dev ruby2.7-dev \
-          curl check
+          libpcre2-dev libjansson-dev libcap2-dev ruby2.7-dev \
+          curl
     - uses: actions/checkout@v4
-    - name: Run unit tests
-      run: make tests
     - name: Build uWSGI binary
       run: make
     - name: Build rack plugin

{uwsgi-2.0.25.1 → uwsgi-2.0.27}/Makefile

@@ -5,6 +5,7 @@ all:
 
 clean:
 	$(PYTHON) uwsgiconfig.py --clean
+	cd unittest && make clean
 
 check:
 	$(PYTHON) uwsgiconfig.py --check
@@ -12,5 +13,12 @@ check:
 plugin.%:
 	$(PYTHON) uwsgiconfig.py --plugin plugins/$* $(PROFILE)
 
+unittests:
+	$(PYTHON) uwsgiconfig.py --build unittest
+	cd unittest && make test
+
+tests:
+	$(PYTHON) t/runner
+
 %:
 	$(PYTHON) uwsgiconfig.py --build $@

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

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

{uwsgi-2.0.25.1 → uwsgi-2.0.27}/apache2/mod_proxy_uwsgi.c

@@ -388,6 +388,12 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
 	  return HTTP_BAD_GATEWAY;
 	}
 
+	/* T-E wins over C-L */
+	if (apr_table_get(r->headers_out, "Transfer-Encoding")) {
+		apr_table_unset(r->headers_out, "Content-Length");
+		backend->close = 1;
+	}
+
 	if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
 		ap_set_content_type(r, apr_pstrdup(r->pool, buf));
 	}

uwsgi-2.0.27/buildconf/integration-tests.ini

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

uwsgi-2.0.27/buildconf/unittest.ini

@@ -0,0 +1,6 @@
+[uwsgi]
+inherit = base
+bin_name = libuwsgi.a
+embedded_plugins = null
+as_shared_library = static
+check = true

{uwsgi-2.0.25.1 → 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.25.1 → 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.25.1 → 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.25.1 → uwsgi-2.0.27}/core/regexp.c

@@ -23,7 +23,7 @@ int uwsgi_regexp_build(char *re, uwsgi_pcre ** pattern) {
 
 #ifdef UWSGI_PCRE2
 	int errnbr;
-	long unsigned int erroff;
+	size_t erroff;
 
 	*pattern = pcre2_compile((const unsigned char *) re, PCRE2_ZERO_TERMINATED, 0, &errnbr, &erroff, NULL);
 #else
@@ -69,7 +69,7 @@ int uwsgi_regexp_build(char *re, uwsgi_pcre ** pattern) {
 
 int uwsgi_regexp_match(uwsgi_pcre *pattern, const char *subject, int length) {
 #ifdef UWSGI_PCRE2
-	return pcre2_match(pattern, (const unsigned char *)subject, length, 0, 0, NULL, NULL);
+	return uwsgi_regexp_match_ovec(pattern, subject, length, NULL, 0);
 #else
 	return pcre_exec((const pcre *) pattern->p, (const pcre_extra *) pattern->extra, subject, length, 0, 0, NULL, 0);
 #endif

{uwsgi-2.0.25.1 → 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;
@@ -3835,13 +3851,6 @@ void uwsgi_init_all_apps() {
 		if (uwsgi.need_app) {
 			if (!uwsgi.lazy)
 				uwsgi_log("*** no app loaded. GAME OVER ***\n");
-			if (uwsgi.lazy_apps) {
-				if (uwsgi.master_process) {
-					if (kill(uwsgi.workers[0].pid, SIGINT)) {
-						uwsgi_error("kill()");
-					}
-				}
-			}
 			exit(UWSGI_FAILED_APP_CODE);
 		}
 		else {

{uwsgi-2.0.25.1 → 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.25.1 → 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},
 };