uWSGI 2.0.21__tar.gz → 2.0.22__tar.gz

{uwsgi-2.0.21 → uwsgi-2.0.22}/.github/workflows/compile-test.yml

@@ -9,16 +9,21 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
+    - name: remove sury php ppa that does not ship libphpX.Y-embed
+      run: |
+        sudo add-apt-repository --remove ppa:ondrej/php
+        sudo apt remove php7.4-dev php7.4 php7.4-common
     - name: Install dependencies
       run: |
         sudo apt update -qq
-        sudo apt install --no-install-recommends -qqyf python3.6-dev \
+        sudo apt install --no-install-recommends -qqyf python3.8-dev \
           libxml2-dev libpcre3-dev libcap2-dev \
-          php7.2-dev libphp7.2-embed libargon2-0-dev libsodium-dev \
-          liblua5.1-0-dev ruby2.5-dev \
+          libargon2-0-dev libsodium-dev \
+          php7.4-dev libphp7.4-embed \
+          liblua5.1-0-dev ruby2.7-dev \
           libjansson-dev libldap2-dev libpq-dev \
           libpam0g-dev libsqlite3-dev libyaml-dev \
           libzmq3-dev libmatheval-dev libperl-dev \
@@ -27,12 +32,12 @@ jobs:
           libboost-thread-dev libboost-filesystem-dev \
           libssl-dev libacl1-dev python-greenlet-dev \
           libcurl4-openssl-dev \
-          openjdk-8-jdk libgloox-dev gccgo \
+          openjdk-11-jdk libgloox-dev gccgo \
           cli-common-dev mono-devel mono-mcs uuid-dev \
           curl check
     - uses: actions/checkout@v2
     - name: Build kitchensink uWSGI binary
-      run: UWSGICONFIG_PHPPATH=php-config7.2 /usr/bin/python3 uwsgiconfig.py --build travis
+      run: UWSGICONFIG_PHPPATH=php-config7.4 /usr/bin/python3 uwsgiconfig.py --build travis
     - name: Build uWSGI binary
       run: |
         /usr/bin/python3 uwsgiconfig.py --build base

{uwsgi-2.0.21 → uwsgi-2.0.22}/.github/workflows/test.yml

@@ -9,16 +9,14 @@ on:
 jobs:
   python:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
         test-suite: [unittest, python, deadlocks]
     steps:
     - name: Add deadnakes ppa
-      run: |
-        sudo apt install -qqyf software-properties-common
-        sudo add-apt-repository ppa:deadsnakes/ppa -y
+      run: sudo add-apt-repository ppa:deadsnakes/ppa -y
     - name: Install dependencies
       run: |
         sudo apt update -qq
@@ -26,7 +24,7 @@ jobs:
           libpcre3-dev libjansson-dev libcap2-dev \
           curl check
     - name: Install distutils
-      if: contains(fromJson('["3.8","3.9","3.10","3.11"]'), matrix.python-version)
+      if: contains(fromJson('["3.6","3.7","3.8","3.9","3.10","3.11"]'), matrix.python-version)
       run: |
         sudo apt install --no-install-recommends -qqyf python${{ matrix.python-version }}-distutils \
     - uses: actions/checkout@v2
@@ -52,20 +50,16 @@ jobs:
 
   rack:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        rack-version: ["251"]
+        rack-version: ["270"]
     steps:
-    - name: Add deadnakes ppa
-      run: |
-        sudo apt install -qqyf software-properties-common
-        sudo add-apt-repository ppa:deadsnakes/ppa -y
     - name: Install dependencies
       run: |
         sudo apt update -qq
         sudo apt install --no-install-recommends -qqyf python3-dev \
-          libpcre3-dev libjansson-dev libcap2-dev \
+          libpcre3-dev libjansson-dev libcap2-dev ruby2.7-dev \
           curl check
     - uses: actions/checkout@v2
     - name: Run unit tests

{uwsgi-2.0.21 → uwsgi-2.0.22}/PKG-INFO

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

{uwsgi-2.0.21 → uwsgi-2.0.22}/apache2/mod_proxy_uwsgi.c

@@ -315,18 +315,16 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
 	apr_bucket_brigade *pass_bb = apr_brigade_create(r->pool, c->bucket_alloc);
 
 	len = ap_getline(buffer, sizeof(buffer), rp, 1);
-
 	if (len <= 0) {
-		// oops
+		/* invalid or empty */
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
-
 	backend->worker->s->read += len;
-
-	if (len >= sizeof(buffer)-1) {
-		// oops
+	if ((apr_size_t)len >= sizeof(buffer)) {
+	        /* too long */
 		return HTTP_INTERNAL_SERVER_ERROR;
 	}
+
 	/* Position of http status code */
 	int status_start;
 	if (apr_date_checkmask(buffer, "HTTP/#.# ###*")) {
@@ -334,8 +332,8 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
 	} else if (apr_date_checkmask(buffer, "HTTP/# ###*")) {
 		status_start = 7;
 	} else {
-		// oops
-		return HTTP_INTERNAL_SERVER_ERROR;
+	        /* not HTTP */
+	        return HTTP_BAD_GATEWAY;
 	}
 	int status_end = status_start + 3;
 
@@ -354,17 +352,41 @@ static int uwsgi_response(request_rec *r, proxy_conn_rec *backend, proxy_server_
 	}
 	r->status_line = apr_pstrdup(r->pool, &buffer[status_start]);
 
-	// start parsing headers;
+	/* parse headers */
 	while ((len = ap_getline(buffer, sizeof(buffer), rp, 1)) > 0) {
+	        if ((apr_size_t)len >= sizeof(buffer)) {
+		  /* too long */
+		  len = -1;
+		  break;
+		}
 		value = strchr(buffer, ':');
-		// invalid header skip
-		if (!value) continue;
-		*value = '\0';
-		++value;
+		if (!value) {
+		  /* invalid header */
+		  len = -1;
+		  break;
+		}
+		*value++ = '\0';
+		if (*ap_scan_http_token(buffer)) {
+		  /* invalid name */
+		  len = -1;
+		  break;
+		}
 		while (apr_isspace(*value)) ++value; 
 		for (end = &value[strlen(value)-1]; end > value && apr_isspace(*end); --end) *end = '\0';
+		if (*ap_scan_http_field_content(value)) {
+		  /* invalid value */
+		  len = -1;
+		  break;
+		}
 		apr_table_add(r->headers_out, buffer, value);
 	}
+	if (len < 0) {
+	  /* Reset headers, but not to NULL because things below the chain expect
+	   * this to be non NULL e.g. the ap_content_length_filter.
+	   */
+	  r->headers_out = apr_table_make(r->pool, 1);
+	  return HTTP_BAD_GATEWAY;
+	}
 
 	if ((buf = apr_table_get(r->headers_out, "Content-Type"))) {
 		ap_set_content_type(r, apr_pstrdup(r->pool, buf));

uwsgi-2.0.22/buildconf/travis.ini

@@ -0,0 +1,3 @@
+[uwsgi]
+main_plugin = psgi,rack,lua,python,gevent,php,cgi,pty,xslt,msgpack,geoip,pam,ldap,mono,jvm,ring,jwsgi,servlet,pypy,airbrake,alarm_curl,asyncio,cheaper_backlog2,clock_monotonic,clock_realtime,cplusplus,curl_cron,dumbloop,dummy,echo,emperor_amqp,emperor_pg,emperor_zeromq,example,exception_log,fiber,forkptyrouter,graylog2,legion_cache_fetch,libffi,logcrypto,logpipe,logzmq,matheval,notfound,rbthreads,router_access,router_radius,router_spnego,router_xmldir,sqlite3,ssi,stats_pusher_file,stats_pusher_statsd,tornado,transformation_toupper,tuntap,webdav,xattr,zabbix
+inherit = base

{uwsgi-2.0.21 → uwsgi-2.0.22}/core/init.c

@@ -197,6 +197,8 @@ void uwsgi_init_default() {
 	uwsgi_master_fifo_prepare();
 
 	uwsgi.notify_socket_fd = -1;
+
+	uwsgi.harakiri_graceful_signal = SIGTERM;
 }
 
 void uwsgi_setup_reload() {

{uwsgi-2.0.21 → uwsgi-2.0.22}/core/master_checks.c

@@ -180,22 +180,57 @@ done:
 
 }
 
+int uwsgi_master_check_harakiri(int w, int c, int harakiri) {
+/**
+ * Triggers a harakiri when the following conditions are met:
+ * - harakiri timeout > current time
+ * - listen queue pressure (ie backlog > harakiri_queue_threshold)
+ *
+ * The first harakiri attempt on a worker will be graceful if harakiri_graceful_timeout > 0,
+ * then the worker has harakiri_graceful_timeout seconds to shutdown cleanly, otherwise
+ * a second harakiri will trigger a SIGKILL
+ *
+ */
+#ifdef __linux__
+	int backlog = uwsgi.shared->backlog;
+#else
+	int backlog = 0;
+#endif
+	if (harakiri == 0 || harakiri > (time_t) uwsgi.current_time) {
+		return 0;
+	}
+	// no pending harakiri for the worker and no backlog pressure, safe to skip
+	if (uwsgi.workers[w].pending_harakiri == 0 &&  backlog < uwsgi.harakiri_queue_threshold) {
+		uwsgi_log_verbose("HARAKIRI: Skipping harakiri on worker %d. Listen queue is smaller than the threshold (%d < %d)\n",
+			w, backlog, uwsgi.harakiri_queue_threshold);
+		return 0;
+	}
+
+	trigger_harakiri(w);
+	if (uwsgi.harakiri_graceful_timeout > 0) {
+		uwsgi.workers[w].harakiri = harakiri + uwsgi.harakiri_graceful_timeout;
+		uwsgi_log_verbose("HARAKIRI: graceful termination attempt on worker %d with signal %d. Next harakiri: %d\n",
+			w, uwsgi.harakiri_graceful_signal, uwsgi.workers[w].harakiri);
+	}
+	return 1;
+}
+
 int uwsgi_master_check_workers_deadline() {
-	int i;
+	int i,j;
 	int ret = 0;
 	for (i = 1; i <= uwsgi.numproc; i++) {
-		/* first check for harakiri */
-		if (uwsgi.workers[i].harakiri > 0) {
-			if (uwsgi.workers[i].harakiri < (time_t) uwsgi.current_time) {
-				trigger_harakiri(i);
+		for(j=0;j<uwsgi.cores;j++) {
+			/* first check for harakiri */
+			if (uwsgi_master_check_harakiri(i, j, uwsgi.workers[i].harakiri)) {
+				uwsgi_log_verbose("HARAKIRI triggered by worker %d core %d !!!\n", i, j);
 				ret = 1;
+				break;
 			}
-		}
-		/* then user-defined harakiri */
-		if (uwsgi.workers[i].user_harakiri > 0) {
-			if (uwsgi.workers[i].user_harakiri < (time_t) uwsgi.current_time) {
-				trigger_harakiri(i);
+			/* then user-defined harakiri */
+			if (uwsgi_master_check_harakiri(i, j, uwsgi.workers[i].user_harakiri)) {
+				uwsgi_log_verbose("HARAKIRI (user) triggered by worker %d core %d !!!\n", i, j);
 				ret = 1;
+				break;
 			}
 		}
 		// then for evil memory checkers

{uwsgi-2.0.21 → uwsgi-2.0.22}/core/master_utils.c

@@ -1561,7 +1561,10 @@ void uwsgi_register_cheaper_algo(char *name, int (*func) (int)) {
 
 void trigger_harakiri(int i) {
 	int j;
-	uwsgi_log_verbose("*** HARAKIRI ON WORKER %d (pid: %d, try: %d) ***\n", i, uwsgi.workers[i].pid, uwsgi.workers[i].pending_harakiri + 1);
+	uwsgi_log_verbose("*** HARAKIRI ON WORKER %d (pid: %d, try: %d, graceful: %s) ***\n", i,
+				uwsgi.workers[i].pid,
+				uwsgi.workers[i].pending_harakiri + 1,
+				uwsgi.workers[i].pending_harakiri > 0 ? "no": "yes");
 	if (uwsgi.harakiri_verbose) {
 #ifdef __linux__
 		int proc_file;
@@ -1610,7 +1613,11 @@ void trigger_harakiri(int i) {
 		}
 
 		uwsgi_dump_worker(i, "HARAKIRI");
-		kill(uwsgi.workers[i].pid, SIGKILL);
+		if (uwsgi.workers[i].pending_harakiri == 0 && uwsgi.harakiri_graceful_timeout > 0) {
+			kill(uwsgi.workers[i].pid, uwsgi.harakiri_graceful_signal);
+		} else {
+			kill(uwsgi.workers[i].pid, SIGKILL);
+		}
 		if (!uwsgi.workers[i].pending_harakiri)
 			uwsgi.workers[i].harakiri_count++;
 		uwsgi.workers[i].pending_harakiri++;

{uwsgi-2.0.21 → uwsgi-2.0.22}/core/uwsgi.c

@@ -81,6 +81,9 @@ static struct uwsgi_option uwsgi_base_options[] = {
 	{"thunder-lock", no_argument, 0, "serialize accept() usage (if possible)", uwsgi_opt_true, &uwsgi.use_thunder_lock, 0},
 	{"harakiri", required_argument, 't', "set harakiri timeout", uwsgi_opt_set_int, &uwsgi.harakiri_options.workers, 0},
 	{"harakiri-verbose", no_argument, 0, "enable verbose mode for harakiri", uwsgi_opt_true, &uwsgi.harakiri_verbose, 0},
+	{"harakiri-graceful-timeout", required_argument, 0, "interval between graceful harakiri attempt and a sigkill", uwsgi_opt_set_int, &uwsgi.harakiri_graceful_timeout, 0},
+	{"harakiri-graceful-signal", required_argument, 0, "use this signal instead of sigterm for graceful harakiri attempts", uwsgi_opt_set_int, &uwsgi.harakiri_graceful_signal, 0},
+	{"harakiri-queue-threshold", required_argument, 0, "only trigger harakiri if queue is greater than this threshold", uwsgi_opt_set_int, &uwsgi.harakiri_queue_threshold, 0},
 	{"harakiri-no-arh", no_argument, 0, "do not enable harakiri during after-request-hook", uwsgi_opt_true, &uwsgi.harakiri_no_arh, 0},
 	{"no-harakiri-arh", no_argument, 0, "do not enable harakiri during after-request-hook", uwsgi_opt_true, &uwsgi.harakiri_no_arh, 0},
 	{"no-harakiri-after-req-hook", no_argument, 0, "do not enable harakiri during after-request-hook", uwsgi_opt_true, &uwsgi.harakiri_no_arh, 0},

{uwsgi-2.0.21 → uwsgi-2.0.22}/plugins/jvm/uwsgiplugin.py

@@ -32,17 +32,20 @@ elif operating_system.startswith('cygwin'):
     JVM_INCPATH = ['-I"/cygdrive/c/Program Files/Java/jdk1.7.0_17/include"', '-I"/cygdrive/c/Program Files/Java/jdk1.7.0_17/include/win32"']
     JVM_LIBPATH = ['-L"/cygdrive/c/Program Files/Java/jdk1.7.0_17/jre/bin/server"']
 else:
-    known_jvms = ('/usr/lib/jvm/java-7-openjdk', '/usr/local/openjdk7', '/usr/lib/jvm/java-6-openjdk', '/usr/local/openjdk', '/usr/java', '/usr/lib/jvm/java/', '/usr/lib/jvm/java-8-openjdk-%s' % arch)
+    known_jvms = ('/usr/lib/jvm/java-7-openjdk', '/usr/local/openjdk7', '/usr/lib/jvm/java-6-openjdk', '/usr/local/openjdk', '/usr/java', '/usr/lib/jvm/java/', '/usr/lib/jvm/java-8-openjdk-%s' % arch, '/usr/lib/jvm/java-11-openjdk-%s' % arch)
     for jvm in known_jvms:
-       if os.path.exists(jvm + '/include'):
-           JVM_INCPATH = ["-I%s/include/" % jvm, "-I%s/include/%s" % (jvm, operating_system)]
-           JVM_LIBPATH = ["-L%s/jre/lib/%s/server" % (jvm, arch)]
-           break
-       if os.path.exists("%s-%s/include" % (jvm, arch)):
-           jvm = "%s-%s" % (jvm, arch)
-           JVM_INCPATH = ["-I%s/include/" % jvm, "-I%s/include/%s" % (jvm, operating_system)]
-           JVM_LIBPATH = ["-L%s/jre/lib/%s/server" % (jvm, arch)]
-           break
+        if os.path.exists(jvm + '/include'):
+            JVM_INCPATH = ["-I%s/include/" % jvm, "-I%s/include/%s" % (jvm, operating_system)]
+            if os.path.exists("%s/jre"):
+                JVM_LIBPATH = ["-L%s/jre/lib/%s/server" % (jvm, arch)]
+            else:
+                JVM_LIBPATH = ["-L%s/lib/server" % (jvm,)]
+            break
+        if os.path.exists("%s-%s/include" % (jvm, arch)):
+            jvm = "%s-%s" % (jvm, arch)
+            JVM_INCPATH = ["-I%s/include/" % jvm, "-I%s/include/%s" % (jvm, operating_system)]
+            JVM_LIBPATH = ["-L%s/jre/lib/%s/server" % (jvm, arch)]
+            break
 
 try:
     JVM_INCPATH = ['-I"' + os.environ['UWSGICONFIG_JVM_INCPATH'] + '"']

{uwsgi-2.0.21 → uwsgi-2.0.22}/plugins/php/php_plugin.c

@@ -607,7 +607,11 @@ static void activate_user_config(const char *filename, const char *doc_root, siz
 static int php_uwsgi_startup(sapi_module_struct *sapi_module)
 {
 
+#if ((PHP_MAJOR_VERSION >= 8) && (PHP_MINOR_VERSION >= 2))
+	if (php_module_startup(&uwsgi_sapi_module, &uwsgi_module_entry)==FAILURE) {
+#else
 	if (php_module_startup(&uwsgi_sapi_module, &uwsgi_module_entry, 1)==FAILURE) {
+#endif
 		return FAILURE;
 	} else {
 		return SUCCESS;

{uwsgi-2.0.21 → uwsgi-2.0.22}/plugins/python/python_plugin.c

@@ -554,7 +554,7 @@ void init_uwsgi_vars() {
 #ifdef HAS_NO_ERRORS_IN_PyFile_FromFd
 		PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, NULL, NULL, 0);
 #else
-		PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, NULL, NULL, NULL, 0);
+		PyObject *new_stdprint = PyFile_FromFd(2, NULL, "w", _IOLBF, NULL, "backslashreplace", NULL, 0);
 #endif
 		PyDict_SetItemString(pysys_dict, "stdout", new_stdprint);
 		PyDict_SetItemString(pysys_dict, "__stdout__", new_stdprint);