Hello community,
here is the log from the commit of package apache2-mod_wsgi for
openSUSE:Factory checked in at 2020-05-13 22:56:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache2-mod_wsgi (Old)
and /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache2-mod_wsgi"
Wed May 13 22:56:15 2020 rev:29 rq:805091 version:4.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache2-mod_wsgi/apache2-mod_wsgi.changes
2020-04-15 19:55:21.765622466 +0200
+++
/work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new.2738/apache2-mod_wsgi.changes
2020-05-13 22:56:17.671033853 +0200
@@ -1,0 +2,12 @@
+Wed May 6 19:44:25 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Update to version 4.7.1:
+ + Use Python 3 style print.
+ + Mostly changes around distribtion from PyPi, where mod_wsgi is
+ completented by a mod_wsgi-standalone with an own apache
+ instance.
+- Drop the python2 based package (py2 is EOL): Move the content of
+ the former apache2-mod_wsgi-python3 package into apache-mod_wsgi.
+ Provide/Obsolete the old -python3 package for ease of upgrade.
+
+-------------------------------------------------------------------
Old:
----
apache2-mod_wsgi-python3.changes
apache2-mod_wsgi-python3.spec
mod_wsgi-4.6.8.tar.gz
New:
----
mod_wsgi-4.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache2-mod_wsgi.spec ++++++
--- /var/tmp/diff_new_pack.i6CoqB/_old 2020-05-13 22:56:18.179034843 +0200
+++ /var/tmp/diff_new_pack.i6CoqB/_new 2020-05-13 22:56:18.179034843 +0200
@@ -27,9 +27,9 @@
BuildRequires: httpd-devel
%endif
Name: apache2-mod_wsgi
-Version: 4.6.8
+Version: 4.7.1
Release: 0
-Summary: A WSGI interface for Python web applications in Apache
+Summary: A WSGI interface for Python3 web applications in Apache
License: Apache-2.0
Group: Productivity/Networking/Web/Servers
URL: https://github.com/GrahamDumpleton/mod_wsgi
@@ -38,12 +38,13 @@
Patch0: wsgi_fixVersionCheck.patch
BuildRequires: apache-rex
%apache_rex_deps
-BuildRequires: python-devel
+BuildRequires: python3-devel
%if 0%{?suse_version} >= 1500 || 0%{?fedora} || 0%{?rhel}
-BuildRequires: python-setuptools
+BuildRequires: python3-setuptools
%endif
-Conflicts: apache2-mod_wsgi-python3
+Obsoletes: apache2-mod_wsgi-python3 < %{version}-%{release}
Provides: %{modname} = %{version}-%{release}
+Provides: apache2-mod_wsgi-python3 = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
Requires: %{apache_mmn}
@@ -72,16 +73,16 @@
%else
--with-apxs="%{apache_apxs}" \
%endif
- --with-python="python"
+ --with-python="python3"
make %{?_smp_mflags}
%if 0%{?suse_version} >= 1500 || 0%{?fedora} || 0%{?rhel}
-%py2_build
+%py3_build
%endif
%install
make install DESTDIR=%{buildroot} LIBEXECDIR=%{apache_libexecdir}
%if 0%{?suse_version} >= 1500 || 0%{?fedora} || 0%{?rhel}
-%py2_install
+%py3_install
%endif
%check
@@ -109,8 +110,8 @@
%dir %{apache_libexecdir}
%{apache_libexecdir}/%{modname}.so
%if 0%{?suse_version} >= 1500 || 0%{?fedora} || 0%{?rhel}
-%{python2_sitearch}/mod_wsgi-*.egg-info
-%{python2_sitearch}/mod_wsgi
+%{python3_sitearch}/mod_wsgi-*.egg-info
+%{python3_sitearch}/mod_wsgi
%{_bindir}/mod_wsgi-express
%endif
++++++ mod_wsgi-4.6.8.tar.gz -> mod_wsgi-4.7.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/MANIFEST.in
new/mod_wsgi-4.7.1/MANIFEST.in
--- old/mod_wsgi-4.6.8/MANIFEST.in 2019-10-06 00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/MANIFEST.in 2020-02-17 00:02:48.000000000 +0100
@@ -3,6 +3,7 @@
include LICENSE
include Makefile.in
include README.rst
+include README-standalone.rst
include CREDITS.rst
include src/server/*.h
include src/server/*.c
@@ -15,3 +16,4 @@
include docs/_build/html/_static/font/*
include docs/_build/html/_static/js/*
include docs/_build/html/_sources/*
+include pyproject.toml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/README-standalone.rst
new/mod_wsgi-4.7.1/README-standalone.rst
--- old/mod_wsgi-4.6.8/README-standalone.rst 1970-01-01 01:00:00.000000000
+0100
+++ new/mod_wsgi-4.7.1/README-standalone.rst 2020-02-17 00:02:48.000000000
+0100
@@ -0,0 +1,30 @@
+Overview
+--------
+
+The mod_wsgi package provides an Apache module that implements a WSGI
+compliant interface for hosting Python based web applications on top of the
+Apache web server.
+
+The primary package for mod_wsgi is available on the Python package index
+(PyPi) as ``mod_wsgi``. That package assumes that you have a suitable
+version of Apache pre-installed on your target system, and if you don't,
+installation of the package will fail.
+
+If you are on a UNIX like system (Linux, macOS) and need a version of
+Apache to be installed for you, you can use the ``mod_wsgi-standalone``
+package on PyPi instead. When installing the ``mod_wsgi-standalone``
+package it will first trigger the installation of the ``mod_wsgi-httpd``
+package, which will result in a version of Apache being installed as
+part of your Python installation. Next the ``mod_wsgi`` package will be
+installed, with it using the version of Apache installed by the
+``mod_wsgi-httpd`` package rather than any system package for Apache.
+
+Note that this method of installation is only suitable for where you want
+to use ``mod_wsgi-expres``. It cannot be used to build mod_wsgi for use
+with your system Apache installation. This installation method will also
+not work on Windows.
+
+When installing mod_wsgi using this method, except that you will install
+the ``mod_wsgi-standalone`` package instead of the ``mod_wsgi`` package,
+you should follow installation and usage instructions outlined on the
+PyPi page for the ``mod_wsgi`` package.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/README.rst
new/mod_wsgi-4.7.1/README.rst
--- old/mod_wsgi-4.6.8/README.rst 2019-10-06 00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/README.rst 2020-02-17 00:02:48.000000000 +0100
@@ -108,6 +108,11 @@
needed to compile additional Apache modules. By default, it is expected
that Apache is installed in the directory ``C:/Apache24`` on Windows.
+If you are on Linux, macOS or other UNIX type operating system and can't
+or don't want to use the system package for Apache, you can use ``pip``
+to install mod_wsgi, but you should use use the ``mod_wsgi-standalone``
+package on PyPi instead of the ``mod_wsgi`` package.
+
Installation into Apache
------------------------
@@ -146,6 +151,16 @@
to the location of the Apache ``apxs`` script for your Apache installation
before performing the installation.
+If you are using Linux, macOS or other UNIX type operating system, and you
+don't have Apache available, you can instead install mod_wsgi using::
+
+ pip install mod_wsgi-standalone
+
+When installing ``mod_wsgi-standalone``, it will also install a version
+of Apache into your Python distribution. You can only use ``mod_wsgi-express``
+when using this variant of the package. The ``mod_wsgi-standalone`` package
+follows the same version numbering as the ``mod_wsgi`` package on PyPi.
+
If you are on Windows and your Apache distribution is not installed into
the directory ``C:/Apache24``, first set the environment variable
``MOD_WSGI_APACHE_ROOTDIR`` to the directory containing the Apache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/configure.ac
new/mod_wsgi-4.7.1/configure.ac
--- old/mod_wsgi-4.6.8/configure.ac 2019-10-06 00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/configure.ac 2020-02-17 00:02:48.000000000 +0100
@@ -1,6 +1,6 @@
dnl vim: set sw=4 expandtab :
dnl
-dnl Copyright 2007-2018 GRAHAM DUMPLETON
+dnl Copyright 2007-2020 GRAHAM DUMPLETON
dnl
dnl Licensed under the Apache License, Version 2.0 (the "License");
dnl you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/docs/conf.py
new/mod_wsgi-4.7.1/docs/conf.py
--- old/mod_wsgi-4.6.8/docs/conf.py 2019-10-06 00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/docs/conf.py 2020-02-17 00:02:48.000000000 +0100
@@ -41,7 +41,7 @@
# General information about the project.
project = u'mod_wsgi'
-copyright = u'2007-2019, Graham Dumpleton'
+copyright = u'2007-2020, Graham Dumpleton'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mod_wsgi-4.6.8/docs/configuration-directives/WSGIChunkedRequest.rst
new/mod_wsgi-4.7.1/docs/configuration-directives/WSGIChunkedRequest.rst
--- old/mod_wsgi-4.6.8/docs/configuration-directives/WSGIChunkedRequest.rst
2019-10-06 00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/docs/configuration-directives/WSGIChunkedRequest.rst
2020-02-17 00:02:48.000000000 +0100
@@ -29,7 +29,7 @@
string.
Because both calling methods are not allowed under WSGI specification, in
-using these your code will not technically be portable to other WSGI hosting
+using these, your code will not technically be portable to other WSGI hosting
mechanisms, although if those other WSGI servers support it, you will be
okay.
@@ -43,6 +43,6 @@
will always read all available input and ignore ``CONTENT_LENGTH``.
Because mod_wsgi guarantees that an empty string is returned when all input
-is exhausted, it will will always set this flag.
+is exhausted, it will always set this flag.
It is known that Flask/Werkzeug supports the ``wsgi.input_terminated`` flag.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mod_wsgi-4.6.8/docs/configuration-directives/WSGIDaemonProcess.rst
new/mod_wsgi-4.7.1/docs/configuration-directives/WSGIDaemonProcess.rst
--- old/mod_wsgi-4.6.8/docs/configuration-directives/WSGIDaemonProcess.rst
2019-10-06 00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/docs/configuration-directives/WSGIDaemonProcess.rst
2020-02-17 00:02:48.000000000 +0100
@@ -184,7 +184,7 @@
Only one of ``script-user`` or ``script-group`` option can be used at
the same time.
-**script-group=name | scrip-group=#gid**
+**script-group=name | script-group=#gid**
Sets the group that must be the group of any WSGI script file delegated
to be run in the daemon process group. If the group doesn't match a
HTTP Forbidden response will be returned for any request.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/docs/release-notes/version-4.7.0.rst
new/mod_wsgi-4.7.1/docs/release-notes/version-4.7.0.rst
--- old/mod_wsgi-4.6.8/docs/release-notes/version-4.7.0.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/mod_wsgi-4.7.1/docs/release-notes/version-4.7.0.rst 2020-02-17
00:02:48.000000000 +0100
@@ -0,0 +1,29 @@
+=============
+Version 4.7.0
+=============
+
+Version 4.7.0 of mod_wsgi can be obtained from:
+
+ https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.7.0
+
+New Features
+------------
+
+* Now releasing parallel ``mod_wsgi-standalone`` package to PyPi. This is
+ the same as the ``mod_wsgi`` package, except that by installing the
+ ``mod_wsgi-standalone`` package, it will automatically trigger the
+ ``mod_wsgi-httpd`` package to install the Apache HTTPD server as part
+ of your Python installation. When you run ``mod_wsgi-express`` it will
+ use that Apache HTTPD server installation.
+
+ The ``mod_wsgi-standalone`` package is required where you need to install
+ ``mod_wsgi-express`` using its own Apache HTTPD installation due to no
+ system Apache HTTPD server package being available, and the installation
+ needs to be done using a ``requirements.txt`` file for ``pip`` or other
+ package install manager. Using ``mod_wsgi-standalone`` will ensure
+ that the ``mod_wsgi-httpd`` package is installed first before attempting
+ to build and install mod_wsgi. This guarantee is not provided by ``pip``
+ if you list ``mod_wsgi-httpd`` and ``mod_wsgi`` packages as two entries.
+
+ The version numbering of the ``mod_wsgi-standalone`` package will follow
+ the ``mod_wsgi`` versioning.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/docs/release-notes/version-4.7.1.rst
new/mod_wsgi-4.7.1/docs/release-notes/version-4.7.1.rst
--- old/mod_wsgi-4.6.8/docs/release-notes/version-4.7.1.rst 1970-01-01
01:00:00.000000000 +0100
+++ new/mod_wsgi-4.7.1/docs/release-notes/version-4.7.1.rst 2020-02-17
00:02:48.000000000 +0100
@@ -0,0 +1,14 @@
+=============
+Version 4.7.1
+=============
+
+Version 4.7.1 of mod_wsgi can be obtained from:
+
+ https://codeload.github.com/GrahamDumpleton/mod_wsgi/tar.gz/4.7.1
+
+Bugs Fixed
+----------
+
+* Fix up installation on Windows into a virtual environment when
+ using latest ``virtualenv`` version, or recent Python versions
+ with the bundled ``venv`` module for creating virtual environments.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/docs/release-notes.rst
new/mod_wsgi-4.7.1/docs/release-notes.rst
--- old/mod_wsgi-4.6.8/docs/release-notes.rst 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/docs/release-notes.rst 2020-02-17 00:02:48.000000000
+0100
@@ -5,6 +5,9 @@
.. toctree::
:maxdepth: 2
+ release-notes/version-4.7.0
+ release-notes/version-4.7.1
+
release-notes/version-4.6.8
release-notes/version-4.6.7
release-notes/version-4.6.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/package.sh
new/mod_wsgi-4.7.1/package.sh
--- old/mod_wsgi-4.6.8/package.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/mod_wsgi-4.7.1/package.sh 2020-02-17 00:02:48.000000000 +0100
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -eo pipefail
+
+rm -rf build dist
+
+rm -f pyproject.toml
+
+python setup.py sdist
+
+ln -s pyproject.toml.in pyproject.toml
+
+python setup.py sdist
+
+rm -f pyproject.toml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/pyproject.toml.in
new/mod_wsgi-4.7.1/pyproject.toml.in
--- old/mod_wsgi-4.6.8/pyproject.toml.in 1970-01-01 01:00:00.000000000
+0100
+++ new/mod_wsgi-4.7.1/pyproject.toml.in 2020-02-17 00:02:48.000000000
+0100
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=40.8.0", "wheel", "mod_wsgi-httpd==2.4.41.1"]
+build-backend = "setuptools.build_meta:__legacy__"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/setup.py new/mod_wsgi-4.7.1/setup.py
--- old/mod_wsgi-4.6.8/setup.py 2019-10-06 00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/setup.py 2020-02-17 00:02:48.000000000 +0100
@@ -424,6 +424,8 @@
if os.name == 'nt':
if hasattr(sys, 'real_prefix'):
PYTHON_LIBDIR = sys.real_prefix
+ elif hasattr(sys, 'base_prefix'):
+ PYTHON_LIBDIR = sys.base_prefix
else:
PYTHON_LIBDIR = get_python_config('BINDIR')
@@ -542,9 +544,16 @@
# Now finally run distutils.
+package_name = 'mod_wsgi'
long_description = open('README.rst').read()
-setup(name = 'mod_wsgi',
+standalone = os.path.exists('pyproject.toml')
+
+if standalone:
+ package_name = 'mod_wsgi-standalone'
+ long_description = open('README-standalone.rst').read()
+
+setup(name = package_name,
version = _version(),
description = 'Installer for Apache/mod_wsgi.',
long_description = long_description,
@@ -590,4 +599,5 @@
entry_points = { 'console_scripts':
['mod_wsgi-express = mod_wsgi.server:main'],},
zip_safe = False,
+ install_requires = standalone and ['mod_wsgi-httpd==2.4.41.1'] or [],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/mod_wsgi.c
new/mod_wsgi-4.7.1/src/server/mod_wsgi.c
--- old/mod_wsgi-4.6.8/src/server/mod_wsgi.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/mod_wsgi.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_apache.c
new/mod_wsgi-4.7.1/src/server/wsgi_apache.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_apache.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_apache.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_apache.h
new/mod_wsgi-4.7.1/src/server/wsgi_apache.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_apache.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_apache.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_buckets.c
new/mod_wsgi-4.7.1/src/server/wsgi_buckets.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_buckets.c 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_buckets.c 2020-02-17
00:02:48.000000000 +0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_buckets.h
new/mod_wsgi-4.7.1/src/server/wsgi_buckets.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_buckets.h 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_buckets.h 2020-02-17
00:02:48.000000000 +0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_convert.c
new/mod_wsgi-4.7.1/src/server/wsgi_convert.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_convert.c 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_convert.c 2020-02-17
00:02:48.000000000 +0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_convert.h
new/mod_wsgi-4.7.1/src/server/wsgi_convert.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_convert.h 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_convert.h 2020-02-17
00:02:48.000000000 +0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_daemon.c
new/mod_wsgi-4.7.1/src/server/wsgi_daemon.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_daemon.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_daemon.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_daemon.h
new/mod_wsgi-4.7.1/src/server/wsgi_daemon.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_daemon.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_daemon.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_interp.c
new/mod_wsgi-4.7.1/src/server/wsgi_interp.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_interp.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_interp.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_interp.h
new/mod_wsgi-4.7.1/src/server/wsgi_interp.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_interp.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_interp.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_logger.c
new/mod_wsgi-4.7.1/src/server/wsgi_logger.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_logger.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_logger.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_logger.h
new/mod_wsgi-4.7.1/src/server/wsgi_logger.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_logger.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_logger.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_memory.h
new/mod_wsgi-4.7.1/src/server/wsgi_memory.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_memory.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_memory.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_metrics.c
new/mod_wsgi-4.7.1/src/server/wsgi_metrics.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_metrics.c 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_metrics.c 2020-02-17
00:02:48.000000000 +0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_metrics.h
new/mod_wsgi-4.7.1/src/server/wsgi_metrics.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_metrics.h 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_metrics.h 2020-02-17
00:02:48.000000000 +0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_python.h
new/mod_wsgi-4.7.1/src/server/wsgi_python.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_python.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_python.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_restrict.c
new/mod_wsgi-4.7.1/src/server/wsgi_restrict.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_restrict.c 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_restrict.c 2020-02-17
00:02:48.000000000 +0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_restrict.h
new/mod_wsgi-4.7.1/src/server/wsgi_restrict.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_restrict.h 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_restrict.h 2020-02-17
00:02:48.000000000 +0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_server.c
new/mod_wsgi-4.7.1/src/server/wsgi_server.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_server.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_server.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_server.h
new/mod_wsgi-4.7.1/src/server/wsgi_server.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_server.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_server.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_stream.c
new/mod_wsgi-4.7.1/src/server/wsgi_stream.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_stream.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_stream.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_stream.h
new/mod_wsgi-4.7.1/src/server/wsgi_stream.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_stream.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_stream.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_thread.c
new/mod_wsgi-4.7.1/src/server/wsgi_thread.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_thread.c 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_thread.c 2020-02-17 00:02:48.000000000
+0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_thread.h
new/mod_wsgi-4.7.1/src/server/wsgi_thread.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_thread.h 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_thread.h 2020-02-17 00:02:48.000000000
+0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_validate.c
new/mod_wsgi-4.7.1/src/server/wsgi_validate.c
--- old/mod_wsgi-4.6.8/src/server/wsgi_validate.c 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_validate.c 2020-02-17
00:02:48.000000000 +0100
@@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_validate.h
new/mod_wsgi-4.7.1/src/server/wsgi_validate.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_validate.h 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_validate.h 2020-02-17
00:02:48.000000000 +0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/src/server/wsgi_version.h
new/mod_wsgi-4.7.1/src/server/wsgi_version.h
--- old/mod_wsgi-4.6.8/src/server/wsgi_version.h 2019-10-06
00:58:30.000000000 +0200
+++ new/mod_wsgi-4.7.1/src/server/wsgi_version.h 2020-02-17
00:02:48.000000000 +0100
@@ -4,7 +4,7 @@
/* ------------------------------------------------------------------------- */
/*
- * Copyright 2007-2019 GRAHAM DUMPLETON
+ * Copyright 2007-2020 GRAHAM DUMPLETON
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
/* Module version information. */
#define MOD_WSGI_MAJORVERSION_NUMBER 4
-#define MOD_WSGI_MINORVERSION_NUMBER 6
-#define MOD_WSGI_MICROVERSION_NUMBER 8
-#define MOD_WSGI_VERSION_STRING "4.6.8"
+#define MOD_WSGI_MINORVERSION_NUMBER 7
+#define MOD_WSGI_MICROVERSION_NUMBER 1
+#define MOD_WSGI_VERSION_STRING "4.7.1"
/* ------------------------------------------------------------------------- */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mod_wsgi-4.6.8/tests/access.wsgi
new/mod_wsgi-4.7.1/tests/access.wsgi
--- old/mod_wsgi-4.6.8/tests/access.wsgi 2019-10-06 00:58:30.000000000
+0200
+++ new/mod_wsgi-4.7.1/tests/access.wsgi 2020-02-17 00:02:48.000000000
+0100
@@ -1,3 +1,3 @@
def allow_access(environ, host):
- print environ, host
+ print(environ, host)
return True
