diff options
| author | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2014-06-09 20:50:41 +1000 |
|---|---|---|
| committer | Graham Dumpleton <Graham.Dumpleton@gmail.com> | 2014-06-09 20:50:41 +1000 |
| commit | 25f9682a1292dbfbbb6d237b669fcb61d19f3df0 (patch) | |
| tree | 2eaff4d8e1cc853dc298a2b4ef8b7990c92017a7 /src | |
| parent | c2914efa88c38626d5cba8e0cc65850adccc13de (diff) | |
| parent | e717873e67aefbadbb8c0b0a69d9795bf1e1d194 (diff) | |
| download | mod_wsgi-4.2.1.tar.gz | |
Merge branch 'release/4.2.1'4.2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/__init__.py | 25 | ||||
| -rw-r--r-- | src/server/wsgi_version.h | 4 |
2 files changed, 27 insertions, 2 deletions
diff --git a/src/server/__init__.py b/src/server/__init__.py index c64ef4f..5bfa791 100644 --- a/src/server/__init__.py +++ b/src/server/__init__.py @@ -68,7 +68,9 @@ def find_mimetypes(): return name APACHE_GENERAL_CONFIG = """ +<IfModule !version_module> LoadModule version_module '%(modules_directory)s/mod_version.so' +</IfModule> ServerName %(host)s ServerRoot '%(server_root)s' @@ -113,21 +115,42 @@ LoadModule mpm_prefork_module '%(modules_directory)s/mod_mpm_prefork.so' </IfVersion> <IfVersion >= 2.4> +<IfModule !access_compat_module> LoadModule access_compat_module '%(modules_directory)s/mod_access_compat.so' +</IfModule> +<IfModule !unixd_module> LoadModule unixd_module '%(modules_directory)s/mod_unixd.so' +</IfModule> +<IfModule !authn_core_module> LoadModule authn_core_module '%(modules_directory)s/mod_authn_core.so' +</IfModule> +<IfModule !authz_core_module> LoadModule authz_core_module '%(modules_directory)s/mod_authz_core.so' +</IfModule> </IfVersion> +<IfModule !authz_host_module> LoadModule authz_host_module '%(modules_directory)s/mod_authz_host.so' +</IfModule> +<IfModule !mime_module> LoadModule mime_module '%(modules_directory)s/mod_mime.so' +</IfModule> +<IfModule !rewrite_module> LoadModule rewrite_module '%(modules_directory)s/mod_rewrite.so' +</IfModule> +<IfModule !alias_module> LoadModule alias_module '%(modules_directory)s/mod_alias.so' +</IfModule> +<IfModule !dir_module> LoadModule dir_module '%(modules_directory)s/mod_dir.so' +</IfModule> + LoadModule wsgi_module '%(mod_wsgi_so)s' <IfDefine WSGI_SERVER_METRICS> +<IfModule !status_module> LoadModule status_module '%(modules_directory)s/mod_status.so' +</IfModule> </IfDefine> <IfVersion < 2.4> @@ -227,7 +250,9 @@ ErrorLog '%(error_log)s' LogLevel %(log_level)s <IfDefine WSGI_ACCESS_LOG> +<IfModule !log_config_module> LoadModule log_config_module %(modules_directory)s/mod_log_config.so +</IfModule> LogFormat "%%h %%l %%u %%t \\"%%r\\" %%>s %%b" common CustomLog "%(log_directory)s/access_log" common </IfDefine> diff --git a/src/server/wsgi_version.h b/src/server/wsgi_version.h index a97c590..d145c30 100644 --- a/src/server/wsgi_version.h +++ b/src/server/wsgi_version.h @@ -25,8 +25,8 @@ #define MOD_WSGI_MAJORVERSION_NUMBER 4 #define MOD_WSGI_MINORVERSION_NUMBER 2 -#define MOD_WSGI_MICROVERSION_NUMBER 0 -#define MOD_WSGI_VERSION_STRING "4.2.0" +#define MOD_WSGI_MICROVERSION_NUMBER 1 +#define MOD_WSGI_VERSION_STRING "4.2.1" /* ------------------------------------------------------------------------- */ |