Merge pull request unbit#2712 from xrmx/backports-2029

First batch of backport for 2.0.29

Author: xrmx

.github/workflows/test.yml

@@ -54,7 +54,7 @@ jobs:
           libpcre2-dev libjansson-dev libcap2-dev \
           curl
     - name: Install distutils
-      if: contains(fromJson('["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]'), 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@v4

plugins/rack/rack_plugin.c

@@ -1055,18 +1055,22 @@ VALUE init_rack_app( VALUE script ) {
 	}
 #endif
 
-        VALUE rackup = rb_funcall( rb_const_get(rack, rb_intern("Builder")), rb_intern("parse_file"), 1, script);
-        if (TYPE(rackup) != T_ARRAY) {
-        	uwsgi_log("unable to parse %s file\n", RSTRING_PTR(script));
-                return Qnil;
-        }
-
-        if (RARRAY_LEN(rackup) < 1) {
-        	uwsgi_log("invalid rack config file: %s\n", RSTRING_PTR(script));
+	VALUE rackup = rb_funcall( rb_const_get(rack, rb_intern("Builder")), rb_intern("parse_file"), 1, script);
+	if (TYPE(rackup) == T_OBJECT) { // rack +3
+		return rackup;
+	}
+	else if (TYPE(rackup) == T_ARRAY) { // rack << 3
+		if (RARRAY_LEN(rackup) < 1) {
+			uwsgi_log("invalid rack config file: %s\n", RSTRING_PTR(script));
+			return Qnil;
+		}
+		return RARRAY_PTR(rackup)[0] ;
+	}
+	else {
+		uwsgi_log("unable to parse %s file %d\n", RSTRING_PTR(script), TYPE(rackup));
 		return Qnil;
-        }
+	}
 
-        return RARRAY_PTR(rackup)[0] ;
 }
 
 int uwsgi_rack_magic(char *mountpoint, char *lazy) {

t/pypy/config.ini

@@ -3,5 +3,5 @@ plugin = pypy
 need-app = false
 pypy-lib = /usr/lib/x86_64-linux-gnu/libpypy3-c.so
 pypy-home = /usr/lib/pypy3
-pypy-setup = plugins/pypy/pypy_setup.py
-pypy-wsgi-file = t/python/helloapp.py
+pypy-setup = %d../../plugins/pypy/pypy_setup.py
+pypy-wsgi-file = %d../python/helloapp.py

t/rack/app.ru

@@ -1,7 +1,7 @@
 class App
 
   def call(environ)
-    [200, {'Content-Type' => 'text/html'}, ['Hello']]
+    [200, {"content-type" => "text/plain"}, ['Hello']]
   end
 
 end