mod-wsgi 6.0.5.dev1__tar.gz → 6.1.0__tar.gz

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.5.dev1
+Version: 6.1.0
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton
@@ -25,6 +25,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Server
 Requires-Python: >=3.10

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/README-standalone.rst

@@ -31,6 +31,17 @@ usage instructions outlined on the mod_wsgi documentation site at
 https://www.modwsgi.org, substituting ``mod_wsgi-standalone`` for
 ``mod_wsgi`` as the package to install.
 
+The documentation has a page specifically about this package, `The
+mod_wsgi-standalone Package
+<https://www.modwsgi.org/en/latest/user-guides/mod-wsgi-standalone-package.html>`_.
+It covers what the host needs in order to compile everything, how
+support for HTTPS depends on the OpenSSL development files being
+present when Apache is compiled, how the version of Apache you get is
+tied to the version of ``mod_wsgi-standalone`` you install, how
+security fixes for Apache reach you, and why ``mod_wsgi-httpd`` and
+``mod_wsgi`` should not be listed as two separate dependencies in place
+of ``mod_wsgi-standalone``.
+
 **NOTE: Although this package may allow you to install a standalone Apache
 version, it is only really recommended that you use this package if you
 have absolutely no other choice for getting the Apache httpd server

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/README.rst

@@ -40,7 +40,12 @@ Python Package Index:
 
 * `mod_wsgi-standalone`_ on PyPI additionally installs a private
   build of Apache into your Python environment, for use on
-  UNIX-like systems where no system Apache is available.
+  UNIX-like systems where no system Apache is available. It is the
+  same source code and version as ``mod_wsgi``, with an added
+  dependency on the separate ``mod_wsgi-httpd`` package, which
+  supplies that Apache. See `The mod_wsgi-standalone Package
+  <https://www.modwsgi.org/en/latest/user-guides/mod-wsgi-standalone-package.html>`_
+  in the documentation.
 
 * `mod_wsgi-telemetry`_ on PyPI is the out-of-process telemetry
   ingester and live UI that consume datagrams emitted when the

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/mod_wsgi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.5.dev1
+Version: 6.1.0
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton
@@ -25,6 +25,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Server
 Requires-Python: >=3.10

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/setup.py

@@ -441,6 +441,7 @@ setup(name = package_name,
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
         'Programming Language :: Python :: 3.14',
+        'Programming Language :: Python :: 3.15',
         'Topic :: Internet :: WWW/HTTP :: WSGI',
         'Topic :: Internet :: WWW/HTTP :: WSGI :: Server'
     ],
@@ -456,6 +457,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.68.1'] or [],
+    install_requires = standalone and ['mod_wsgi-httpd==2.4.68.2'] or [],
     python_requires='>=3.10',
 )

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_adapter.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_adapter.h"
 
 #include "wsgi_buckets.h"
@@ -266,7 +269,7 @@ static PyObject *Adapter_start_response(AdapterObject *self, PyObject *args)
 
     /* Transfer ownership of headers_as_bytes to self->headers and
      * disclaim the local so the finally XDECREF below is a no-op
-     * for this object — avoids the +1/-1 refcount round-trip the
+     * for this object, which avoids the +1/-1 refcount round-trip the
      * older INCREF-then-XDECREF pattern incurred. */
 
     Py_XDECREF(self->headers);
@@ -297,7 +300,7 @@ static int Adapter_output(AdapterObject *self, const char *data,
      * around ap_pass_brigade and apr_brigade_cleanup. They are
      * captured *inside* each WSGI_BEGIN_ALLOW_THREADS block, so the
      * accumulated self->output_time measures only the time the WSGI
-     * app spent waiting for Apache to take its data — header
+     * app spent waiting for Apache to take its data: header
      * processing, bucket construction and the GIL re-acquire wait
      * (which WSGI_END_ALLOW_THREADS attributes to gil_wait_time)
      * are deliberately excluded. Same pattern as Input_read_from_input
@@ -1667,7 +1670,7 @@ int Adapter_run(AdapterObject *self, PyObject *object)
         /* PyObject_HasAttrString swallows all exceptions raised by
          * the lookup, so a custom __getattribute__ that raises would
          * be silently treated as "no close method". Use
-         * GetAttrString and only treat AttributeError as benign — any
+         * GetAttrString and only treat AttributeError as benign. Any
          * other exception gets a context preamble logged here, then
          * is left set so the PyErr_Occurred() block below prints the
          * traceback after our preamble. */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_adapter.h

@@ -23,6 +23,7 @@
 
 #include "wsgi_python.h"
 #include "wsgi_apache.h"
+
 #include "wsgi_server.h"
 
 #include "wsgi_input.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_apache.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_apache.h"
 
 #include "wsgi_daemon.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_apache.h

@@ -33,6 +33,8 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+
 #define CORE_PRIVATE 1
 
 #if defined(_WIN32)

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_auth.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_auth.h"
 
 #include "wsgi_daemon.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_auth.h

@@ -23,6 +23,7 @@
 
 #include "wsgi_python.h"
 #include "wsgi_apache.h"
+
 #include "wsgi_server.h"
 
 #include "mod_auth.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_buckets.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_buckets.h"
 
 #include "wsgi_interp.h"
@@ -131,7 +134,7 @@ apr_bucket *wsgi_apr_bucket_python_create(const char *buf, apr_size_t length,
  * for the matching decref.
  *
  * The two branches have asymmetric GIL-handling invariants that are
- * load-bearing — do not collapse them.
+ * load-bearing, so do not collapse them.
  *
  * else-branch (first setaside, decref_string == 0): the caller is the
  * WSGI write path, which already holds the GIL on

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_config.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_config.h"
 
 #include "wsgi_daemon.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_config.h

@@ -23,6 +23,7 @@
 
 #include "wsgi_python.h"
 #include "wsgi_apache.h"
+
 #include "wsgi_server.h"
 
 /* ------------------------------------------------------------------------- */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_convert.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_convert.h"
 
 #include "wsgi_validate.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_convert.h

@@ -22,6 +22,7 @@
 /* ------------------------------------------------------------------------- */
 
 #include "wsgi_python.h"
+#include "wsgi_apache.h"
 
 /* ------------------------------------------------------------------------- */
 

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_daemon.c

@@ -18,7 +18,11 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_daemon.h"
+
 #include "wsgi_server.h"
 #include "wsgi_interp.h"
 #include "wsgi_config.h"
@@ -2098,7 +2102,7 @@ static void *wsgi_daemon_thread(apr_thread_t *thd, void *data)
     /*
      * Record the Python thread id of this worker so the monitor thread
      * can target it with PyThreadState_SetAsyncExc() when injecting a
-     * RequestTimeout exception. Safe to call without the GIL — this is
+     * RequestTimeout exception. Safe to call without the GIL, as this is
      * just a wrapper around the OS thread API.
      */
 
@@ -2389,7 +2393,7 @@ static void wsgi_inject_request_timeout(WSGIDaemonThread *thread)
  * in-flight request whose elapsed time has not yet exceeded the
  * "stale" cutoff (request-timeout + interrupt-timeout). A thread that
  * has been wedged for longer than that is treated as already-gone for
- * drain purposes — it will not unwind voluntarily, so waiting for it
+ * drain purposes: it will not unwind voluntarily, so waiting for it
  * before progressing to shutdown-timeout serves no purpose. Caller
  * MUST hold the monitor lock; thread->request mutations are guarded
  * by that same lock.
@@ -2509,7 +2513,7 @@ static void *wsgi_monitor_thread(apr_thread_t *thd, void *data)
          *
          *   interrupt-timeout > 0
          *       Inject mod_wsgi.RequestTimeout into the offending
-         *       thread (one inject per pass — multiple eligible
+         *       thread (one inject per pass; multiple eligible
          *       threads get picked up across consecutive passes, each
          *       with its own injected_at grace timer). If a thread
          *       has already been injected and its interrupt-timeout
@@ -3061,7 +3065,7 @@ static void wsgi_daemon_main(apr_pool_t *p, WSGIDaemonProcess *daemon)
      * thread count by natural log: T_fire = request-timeout * (1 + ln(n)).
      * At n=1 this collapses to request-timeout. At higher thread counts
      * it grants more patience to absorb genuine outliers without
-     * letting the threshold run away — n=10 gives ~3.3x base, n=25
+     * letting the threshold run away: n=10 gives ~3.3x base, n=25
      * gives ~4.2x. Computed once here because it depends only on
      * init-time values.
      */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_daemon.h

@@ -23,6 +23,7 @@
 
 #include "wsgi_python.h"
 #include "wsgi_apache.h"
+
 #include "wsgi_thread.h"
 
 /* ------------------------------------------------------------------------- */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_dispatch.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_dispatch.h"
 
 #include "wsgi_daemon.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_dispatch.h

@@ -23,6 +23,7 @@
 
 #include "wsgi_python.h"
 #include "wsgi_apache.h"
+
 #include "wsgi_server.h"
 
 /* ------------------------------------------------------------------------- */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_environ.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_environ.h"
 
 #include "wsgi_logger.h"
@@ -845,7 +848,7 @@ static void wsgi_add_vars_to_environment(request_rec *r)
      * CGI request-line variables, transcribed from ap_add_cgi_vars().
      * Use setn so these win over any pre-existing entries inherited
      * via the temp table. The PATH_TRANSLATED block is deliberately
-     * omitted — that is the subrequest we are avoiding. GATEWAY_INTERFACE
+     * omitted: that is the subrequest we are avoiding. GATEWAY_INTERFACE
      * is also omitted: it is not required by PEP 3333 and the "CGI/1.1"
      * value upstream sets is misleading for a WSGI environment.
      */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_environ.h

@@ -21,6 +21,7 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
 #include "wsgi_apache.h"
 
 /* ------------------------------------------------------------------------- */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_execute.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_execute.h"
 
 #include "wsgi_server.h"
@@ -44,8 +47,8 @@ int wsgi_execute_script(request_rec *r)
     WSGIThreadInfo *thread_info = NULL;
 
     /* Clear any leftover staged GIL-wait value from a prior request
-     * handled on this worker thread. The next instrumented site —
-     * starting with the initial interp acquire below — will accumulate
+     * handled on this worker thread. The next instrumented site,
+     * starting with the initial interp acquire below, will accumulate
      * into the staging slot, drained into the per-request active slot
      * at wsgi_start_request. */
     wsgi_gil_wait_reset();
@@ -82,7 +85,7 @@ int wsgi_execute_script(request_rec *r)
      * The interpreter handle's name is duplicated into the
      * wsgi_interpreters pool (process-lifetime), so the pointer
      * stored here remains valid for any reader for the rest of the
-     * Apache child's life — no dependency on the request pool.
+     * Apache child's life, with no dependency on the request pool.
      */
 
     wsgi_thread_info(1, 0)->current_application_group = interp->name;

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_gc.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_gc.h"
 
 #include "wsgi_module.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_input.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_input.h"
 
 #include "wsgi_daemon.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_interp.c

@@ -18,11 +18,12 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_interp.h"
 
 #include "wsgi_version.h"
-
-#include "wsgi_apache.h"
 #include "wsgi_server.h"
 #include "wsgi_config.h"
 #include "wsgi_logger.h"
@@ -2413,7 +2414,7 @@ apr_status_t wsgi_python_init(apr_pool_t *p)
          * In daemon mode wsgi_python_init also runs inside the daemon
          * child after fork, but daemon processes pick up their value
          * from daemon->group->switch_interval after wsgi_python_child_init
-         * (see wsgi_daemon.c) — applying the server-config value here
+         * (see wsgi_daemon.c). Applying the server-config value here
          * would shadow that and emit a redundant INFO log line. */
 #if defined(MOD_WSGI_WITH_DAEMONS)
         if (wsgi_daemon_process == NULL &&
@@ -2626,7 +2627,7 @@ InterpreterObject *wsgi_acquire_interpreter(const char *name)
          * The catch is that the simplified API is designed for
          * scoped use: the matching pair Ensure/Release tears the
          * thread state down again at the end of the outer
-         * Release. We do not want that — we want the thread
+         * Release. We do not want that. We want the thread
          * state, and therefore any thread local data Python or
          * extensions have attached to it (threading.local,
          * contextvars defaults, extension-side TLS via
@@ -2647,14 +2648,14 @@ InterpreterObject *wsgi_acquire_interpreter(const char *name)
          * Release in wsgi_release_interpreter brings it back
          * down to 1, which is non-zero, so Release just drops
          * the GIL via PyEval_SaveThread() and leaves the thread
-         * state — and its TSS registration — in place for the
+         * state (and its TSS registration) in place for the
          * next request on this thread. We only do the bump on
          * the first Ensure (counter == 1); any nested Ensure
          * from inside the request leaves the counter alone so
          * pairing inside the request still balances normally.
          *
          * gilstate_counter is exposed via Include/cpython/
-         * pystate.h, which is the unstable CPython tier — the
+         * pystate.h, which is the unstable CPython tier: the
          * field is not part of the stable ABI and could in
          * principle be renamed or removed in a future release.
          * There is no public API equivalent for "extend the
@@ -3274,7 +3275,7 @@ static apr_status_t wsgi_python_child_cleanup(void *data)
      * is shutting down here. For daemon we did it earlier
      * before trying to wait on request threads. The telemetry
      * lifecycle datagrams (STOPPING and the final-tick + STOPPED
-     * sequence) follow the same split — daemon mode emits them in
+     * sequence) follow the same split: daemon mode emits them in
      * wsgi_daemon_main; embedded mode emits both here back-to-back
      * since Apache has already drained worker requests by the time
      * this cleanup hook runs.

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_logger.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_logger.h"
 
 #include "wsgi_server.h"
@@ -1197,7 +1200,7 @@ void wsgi_log_python_error_ex(const char *file, int line, int module_index,
      * Server-scope callers run during single-threaded init, so the
      * sub-pool create on the process pool is not racing other
      * threads. If the sub-pool can't be created (OOM), fall back
-     * to the parent pool — the leak is preferable to crashing
+     * to the parent pool: the leak is preferable to crashing
      * while logging an exception. The sub-pool is destroyed once
      * the header has been emitted.
      */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_memory.c

@@ -5,6 +5,9 @@
  *          http://creativecommons.org/licenses/by/3.0/deed.en_US
  */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #if defined(_WIN32)
 #include <winsock2.h>
 #include <windows.h>

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_metrics.c

@@ -18,9 +18,11 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_metrics.h"
 
-#include "wsgi_apache.h"
 #include "wsgi_daemon.h"
 #include "wsgi_server.h"
 #include "wsgi_memory.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_module.c

@@ -18,11 +18,12 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_module.h"
 
 #include "wsgi_version.h"
-
-#include "wsgi_apache.h"
 #include "wsgi_server.h"
 #include "wsgi_logger.h"
 #include "wsgi_stream.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_remote.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_remote.h"
 
 #include "wsgi_logger.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_remote.h

@@ -21,7 +21,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
 #include "wsgi_apache.h"
+
 #include "wsgi_daemon.h"
 
 /* ------------------------------------------------------------------------- */

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_restrict.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_restrict.h"
 
 #include "wsgi_module.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_restrict.h

@@ -22,6 +22,7 @@
 /* ------------------------------------------------------------------------- */
 
 #include "wsgi_python.h"
+#include "wsgi_apache.h"
 
 /* ------------------------------------------------------------------------- */
 

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_server.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_server.h"
 
 #include "wsgi_daemon.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_shutdown.c

@@ -18,9 +18,11 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_shutdown.h"
 
-#include "wsgi_apache.h"
 #include "wsgi_server.h"
 #include "wsgi_logger.h"
 #include "wsgi_module.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_shutdown.h

@@ -22,6 +22,7 @@
 /* ------------------------------------------------------------------------- */
 
 #include "wsgi_python.h"
+#include "wsgi_apache.h"
 
 /* ------------------------------------------------------------------------- */
 

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_signal.c

@@ -18,9 +18,11 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_signal.h"
 
-#include "wsgi_apache.h"
 #include "wsgi_server.h"
 #include "wsgi_logger.h"
 #include "wsgi_daemon.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_signal.h

@@ -22,6 +22,7 @@
 /* ------------------------------------------------------------------------- */
 
 #include "wsgi_python.h"
+#include "wsgi_apache.h"
 
 /* ------------------------------------------------------------------------- */
 

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_stream.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_stream.h"
 
 #include "wsgi_module.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_telemetry.c

@@ -36,11 +36,13 @@
 
 #include "wsgi_python.h"
 #include "wsgi_apache.h"
+
+#include "wsgi_telemetry.h"
+
 #include "wsgi_server.h"
 #include "wsgi_daemon.h"
 #include "wsgi_logger.h"
 #include "wsgi_metrics.h"
-#include "wsgi_telemetry.h"
 #include "wsgi_version.h"
 #include "wsgi_module.h"
 #include "wsgi_interp.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_thread.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_thread.h"
 
 #include "wsgi_server.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_validate.c

@@ -18,6 +18,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#include "wsgi_python.h"
+#include "wsgi_apache.h"
+
 #include "wsgi_validate.h"
 
 #include "wsgi_convert.h"

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_validate.h

@@ -22,6 +22,7 @@
 /* ------------------------------------------------------------------------- */
 
 #include "wsgi_python.h"
+#include "wsgi_apache.h"
 
 /* ------------------------------------------------------------------------- */
 

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/wsgi_version.h

@@ -24,9 +24,9 @@
 /* Module version information. */
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 6
-#define MOD_WSGI_MINORVERSION_NUMBER 0
-#define MOD_WSGI_MICROVERSION_NUMBER 5
-#define MOD_WSGI_VERSION_STRING "6.0.5.dev1"
+#define MOD_WSGI_MINORVERSION_NUMBER 1
+#define MOD_WSGI_MICROVERSION_NUMBER 0
+#define MOD_WSGI_VERSION_STRING "6.1.0"
 
 /* ------------------------------------------------------------------------- */
 

{mod_wsgi-6.0.5.dev1 → mod_wsgi-6.1.0}/src/server/mod_wsgi.c

@@ -18,8 +18,8 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include "wsgi_apache.h"
 #include "wsgi_python.h"
+#include "wsgi_apache.h"
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>