uWSGI 2.0.27__tar.gz → 2.0.29__tar.gz

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

@@ -11,18 +11,12 @@ jobs:
     strategy:
       matrix:
         libpcre: ["libpcre3-dev", "libpcre2-dev"]
-        os: ["ubuntu-20.04", "ubuntu-22.04"]
+        os: ["ubuntu-22.04"]
         cc: [gcc, clang]
         include:
-          - os: ubuntu-20.04
-            php: "php7.4"
-            php-config: "php-config7.4"
           - os: ubuntu-22.04
             php: "php8.1"
             php-config: "php-config8.1"
-        exclude:
-          - os: ubuntu-20.04
-            cc: "clang"
 
     runs-on: ${{ matrix.os }}
 

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

@@ -9,13 +9,13 @@ on:
 jobs:
 
   unittest:
-    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 \
+          libpcre3-dev libjansson-dev libcap2-dev \
           check
     - uses: actions/checkout@v4
     - name: Run unit tests
@@ -30,7 +30,8 @@ jobs:
         sudo apt install --no-install-recommends -qqyf \
           libpcre2-dev libjansson-dev libcap2-dev \
           php-dev libphp-embed libargon2-dev libsodium-dev \
-          pypy3
+          pypy3 default-jdk-headless libperl-dev \
+          ruby-dev ruby-rack
     - uses: actions/checkout@v4
     - name: Set env
       run: echo "PROFILE=integration-tests" >> $GITHUB_ENV
@@ -38,10 +39,10 @@ jobs:
       run: make all tests
 
   python:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         test-suite: [python, deadlocks]
     steps:
     - name: Add deadnakes ppa
@@ -53,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.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
@@ -72,16 +73,16 @@ jobs:
         ./tests/gh-${{ matrix.test-suite }}.sh ${PYTHON_VERSION}
 
   rack:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        rack-version: ["270"]
+        rack-version: ["300"]
     steps:
     - name: Install dependencies
       run: |
         sudo apt update -qq
         sudo apt install --no-install-recommends -qqyf python3-dev \
-          libpcre2-dev libjansson-dev libcap2-dev ruby2.7-dev \
+          libpcre2-dev libjansson-dev libcap2-dev ruby3.0-dev \
           curl
     - uses: actions/checkout@v4
     - name: Build uWSGI binary

{uwsgi-2.0.27 → uwsgi-2.0.29}/Makefile

@@ -22,3 +22,5 @@ tests:
 
 %:
 	$(PYTHON) uwsgiconfig.py --build $@
+
+.PHONY: all clean check tests

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

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

uwsgi-2.0.29/buildconf/integration-tests.ini

@@ -0,0 +1,4 @@
+[uwsgi]
+inherit = base
+main_plugin =
+plugins = notfound,python,php,pypy,jvm,jwsgi,psgi,cgi,rack

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/emperormon.ru

@@ -23,13 +23,13 @@ template = <<eof
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="unbit">
-    <link href="http://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="https://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
     <style>
       body {
         padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
       }
     </style>
-    <link href="http://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="https://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
   </head>
   <body>
 
@@ -99,8 +99,8 @@ template = <<eof
 
 
 
-    <script src="http://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
-    <script src="http://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="https://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
+    <script src="https://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
   </body>
 </html>
 eof

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/graphite_uwsgi.py

@@ -15,6 +15,7 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 CARBON_SERVER = "127.0.0.1:2003"
 
+
 def update_carbon(signum):
     # connect to the carbon server
     carbon_fd = uwsgi.connect(CARBON_SERVER)

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/pypy/uwsgi_pypy_greenlets.py

@@ -12,13 +12,15 @@ import greenlet
 
 uwsgi_pypy_greenlets = {}
 
+
 def uwsgi_pypy_greenlet_wrapper():
     lib.async_schedule_to_req_green()
 
+
 @ffi.callback("void()")
 def uwsgi_pypy_greenlet_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 greenlet
     if not lib.uwsgi.wsgi_req.suspended:
@@ -36,10 +38,11 @@ def uwsgi_pypy_greenlet_schedule():
     if lib.uwsgi.p[modifier1].resume:
         lib.uwsgi.p[modifier1].resume(ffi.NULL)
 
+
 @ffi.callback("void(struct wsgi_request *)")
 def uwsgi_pypy_greenlet_switch(wsgi_req):
-    id = wsgi_req.async_id
-    modifier1 = wsgi_req.uh.modifier1;
+    wsgi_req.async_id
+    modifier1 = wsgi_req.uh.modifier1
 
     # this is called in the current greenlet
     if lib.uwsgi.p[modifier1].suspend:
@@ -54,7 +57,7 @@ def uwsgi_pypy_greenlet_switch(wsgi_req):
     # update current running greenlet
     lib.uwsgi.wsgi_req = wsgi_req
 
-if lib.uwsgi.async <= 1:
+if lib.uwsgi.async < 1:
     raise Exception("pypy greenlets require async mode !!!")
 lib.uwsgi.schedule_to_main = uwsgi_pypy_greenlet_switch
 lib.uwsgi.schedule_to_req = uwsgi_pypy_greenlet_schedule

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/pyuwsgi.py

@@ -11,7 +11,7 @@ uwsgi_args = []
 for arg in sys.argv[2:]:
     uwsgi_args.append(arg)
 
-#pyuwsgi.run('welcome.ini')
+# pyuwsgi.run('welcome.ini')
 pyuwsgi.run(uwsgi_args)
 
 # if you are here uWSGI has been reloaded

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/runuwsgi.py

@@ -4,6 +4,7 @@ from django.conf import settings
 import os
 import sys
 
+
 class Command(BaseCommand):
     help = "Runs this project as a uWSGI application. Requires the uwsgi binary in system path."
 
@@ -12,10 +13,10 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         for arg in args:
-            k,v = arg.split('=')
+            k, v = arg.split('=')
             if k == 'http':
                 if self.http_port:
-                   self.http_port = v
+                    self.http_port = v
             elif k == 'socket':
                 self.http_port = None
                 self.socket_addr = v
@@ -40,8 +41,8 @@ class Command(BaseCommand):
         elif self.socket_addr:
             os.environ['UWSGI_SOCKET'] = self.socket_addr
 
-	# map admin static files
-	os.environ['UWSGI_STATIC_MAP'] = '%s=%s' % (settings.ADMIN_MEDIA_PREFIX, os.path.join(django.__path__[0], 'contrib', 'admin', 'media'))
+        # map admin static files
+        os.environ['UWSGI_STATIC_MAP'] = '%s=%s' % (settings.ADMIN_MEDIA_PREFIX, os.path.join(django.__path__[0], 'contrib', 'admin', 'media'))
         # remove sockets/pidfile at exit
         os.environ['UWSGI_VACUUM'] = '1'
         # retrieve/set the PythonHome
@@ -57,7 +58,7 @@ class Command(BaseCommand):
         # exec the uwsgi binary
         os.execvp('uwsgi', ('uwsgi',))
 
-    def usage(self, subcomand):
+    def usage(self, subcommand):
         return r"""
 run this project on the uWSGI server
 

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/spoolqueue/producer.py

@@ -1,11 +1,10 @@
 from tasksconsumer import enqueue
 
+
 def application(env, sr):
 
-    sr('200 OK', [('Content-Type','text/html')])
+    sr('200 OK', [('Content-Type', 'text/html')])
 
     enqueue(queue='fast', pippo='pluto')
 
     return "Task enqueued"
-
-

uwsgi-2.0.29/contrib/spoolqueue/tasks.py

@@ -0,0 +1,13 @@
+from __future__ import print_function
+
+from tasksconsumer import queueconsumer
+
+
+@queueconsumer('fast', 4)
+def fast_queue(arguments):
+    print("fast", arguments)
+
+
+@queueconsumer('slow')
+def slow_queue(arguments):
+    print("foobar", arguments)

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/spoolqueue/tasksconsumer.py

@@ -1,35 +1,37 @@
-from uwsgidecorators import *
-import Queue
+from uwsgidecorators import spool
 from threading import Thread
 
+from six.moves import queue
+
 queues = {}
 
+
 class queueconsumer(object):
 
     def __init__(self, name, num=1, **kwargs):
         self.name = name
-	self.num = num
-        self.queue = Queue.Queue()
-	self.threads = []
-	self.func = None
-	queues[self.name] = self
-
+        self.num = num
+        self.queue = queue.Queue()
+        self.threads = []
+        self.func = None
+        queues[self.name] = self
 
     @staticmethod
     def consumer(self):
         while True:
-	    req = self.queue.get()
-            print req
-	    self.func(req)
-	    self.queue.task_done()
+            req = self.queue.get()
+            print(req)
+            self.func(req)
+            self.queue.task_done()
 
     def __call__(self, f):
         self.func = f
-	for i in range(self.num):
-	    t = Thread(target=self.consumer,args=(self,))	
-	    self.threads.append(t)
-	    t.daemon = True
-	    t.start()
+        for i in range(self.num):
+            t = Thread(target=self.consumer, args=(self,))
+            self.threads.append(t)
+            t.daemon = True
+            t.start()
+
 
 @spool
 def spooler_enqueuer(arguments):

uwsgi-2.0.29/contrib/twuwsgi.py

@@ -0,0 +1,118 @@
+from twisted.internet import defer, protocol, reactor
+from twisted.protocols import basic
+from twisted.web2 import http, resource, responsecode, stream
+
+import struct
+
+
+class uWSGIClientResource(resource.LeafResource):
+
+    def __init__(self, app='', port=3030, host='localhost'):
+        resource.LeafResource.__init__(self)
+        self.host = host
+        self.port = port
+        self.app = app
+
+    def renderHTTP(self, request):
+        return uWSGI(request, self.app, self.host, self.port)
+
+
+def uWSGI(request, app, host, port):
+    if request.stream.length is None:
+        return http.Response(responsecode.LENGTH_REQUIRED)
+
+    request.uwsgi_app = app
+    factory = uWSGIClientProtocolFactory(request)
+    reactor.connectTCP(host, port, factory)
+    return factory.deferred
+
+
+class uWSGIClientProtocol(basic.LineReceiver):
+
+    def __init__(self, request, deferred):
+        self.request = request
+        self.deferred = deferred
+        self.stream = stream.ProducerStream()
+        self.response = http.Response(stream=self.stream)
+        self.status_parsed = None
+
+    def build_uwsgi_var(self, key, value):
+        return struct.pack('<H', len(key)) + key + struct.pack('<H', len(value)) + value
+
+    def connectionMade(self):
+        print(self.request.__dict__)
+        # reset response parser
+        self.status_parsed = None
+        # build header and vars
+        vars = ''
+
+        if self.request.stream.length:
+                vars += self.build_uwsgi_var('CONTENT_LENGTH', str(self.request.stream.length))
+
+        for hkey, hval in self.request.headers.getAllRawHeaders():
+                # use a list, probably it will be extended
+                if hkey.lower() not in ('content-type'):
+                        vars += self.build_uwsgi_var('HTTP_' + hkey.upper().replace('-', '_'), ','.join(hval))
+                else:
+                        vars += self.build_uwsgi_var(hkey.upper().replace('-', '_'), ','.join(hval))
+
+        vars += self.build_uwsgi_var('REQUEST_METHOD', self.request.method)
+        vars += self.build_uwsgi_var('SCRIPT_NAME', self.request.uwsgi_app)
+        vars += self.build_uwsgi_var('PATH_INFO', self.request.path[len(self.request.uwsgi_app):])
+        vars += self.build_uwsgi_var('QUERY_STRING', self.request.querystring)
+        vars += self.build_uwsgi_var('SERVER_NAME', self.request.host)
+        vars += self.build_uwsgi_var('SERVER_PORT', str(self.request.port))
+        vars += self.build_uwsgi_var('SERVER_PROTOCOL', self.request.scheme.upper() + '/' + str(self.request.clientproto[0]) + '.' + str(self.request.clientproto[1]))
+
+        vars += self.build_uwsgi_var('REQUEST_URI', self.request.uri)
+        vars += self.build_uwsgi_var('REMOTE_ADDR', self.request.remoteAddr.host)
+
+        self.transport.write(struct.pack('<BHB', 0, len(vars), 0))
+        self.transport.write(vars)
+
+        # send request data
+        stream.StreamProducer(self.request.stream).beginProducing(self.transport)
+
+    def lineReceived(self, line):
+        if self.status_parsed is None:
+                self.response.code = line.split(' ', 2)[1]
+                self.status_parsed = True
+                return
+
+        # end of headers
+        if line == '':
+            self.setRawMode()
+            self.deferred.callback(self.response)
+            self.response = None
+            return
+
+        name, value = line.split(':', 1)
+        value = value.strip()
+
+        self.response.headers.addRawHeader(name, value)
+
+    def rawDataReceived(self, data):
+        self.stream.write(data)
+
+    def connectionLost(self, reason):
+        self.stream.finish()
+
+
+class uWSGIClientProtocolFactory(protocol.ClientFactory):
+
+    protocol = uWSGIClientProtocol
+    noisy = False  # Make Factory shut up
+
+    def __init__(self, request):
+        self.request = request
+        self.deferred = defer.Deferred()
+
+    def buildProtocol(self, addr):
+        return self.protocol(self.request, self.deferred)
+
+    def clientConnectionFailed(self, connector, reason):
+        self.sendFailureResponse(reason)
+
+    def sendFailureResponse(self, reason):
+        response = http.Response(code=responsecode.BAD_GATEWAY, stream=str(reason.value))
+        self.deferred.callback(response)

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/uwsgi-cache-monitor.py

@@ -1,3 +1,5 @@
+from __future__ import print_function
+
 import mmap
 import os
 import struct
@@ -6,6 +8,7 @@ import time
 import sys
 from optparse import OptionParser
 
+
 class Cache:
 
     def __init__(self, filename, cache_slots, block_size=65536, sample_sleep=1):
@@ -41,7 +44,7 @@ class Cache:
         fields = struct.unpack_from('@HHIQQQQQ2048c', buf)
         key = array.array('c', fields[8:self.key_size+8]).tostring().rstrip('\x00')
 
-        if [x for x in key if x!= '\x00']:
+        if [x for x in key if x != '\x00']:
             buf = self.store_read_item_block(position)
             value = array.array('c', buf).tostring().rstrip('\x00')
         else:
@@ -55,7 +58,7 @@ class Cache:
         if self.sample_sleep:
             time.sleep(self.sample_sleep)
         return data
- 
+
     def update_stats(self, data):
         # data is a list of (position, key, value, len(value)) tuples
         items = len([1 for x in data if x[3] > 0])
@@ -68,54 +71,75 @@ class Cache:
         self.samples += 1
         block_sizes = sum([x[3] for x in data])
         self.block_sizes += block_sizes
-        self.history.append({'full': full, 'empty': empty, 'data': data, \
-            'items': items, 'block_sizes': block_sizes})
+        self.history.append({
+            'full': full,
+            'empty': empty,
+            'data': data,
+            'items': items,
+            'block_sizes': block_sizes
+        })
 
     def dump(self):
         return {
             'samples': self.samples,
             'history': self.history,
             'cache_slots': self.cache_slots,
-            'sample_sleep': self.sample_sleep, 
+            'sample_sleep': self.sample_sleep,
             'cache_empty': self.cache_empty,
             'cache_full': self.cache_full,
             'cache_items': self.cache_items,
             'block_sizes': self.block_sizes,
-         }
+        }
 
     def show_dump(self):
         d = self.dump()
-        print
-        print "Recorded %d samples (%d second(s) sleep between samples)" % \
-            (d['samples'], d['sample_sleep'])
-        print "Cache empty %d times, full %d times, %.2f items on average" % \
-            (d['cache_empty'], d['cache_full'], d['cache_items'] / d['samples'])
-        print "Block size average size: %d bytes" % \
-            (d['block_sizes'] / d['cache_items'] * 8)
-        print "Data in cache average: %d bytes" % \
-            (d['block_sizes'] / d['samples'] * 8)
+        print()
+        print("Recorded %d samples (%d second(s) sleep between samples)" % (
+            d['samples'],
+            d['sample_sleep']
+        ))
+        print("Cache empty %d times, full %d times, %.2f items on average" % (
+            d['cache_empty'],
+            d['cache_full'],
+            d['cache_items'] / d['samples']
+        ))
+        print("Block size average size: %d bytes" % (
+            d['block_sizes'] / d['cache_items'] * 8
+        ))
+        print("Data in cache average: %d bytes" % (
+            d['block_sizes'] / d['samples'] * 8
+        ))
+
 
 def main(options):
     cache = Cache(options.cache_store, options.cache_slots, options.block_size,
-        options.sleep_time)
-    print "Recording..."
+                  options.sleep_time)
+    print("Recording...")
     while True:
         try:
-            data = cache.read()
+            cache.read()
         except KeyboardInterrupt:
             cache.show_dump()
             sys.exit(0)
 
 if __name__ == '__main__':
     parser = OptionParser()
-    parser.add_option("-s", "--cache-slots", dest="cache_slots", type="int",
-        help="Slots available in the cache, uwsgi cache option")
-    parser.add_option("-c", "--cache-store", dest="cache_store", default="uwsgi.cache",
-        help="The filename of the cache store, uwsgi cache-store option. Default: uwsgi.cache")
-    parser.add_option("-b", "--block-size", dest="block_size", default=65536, type="int",
-        help="The size of the cache block, uwsgi cache-blocksize option. Default: 65536")
-    parser.add_option("-t", "--sleep-time", dest="sleep_time", default=1, type="int",
-        help="The time to sleep between each sample. Default: 1")
+    parser.add_option(
+        "-s", "--cache-slots", dest="cache_slots", type="int",
+        help="Slots available in the cache, uwsgi cache option"
+    )
+    parser.add_option(
+        "-c", "--cache-store", dest="cache_store", default="uwsgi.cache",
+        help="The filename of the cache store, uwsgi cache-store option. Default: uwsgi.cache"
+    )
+    parser.add_option(
+        "-b", "--block-size", dest="block_size", default=65536, type="int",
+        help="The size of the cache block, uwsgi cache-blocksize option. Default: 65536"
+    )
+    parser.add_option(
+        "-t", "--sleep-time", dest="sleep_time", default=1, type="int",
+        help="The time to sleep between each sample. Default: 1"
+    )
 
     (options, args) = parser.parse_args()
     if not options.cache_slots:

{uwsgi-2.0.27 → uwsgi-2.0.29}/contrib/uwsgisubscribers.ru

@@ -23,13 +23,13 @@ template = <<eof
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="unbit">
-    <link href="http://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="https://unbit.github.com/bootstrap/css/bootstrap.css" rel="stylesheet">
     <style>
       body {
         padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
       }
     </style>
-    <link href="http://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="https://unbit.github.com/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
   </head>
   <body>
 
@@ -75,8 +75,8 @@ template = <<eof
 
     <% end %>
 
-    <script src="http://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
-    <script src="http://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+    <script src="https://unbit.github.com/jquery-1.7.2.min.js" type="text/javascript"></script>
+    <script src="https://unbit.github.com/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
   </body>
 </html>
 eof

{uwsgi-2.0.27 → uwsgi-2.0.29}/core/emperor.c

@@ -598,7 +598,7 @@ static void emperor_massive_reload(int signum) {
 }
 
 
-static void emperor_stats() {
+static void emperor_stats(int signum) {
 
 	struct uwsgi_instance *c_ui = ui->ui_next;