mod-wsgi 6.0.2__tar.gz → 6.0.3.dev1__tar.gz

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.2
+Version: 6.0.3.dev1
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/mod_wsgi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.2
+Version: 6.0.3.dev1
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/setup.py

@@ -456,6 +456,6 @@ setup(name = package_name,
     entry_points = { 'console_scripts':
         ['mod_wsgi-express = mod_wsgi.express.cli:main'],},
     zip_safe = False,
-    install_requires = standalone and ['mod_wsgi-httpd==2.4.67.1'] or [],
+    install_requires = standalone and ['mod_wsgi-httpd==2.4.68.1'] or [],
     python_requires='>=3.10',
 )

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/src/express/cli.py

@@ -67,11 +67,33 @@ def cmd_start_server(params):
         httpd_arguments.extend(['-f', config['httpd_conf']])
         httpd_arguments.extend(['-DONE_PROCESS'])
 
-        os.environ['MOD_WSGI_MODULES_DIRECTORY'] = config['modules_directory']
-
-        subprocess.call([executable]+httpd_arguments)
-
-        sys.exit(0)
+        # On Windows httpd shares our console, so a Ctrl-C delivers a
+        # CTRL_C_EVENT to the whole console process group and httpd runs
+        # its own graceful shutdown. We must not let the same Ctrl-C kill
+        # this launcher first, or it returns to the shell while httpd is
+        # still tearing down (and dumps a KeyboardInterrupt traceback). So
+        # absorb our own interrupt and keep waiting until httpd exits.
+        #
+        # A first Ctrl-C is treated as "you should have received the
+        # console event, shutting down gracefully, I will wait". If httpd
+        # did not actually receive the event (for example a git-bash pty
+        # bridge that does not forward it to the child), a second Ctrl-C
+        # escalates to terminating it so we cannot hang indefinitely.
+
+        process = subprocess.Popen([executable]+httpd_arguments, env=environ)
+
+        interrupts = 0
+
+        while True:
+            try:
+                process.wait()
+                break
+            except KeyboardInterrupt:
+                interrupts += 1
+                if interrupts >= 2:
+                    process.terminate()
+
+        sys.exit(process.returncode)
 
     else:
         executable = posixpath.join(config['server_root'], 'apachectl')

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/src/express/platform.py

@@ -82,7 +82,7 @@ def default_run_group():
 
 def find_program(names, default=None, paths=[]):
     for name in names:
-        for path in os.environ['PATH'].split(':') + paths:
+        for path in os.environ['PATH'].split(os.pathsep) + paths:
             program = posixpath.join(path, name)
             if os.path.exists(program):
                 return program

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/src/express/reloader.py

@@ -97,6 +97,17 @@ def track_changes(path):
         _files.append(path)
 
 def start_reloader(interval=1.0):
+    # The reloader triggers a restart by sending SIGINT to this process. On
+    # Windows os.kill() cannot deliver SIGINT to ourselves: any signal other
+    # than CTRL_C_EVENT/CTRL_BREAK_EVENT is implemented as an unconditional
+    # TerminateProcess, so the reloader would hard kill the server rather than
+    # trigger a graceful restart. Disable it on Windows.
+    if os.name == 'nt':
+        prefix = 'monitor (pid=%d):' % os.getpid()
+        print('%s Source code reloading is not supported on Windows.' % prefix,
+                file=sys.stderr)
+        return
+
     global _interval
     if interval < _interval:
         _interval = interval

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/src/express/server.py

@@ -255,14 +255,17 @@ def setup_server(command, args, options):
         options['access_log_file'] = posixpath.join(
                 options['log_directory'], options['access_log_name'])
     else:
-        try:
-            with open('/dev/stdout', 'w'):
-                pass
-        except IOError:
-            options['access_log_file'] = '|%s' % find_program(
-                    ['tee'], default='tee')
+        if os.name == 'nt':
+            options['access_log_file'] = 'CON'
         else:
-            options['access_log_file'] = '/dev/stdout'
+            try:
+                with open('/dev/stdout', 'w'):
+                    pass
+            except IOError:
+                options['access_log_file'] = '|%s' % find_program(
+                        ['tee'], default='tee')
+            else:
+                options['access_log_file'] = '/dev/stdout'
 
     if options['access_log_format']:
         if options['access_log_format'] in ('common', 'combined'):

{mod_wsgi-6.0.2 → mod_wsgi-6.0.3.dev1}/src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 6
 #define MOD_WSGI_MINORVERSION_NUMBER 0
-#define MOD_WSGI_MICROVERSION_NUMBER 2
-#define MOD_WSGI_VERSION_STRING "6.0.2"
+#define MOD_WSGI_MICROVERSION_NUMBER 3
+#define MOD_WSGI_VERSION_STRING "6.0.3.dev1"
 
 /* ------------------------------------------------------------------------- */