From 48eddd3d39fa2668ee29198ebfb33c41d4738c21 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sat, 9 Apr 2016 13:46:36 +0200 Subject: Imported Upstream version 2.4.20 --- Apache-apr2.dsw | 27 - Apache.dsw | 30 - CHANGES | 260 +- CMakeLists.txt | 23 +- Makefile.in | 1 + Makefile.win | 9 +- NOTICE | 2 +- NWGNUmakefile | 1 + README.cmake | 3 +- acinclude.m4 | 8 + configure | 11720 ++++++++++--------- docs/conf/mime.types | 2 +- docs/manual/bind.html.de | 4 +- docs/manual/bind.html.en | 4 +- docs/manual/bind.html.fr | 4 +- docs/manual/bind.html.ja.utf8 | 4 +- docs/manual/bind.html.ko.euc-kr | 4 +- docs/manual/bind.html.tr.utf8 | 4 +- docs/manual/caching.html.en | 4 +- docs/manual/caching.html.fr | 4 +- docs/manual/caching.html.tr.utf8 | 4 +- docs/manual/configuring.html.de | 4 +- docs/manual/configuring.html.en | 4 +- docs/manual/configuring.html.fr | 4 +- docs/manual/configuring.html.ja.utf8 | 4 +- docs/manual/configuring.html.ko.euc-kr | 4 +- docs/manual/configuring.html.tr.utf8 | 4 +- docs/manual/content-negotiation.html.en | 4 +- docs/manual/content-negotiation.html.fr | 4 +- docs/manual/content-negotiation.html.ja.utf8 | 4 +- docs/manual/content-negotiation.html.ko.euc-kr | 4 +- docs/manual/content-negotiation.html.tr.utf8 | 4 +- docs/manual/convenience.map | 6 + docs/manual/custom-error.html.en | 4 +- docs/manual/custom-error.html.es | 4 +- docs/manual/custom-error.html.fr | 4 +- docs/manual/custom-error.html.ja.utf8 | 4 +- docs/manual/custom-error.html.ko.euc-kr | 4 +- docs/manual/custom-error.html.tr.utf8 | 4 +- docs/manual/developer/API.html.en | 4 +- docs/manual/developer/debugging.html.en | 4 +- docs/manual/developer/documenting.html.en | 4 +- docs/manual/developer/documenting.html.zh-cn.utf8 | 4 +- docs/manual/developer/filters.html.en | 18 +- docs/manual/developer/hooks.html.en | 27 +- docs/manual/developer/index.html.en | 13 +- docs/manual/developer/index.html.zh-cn.utf8 | 4 +- docs/manual/developer/modguide.html.en | 4 +- docs/manual/developer/modules.html.en | 4 +- docs/manual/developer/modules.html.ja.utf8 | 4 +- docs/manual/developer/new_api_2_4.html.en | 4 +- docs/manual/developer/output-filters.html.en | 4 +- docs/manual/developer/request.html.en | 12 +- docs/manual/developer/thread_safety.html.en | 4 +- docs/manual/dns-caveats.html.en | 4 +- docs/manual/dns-caveats.html.fr | 4 +- docs/manual/dns-caveats.html.ja.utf8 | 4 +- docs/manual/dns-caveats.html.ko.euc-kr | 4 +- docs/manual/dns-caveats.html.tr.utf8 | 4 +- docs/manual/dso.html.en | 4 +- docs/manual/dso.html.fr | 4 +- docs/manual/dso.html.ja.utf8 | 4 +- docs/manual/dso.html.ko.euc-kr | 4 +- docs/manual/dso.html.tr.utf8 | 4 +- docs/manual/env.html.en | 4 +- docs/manual/env.html.fr | 4 +- docs/manual/env.html.ja.utf8 | 4 +- docs/manual/env.html.ko.euc-kr | 4 +- docs/manual/env.html.tr.utf8 | 4 +- docs/manual/expr.html.en | 32 +- docs/manual/expr.html.fr | 33 +- docs/manual/faq/index.html.en | 4 +- docs/manual/faq/index.html.fr | 4 +- docs/manual/faq/index.html.tr.utf8 | 4 +- docs/manual/faq/index.html.zh-cn.utf8 | 4 +- docs/manual/filter.html.en | 4 +- docs/manual/filter.html.es | 4 +- docs/manual/filter.html.fr | 4 +- docs/manual/filter.html.ja.utf8 | 4 +- docs/manual/filter.html.ko.euc-kr | 4 +- docs/manual/filter.html.tr.utf8 | 4 +- docs/manual/getting-started.html.en | 4 +- docs/manual/getting-started.html.fr | 4 +- docs/manual/glossary.html.de | 4 +- docs/manual/glossary.html.en | 4 +- docs/manual/glossary.html.es | 4 +- docs/manual/glossary.html.fr | 4 +- docs/manual/glossary.html.ja.utf8 | 4 +- docs/manual/glossary.html.ko.euc-kr | 4 +- docs/manual/glossary.html.tr.utf8 | 4 +- docs/manual/handler.html.en | 4 +- docs/manual/handler.html.es | 4 +- docs/manual/handler.html.fr | 4 +- docs/manual/handler.html.ja.utf8 | 4 +- docs/manual/handler.html.ko.euc-kr | 4 +- docs/manual/handler.html.tr.utf8 | 4 +- docs/manual/handler.html.zh-cn.utf8 | 4 +- docs/manual/howto/access.html.en | 9 +- docs/manual/howto/access.html.fr | 9 +- docs/manual/howto/auth.html.en | 4 +- docs/manual/howto/auth.html.fr | 4 +- docs/manual/howto/auth.html.ja.utf8 | 4 +- docs/manual/howto/auth.html.ko.euc-kr | 4 +- docs/manual/howto/auth.html.tr.utf8 | 4 +- docs/manual/howto/cgi.html.en | 4 +- docs/manual/howto/cgi.html.fr | 4 +- docs/manual/howto/cgi.html.ja.utf8 | 4 +- docs/manual/howto/cgi.html.ko.euc-kr | 4 +- docs/manual/howto/htaccess.html.en | 4 +- docs/manual/howto/htaccess.html.fr | 4 +- docs/manual/howto/htaccess.html.ja.utf8 | 4 +- docs/manual/howto/htaccess.html.ko.euc-kr | 4 +- docs/manual/howto/htaccess.html.pt-br | 4 +- docs/manual/howto/index.html.en | 17 +- docs/manual/howto/index.html.fr | 18 +- docs/manual/howto/index.html.ja.utf8 | 8 +- docs/manual/howto/index.html.ko.euc-kr | 4 +- docs/manual/howto/index.html.zh-cn.utf8 | 4 +- docs/manual/howto/public_html.html.en | 4 +- docs/manual/howto/public_html.html.fr | 4 +- docs/manual/howto/public_html.html.ja.utf8 | 4 +- docs/manual/howto/public_html.html.ko.euc-kr | 4 +- docs/manual/howto/public_html.html.tr.utf8 | 4 +- docs/manual/howto/reverse_proxy.html | 5 + docs/manual/howto/reverse_proxy.html.en | 340 + docs/manual/howto/ssi.html.en | 4 +- docs/manual/howto/ssi.html.fr | 4 +- docs/manual/howto/ssi.html.ja.utf8 | 4 +- docs/manual/howto/ssi.html.ko.euc-kr | 4 +- docs/manual/images/bal-man-b.png | Bin 0 -> 321860 bytes docs/manual/images/bal-man-w.png | Bin 0 -> 374905 bytes docs/manual/images/bal-man.png | Bin 0 -> 255941 bytes docs/manual/images/favicon.ico | Bin 1078 -> 1086 bytes docs/manual/images/feather.gif | Bin 6471 -> 3656 bytes docs/manual/images/feather.png | Bin 5768 -> 6090 bytes docs/manual/images/reverse-proxy-arch.png | Bin 0 -> 11702 bytes docs/manual/index.html.da | 4 +- docs/manual/index.html.de | 7 +- docs/manual/index.html.en | 8 +- docs/manual/index.html.es | 4 +- docs/manual/index.html.fr | 6 +- docs/manual/index.html.ja.utf8 | 8 +- docs/manual/index.html.ko.euc-kr | 4 +- docs/manual/index.html.pt-br | 4 +- docs/manual/index.html.tr.utf8 | 5 +- docs/manual/index.html.zh-cn.utf8 | 4 +- docs/manual/install.html.de | 4 +- docs/manual/install.html.en | 4 +- docs/manual/install.html.es | 4 +- docs/manual/install.html.fr | 4 +- docs/manual/install.html.ja.utf8 | 4 +- docs/manual/install.html.ko.euc-kr | 4 +- docs/manual/install.html.tr.utf8 | 4 +- docs/manual/invoking.html.de | 4 +- docs/manual/invoking.html.en | 4 +- docs/manual/invoking.html.es | 4 +- docs/manual/invoking.html.fr | 4 +- docs/manual/invoking.html.ja.utf8 | 4 +- docs/manual/invoking.html.ko.euc-kr | 4 +- docs/manual/invoking.html.tr.utf8 | 4 +- docs/manual/license.html.en | 4 +- docs/manual/logs.html.en | 4 +- docs/manual/logs.html.fr | 4 +- docs/manual/logs.html.ja.utf8 | 4 +- docs/manual/logs.html.ko.euc-kr | 4 +- docs/manual/logs.html.tr.utf8 | 4 +- docs/manual/misc/index.html.en | 4 +- docs/manual/misc/index.html.fr | 4 +- docs/manual/misc/index.html.ko.euc-kr | 4 +- docs/manual/misc/index.html.tr.utf8 | 4 +- docs/manual/misc/index.html.zh-cn.utf8 | 4 +- docs/manual/misc/password_encryptions.html.en | 10 +- docs/manual/misc/password_encryptions.html.fr | 10 +- docs/manual/misc/perf-tuning.html.en | 4 +- docs/manual/misc/perf-tuning.html.fr | 4 +- docs/manual/misc/perf-tuning.html.ko.euc-kr | 4 +- docs/manual/misc/perf-tuning.html.tr.utf8 | 4 +- docs/manual/misc/relevant_standards.html.en | 4 +- docs/manual/misc/relevant_standards.html.fr | 4 +- docs/manual/misc/relevant_standards.html.ko.euc-kr | 4 +- docs/manual/misc/security_tips.html.en | 4 +- docs/manual/misc/security_tips.html.fr | 4 +- docs/manual/misc/security_tips.html.ko.euc-kr | 4 +- docs/manual/misc/security_tips.html.tr.utf8 | 4 +- docs/manual/mod/core.html.de | 8 +- docs/manual/mod/core.html.en | 64 +- docs/manual/mod/core.html.es | 8 +- docs/manual/mod/core.html.fr | 59 +- docs/manual/mod/core.html.ja.utf8 | 8 +- docs/manual/mod/core.html.tr.utf8 | 81 +- docs/manual/mod/directive-dict.html.en | 4 +- docs/manual/mod/directive-dict.html.fr | 4 +- docs/manual/mod/directive-dict.html.ja.utf8 | 4 +- docs/manual/mod/directive-dict.html.ko.euc-kr | 4 +- docs/manual/mod/directive-dict.html.tr.utf8 | 4 +- docs/manual/mod/directives.html.de | 12 +- docs/manual/mod/directives.html.en | 12 +- docs/manual/mod/directives.html.es | 12 +- docs/manual/mod/directives.html.fr | 12 +- docs/manual/mod/directives.html.ja.utf8 | 12 +- docs/manual/mod/directives.html.ko.euc-kr | 12 +- docs/manual/mod/directives.html.tr.utf8 | 12 +- docs/manual/mod/directives.html.zh-cn.utf8 | 12 +- docs/manual/mod/event.html.en | 213 +- docs/manual/mod/event.html.fr | 284 +- docs/manual/mod/index.html.de | 4 +- docs/manual/mod/index.html.en | 4 +- docs/manual/mod/index.html.es | 4 +- docs/manual/mod/index.html.fr | 8 +- docs/manual/mod/index.html.ja.utf8 | 4 +- docs/manual/mod/index.html.ko.euc-kr | 4 +- docs/manual/mod/index.html.tr.utf8 | 4 +- docs/manual/mod/index.html.zh-cn.utf8 | 4 +- docs/manual/mod/mod_access_compat.html.en | 4 +- docs/manual/mod/mod_access_compat.html.fr | 4 +- docs/manual/mod/mod_access_compat.html.ja.utf8 | 4 +- docs/manual/mod/mod_actions.html.de | 4 +- docs/manual/mod/mod_actions.html.en | 4 +- docs/manual/mod/mod_actions.html.fr | 4 +- docs/manual/mod/mod_actions.html.ja.utf8 | 4 +- docs/manual/mod/mod_actions.html.ko.euc-kr | 4 +- docs/manual/mod/mod_alias.html.en | 97 +- docs/manual/mod/mod_alias.html.fr | 97 +- docs/manual/mod/mod_alias.html.ja.utf8 | 4 +- docs/manual/mod/mod_alias.html.ko.euc-kr | 4 +- docs/manual/mod/mod_alias.html.tr.utf8 | 99 +- docs/manual/mod/mod_allowmethods.html.en | 4 +- docs/manual/mod/mod_allowmethods.html.fr | 4 +- docs/manual/mod/mod_asis.html.en | 4 +- docs/manual/mod/mod_asis.html.fr | 4 +- docs/manual/mod/mod_asis.html.ja.utf8 | 4 +- docs/manual/mod/mod_asis.html.ko.euc-kr | 4 +- docs/manual/mod/mod_auth_basic.html.en | 4 +- docs/manual/mod/mod_auth_basic.html.fr | 4 +- docs/manual/mod/mod_auth_basic.html.ja.utf8 | 4 +- docs/manual/mod/mod_auth_basic.html.ko.euc-kr | 4 +- docs/manual/mod/mod_auth_digest.html.en | 4 +- docs/manual/mod/mod_auth_digest.html.fr | 4 +- docs/manual/mod/mod_auth_digest.html.ko.euc-kr | 4 +- docs/manual/mod/mod_auth_form.html.en | 4 +- docs/manual/mod/mod_auth_form.html.fr | 4 +- docs/manual/mod/mod_authn_anon.html.en | 4 +- docs/manual/mod/mod_authn_anon.html.fr | 4 +- docs/manual/mod/mod_authn_anon.html.ja.utf8 | 4 +- docs/manual/mod/mod_authn_anon.html.ko.euc-kr | 4 +- docs/manual/mod/mod_authn_core.html.en | 4 +- docs/manual/mod/mod_authn_core.html.fr | 4 +- docs/manual/mod/mod_authn_dbd.html.en | 4 +- docs/manual/mod/mod_authn_dbd.html.fr | 4 +- docs/manual/mod/mod_authn_dbm.html.en | 4 +- docs/manual/mod/mod_authn_dbm.html.fr | 4 +- docs/manual/mod/mod_authn_dbm.html.ja.utf8 | 4 +- docs/manual/mod/mod_authn_dbm.html.ko.euc-kr | 4 +- docs/manual/mod/mod_authn_file.html.en | 4 +- docs/manual/mod/mod_authn_file.html.fr | 4 +- docs/manual/mod/mod_authn_file.html.ja.utf8 | 4 +- docs/manual/mod/mod_authn_file.html.ko.euc-kr | 4 +- docs/manual/mod/mod_authn_socache.html.en | 4 +- docs/manual/mod/mod_authn_socache.html.fr | 4 +- docs/manual/mod/mod_authnz_fcgi.html.en | 16 +- docs/manual/mod/mod_authnz_ldap.html.en | 35 +- docs/manual/mod/mod_authnz_ldap.html.fr | 38 +- docs/manual/mod/mod_authz_core.html.en | 4 +- docs/manual/mod/mod_authz_core.html.fr | 4 +- docs/manual/mod/mod_authz_dbd.html.en | 4 +- docs/manual/mod/mod_authz_dbd.html.fr | 4 +- docs/manual/mod/mod_authz_dbm.html.en | 4 +- docs/manual/mod/mod_authz_dbm.html.fr | 4 +- docs/manual/mod/mod_authz_dbm.html.ko.euc-kr | 4 +- docs/manual/mod/mod_authz_groupfile.html.en | 4 +- docs/manual/mod/mod_authz_groupfile.html.fr | 4 +- docs/manual/mod/mod_authz_groupfile.html.ja.utf8 | 4 +- docs/manual/mod/mod_authz_groupfile.html.ko.euc-kr | 4 +- docs/manual/mod/mod_authz_host.html.en | 32 +- docs/manual/mod/mod_authz_host.html.fr | 39 +- docs/manual/mod/mod_authz_owner.html.en | 4 +- docs/manual/mod/mod_authz_owner.html.fr | 4 +- docs/manual/mod/mod_authz_owner.html.ja.utf8 | 4 +- docs/manual/mod/mod_authz_owner.html.ko.euc-kr | 4 +- docs/manual/mod/mod_authz_user.html.en | 4 +- docs/manual/mod/mod_authz_user.html.fr | 4 +- docs/manual/mod/mod_authz_user.html.ja.utf8 | 4 +- docs/manual/mod/mod_authz_user.html.ko.euc-kr | 4 +- docs/manual/mod/mod_autoindex.html.en | 4 +- docs/manual/mod/mod_autoindex.html.fr | 4 +- docs/manual/mod/mod_autoindex.html.ja.utf8 | 4 +- docs/manual/mod/mod_autoindex.html.ko.euc-kr | 4 +- docs/manual/mod/mod_autoindex.html.tr.utf8 | 4 +- docs/manual/mod/mod_buffer.html.en | 4 +- docs/manual/mod/mod_buffer.html.fr | 4 +- docs/manual/mod/mod_cache.html.en | 4 +- docs/manual/mod/mod_cache.html.fr | 4 +- docs/manual/mod/mod_cache.html.ja.utf8 | 4 +- docs/manual/mod/mod_cache.html.ko.euc-kr | 4 +- docs/manual/mod/mod_cache_disk.html.en | 4 +- docs/manual/mod/mod_cache_disk.html.fr | 4 +- docs/manual/mod/mod_cache_disk.html.ja.utf8 | 4 +- docs/manual/mod/mod_cache_disk.html.ko.euc-kr | 4 +- docs/manual/mod/mod_cache_socache.html.en | 4 +- docs/manual/mod/mod_cache_socache.html.fr | 4 +- docs/manual/mod/mod_cern_meta.html.en | 4 +- docs/manual/mod/mod_cern_meta.html.fr | 4 +- docs/manual/mod/mod_cern_meta.html.ko.euc-kr | 4 +- docs/manual/mod/mod_cgi.html.en | 29 +- docs/manual/mod/mod_cgi.html.fr | 29 +- docs/manual/mod/mod_cgi.html.ja.utf8 | 8 +- docs/manual/mod/mod_cgi.html.ko.euc-kr | 4 +- docs/manual/mod/mod_cgid.html.en | 4 +- docs/manual/mod/mod_cgid.html.fr | 4 +- docs/manual/mod/mod_cgid.html.ja.utf8 | 4 +- docs/manual/mod/mod_cgid.html.ko.euc-kr | 4 +- docs/manual/mod/mod_charset_lite.html.en | 4 +- docs/manual/mod/mod_charset_lite.html.fr | 4 +- docs/manual/mod/mod_charset_lite.html.ko.euc-kr | 4 +- docs/manual/mod/mod_data.html.en | 4 +- docs/manual/mod/mod_data.html.fr | 4 +- docs/manual/mod/mod_dav.html.en | 4 +- docs/manual/mod/mod_dav.html.fr | 4 +- docs/manual/mod/mod_dav.html.ja.utf8 | 4 +- docs/manual/mod/mod_dav.html.ko.euc-kr | 4 +- docs/manual/mod/mod_dav_fs.html.en | 4 +- docs/manual/mod/mod_dav_fs.html.fr | 4 +- docs/manual/mod/mod_dav_fs.html.ja.utf8 | 4 +- docs/manual/mod/mod_dav_fs.html.ko.euc-kr | 4 +- docs/manual/mod/mod_dav_lock.html.en | 4 +- docs/manual/mod/mod_dav_lock.html.fr | 4 +- docs/manual/mod/mod_dav_lock.html.ja.utf8 | 4 +- docs/manual/mod/mod_dbd.html.en | 4 +- docs/manual/mod/mod_dbd.html.fr | 4 +- docs/manual/mod/mod_deflate.html.en | 22 +- docs/manual/mod/mod_deflate.html.fr | 24 +- docs/manual/mod/mod_deflate.html.ja.utf8 | 4 +- docs/manual/mod/mod_deflate.html.ko.euc-kr | 4 +- docs/manual/mod/mod_dialup.html.en | 6 +- docs/manual/mod/mod_dialup.html.fr | 6 +- docs/manual/mod/mod_dir.html.en | 4 +- docs/manual/mod/mod_dir.html.fr | 4 +- docs/manual/mod/mod_dir.html.ja.utf8 | 4 +- docs/manual/mod/mod_dir.html.ko.euc-kr | 4 +- docs/manual/mod/mod_dir.html.tr.utf8 | 4 +- docs/manual/mod/mod_dumpio.html.en | 4 +- docs/manual/mod/mod_dumpio.html.fr | 4 +- docs/manual/mod/mod_dumpio.html.ja.utf8 | 4 +- docs/manual/mod/mod_echo.html.en | 4 +- docs/manual/mod/mod_echo.html.fr | 4 +- docs/manual/mod/mod_echo.html.ja.utf8 | 4 +- docs/manual/mod/mod_echo.html.ko.euc-kr | 4 +- docs/manual/mod/mod_env.html.en | 4 +- docs/manual/mod/mod_env.html.fr | 4 +- docs/manual/mod/mod_env.html.ja.utf8 | 4 +- docs/manual/mod/mod_env.html.ko.euc-kr | 4 +- docs/manual/mod/mod_env.html.tr.utf8 | 4 +- docs/manual/mod/mod_example_hooks.html.en | 4 +- docs/manual/mod/mod_example_hooks.html.fr | 4 +- docs/manual/mod/mod_example_hooks.html.ko.euc-kr | 4 +- docs/manual/mod/mod_expires.html.en | 4 +- docs/manual/mod/mod_expires.html.fr | 4 +- docs/manual/mod/mod_expires.html.ja.utf8 | 4 +- docs/manual/mod/mod_expires.html.ko.euc-kr | 4 +- docs/manual/mod/mod_ext_filter.html.en | 4 +- docs/manual/mod/mod_ext_filter.html.fr | 4 +- docs/manual/mod/mod_ext_filter.html.ja.utf8 | 4 +- docs/manual/mod/mod_ext_filter.html.ko.euc-kr | 4 +- docs/manual/mod/mod_file_cache.html.en | 4 +- docs/manual/mod/mod_file_cache.html.fr | 4 +- docs/manual/mod/mod_file_cache.html.ko.euc-kr | 4 +- docs/manual/mod/mod_filter.html.en | 4 +- docs/manual/mod/mod_filter.html.fr | 4 +- docs/manual/mod/mod_headers.html.en | 10 +- docs/manual/mod/mod_headers.html.fr | 11 +- docs/manual/mod/mod_headers.html.ja.utf8 | 4 +- docs/manual/mod/mod_headers.html.ko.euc-kr | 4 +- docs/manual/mod/mod_heartbeat.html.en | 4 +- docs/manual/mod/mod_heartbeat.html.fr | 4 +- docs/manual/mod/mod_heartmonitor.html.en | 4 +- docs/manual/mod/mod_heartmonitor.html.fr | 4 +- docs/manual/mod/mod_http2.html.en | 172 +- docs/manual/mod/mod_ident.html.en | 4 +- docs/manual/mod/mod_ident.html.fr | 4 +- docs/manual/mod/mod_ident.html.ja.utf8 | 4 +- docs/manual/mod/mod_ident.html.ko.euc-kr | 4 +- docs/manual/mod/mod_imagemap.html.en | 4 +- docs/manual/mod/mod_imagemap.html.fr | 4 +- docs/manual/mod/mod_imagemap.html.ko.euc-kr | 4 +- docs/manual/mod/mod_include.html.en | 25 +- docs/manual/mod/mod_include.html.fr | 22 +- docs/manual/mod/mod_include.html.ja.utf8 | 4 +- docs/manual/mod/mod_info.html.en | 4 +- docs/manual/mod/mod_info.html.fr | 4 +- docs/manual/mod/mod_info.html.ja.utf8 | 4 +- docs/manual/mod/mod_info.html.ko.euc-kr | 4 +- docs/manual/mod/mod_isapi.html.en | 4 +- docs/manual/mod/mod_isapi.html.fr | 4 +- docs/manual/mod/mod_isapi.html.ko.euc-kr | 4 +- docs/manual/mod/mod_lbmethod_bybusyness.html.en | 4 +- docs/manual/mod/mod_lbmethod_bybusyness.html.fr | 4 +- docs/manual/mod/mod_lbmethod_byrequests.html.en | 4 +- docs/manual/mod/mod_lbmethod_byrequests.html.fr | 4 +- docs/manual/mod/mod_lbmethod_bytraffic.html.en | 4 +- docs/manual/mod/mod_lbmethod_bytraffic.html.fr | 4 +- docs/manual/mod/mod_lbmethod_heartbeat.html.en | 4 +- docs/manual/mod/mod_lbmethod_heartbeat.html.fr | 4 +- docs/manual/mod/mod_ldap.html.en | 4 +- docs/manual/mod/mod_ldap.html.fr | 4 +- docs/manual/mod/mod_log_config.html.en | 34 +- docs/manual/mod/mod_log_config.html.fr | 33 +- docs/manual/mod/mod_log_config.html.ja.utf8 | 20 +- docs/manual/mod/mod_log_config.html.ko.euc-kr | 20 +- docs/manual/mod/mod_log_config.html.tr.utf8 | 34 +- docs/manual/mod/mod_log_debug.html.en | 4 +- docs/manual/mod/mod_log_debug.html.fr | 4 +- docs/manual/mod/mod_log_forensic.html.en | 4 +- docs/manual/mod/mod_log_forensic.html.fr | 4 +- docs/manual/mod/mod_log_forensic.html.ja.utf8 | 4 +- docs/manual/mod/mod_log_forensic.html.tr.utf8 | 4 +- docs/manual/mod/mod_logio.html.en | 4 +- docs/manual/mod/mod_logio.html.fr | 4 +- docs/manual/mod/mod_logio.html.ja.utf8 | 4 +- docs/manual/mod/mod_logio.html.ko.euc-kr | 4 +- docs/manual/mod/mod_logio.html.tr.utf8 | 4 +- docs/manual/mod/mod_lua.html.en | 4 +- docs/manual/mod/mod_lua.html.fr | 4 +- docs/manual/mod/mod_macro.html.en | 23 +- docs/manual/mod/mod_macro.html.fr | 16 +- docs/manual/mod/mod_mime.html.en | 4 +- docs/manual/mod/mod_mime.html.fr | 4 +- docs/manual/mod/mod_mime.html.ja.utf8 | 4 +- docs/manual/mod/mod_mime_magic.html.en | 4 +- docs/manual/mod/mod_mime_magic.html.fr | 4 +- docs/manual/mod/mod_negotiation.html.en | 4 +- docs/manual/mod/mod_negotiation.html.fr | 4 +- docs/manual/mod/mod_negotiation.html.ja.utf8 | 4 +- docs/manual/mod/mod_nw_ssl.html.en | 4 +- docs/manual/mod/mod_nw_ssl.html.fr | 4 +- docs/manual/mod/mod_privileges.html.en | 4 +- docs/manual/mod/mod_privileges.html.fr | 4 +- docs/manual/mod/mod_proxy.html.en | 4 +- docs/manual/mod/mod_proxy.html.fr | 11 +- docs/manual/mod/mod_proxy.html.ja.utf8 | 4 +- docs/manual/mod/mod_proxy_ajp.html.en | 4 +- docs/manual/mod/mod_proxy_ajp.html.fr | 4 +- docs/manual/mod/mod_proxy_ajp.html.ja.utf8 | 4 +- docs/manual/mod/mod_proxy_balancer.html.en | 32 +- docs/manual/mod/mod_proxy_balancer.html.fr | 33 +- docs/manual/mod/mod_proxy_balancer.html.ja.utf8 | 4 +- docs/manual/mod/mod_proxy_connect.html.en | 4 +- docs/manual/mod/mod_proxy_connect.html.fr | 4 +- docs/manual/mod/mod_proxy_connect.html.ja.utf8 | 4 +- docs/manual/mod/mod_proxy_express.html.en | 4 +- docs/manual/mod/mod_proxy_express.html.fr | 4 +- docs/manual/mod/mod_proxy_fcgi.html.en | 4 +- docs/manual/mod/mod_proxy_fcgi.html.fr | 4 +- docs/manual/mod/mod_proxy_fdpass.html.en | 4 +- docs/manual/mod/mod_proxy_fdpass.html.fr | 12 +- docs/manual/mod/mod_proxy_ftp.html.en | 4 +- docs/manual/mod/mod_proxy_ftp.html.fr | 4 +- docs/manual/mod/mod_proxy_html.html.en | 4 +- docs/manual/mod/mod_proxy_html.html.fr | 4 +- docs/manual/mod/mod_proxy_http.html.en | 4 +- docs/manual/mod/mod_proxy_http.html.fr | 4 +- docs/manual/mod/mod_proxy_scgi.html.en | 4 +- docs/manual/mod/mod_proxy_scgi.html.fr | 4 +- docs/manual/mod/mod_proxy_wstunnel.html.en | 18 +- docs/manual/mod/mod_ratelimit.html.en | 4 +- docs/manual/mod/mod_ratelimit.html.fr | 4 +- docs/manual/mod/mod_reflector.html.en | 4 +- docs/manual/mod/mod_reflector.html.fr | 4 +- docs/manual/mod/mod_remoteip.html.en | 4 +- docs/manual/mod/mod_remoteip.html.fr | 71 +- docs/manual/mod/mod_reqtimeout.html.en | 4 +- docs/manual/mod/mod_reqtimeout.html.fr | 4 +- docs/manual/mod/mod_request.html.en | 4 +- docs/manual/mod/mod_request.html.fr | 4 +- docs/manual/mod/mod_request.html.tr.utf8 | 4 +- docs/manual/mod/mod_rewrite.html.en | 233 +- docs/manual/mod/mod_rewrite.html.fr | 230 +- docs/manual/mod/mod_sed.html.en | 4 +- docs/manual/mod/mod_sed.html.fr | 4 +- docs/manual/mod/mod_session.html.en | 4 +- docs/manual/mod/mod_session.html.fr | 4 +- docs/manual/mod/mod_session_cookie.html.en | 4 +- docs/manual/mod/mod_session_cookie.html.fr | 4 +- docs/manual/mod/mod_session_crypto.html.en | 4 +- docs/manual/mod/mod_session_crypto.html.fr | 4 +- docs/manual/mod/mod_session_dbd.html.en | 4 +- docs/manual/mod/mod_session_dbd.html.fr | 4 +- docs/manual/mod/mod_setenvif.html.en | 13 +- docs/manual/mod/mod_setenvif.html.fr | 22 +- docs/manual/mod/mod_setenvif.html.ja.utf8 | 4 +- docs/manual/mod/mod_setenvif.html.ko.euc-kr | 4 +- docs/manual/mod/mod_setenvif.html.tr.utf8 | 14 +- docs/manual/mod/mod_slotmem_plain.html.en | 4 +- docs/manual/mod/mod_slotmem_plain.html.fr | 4 +- docs/manual/mod/mod_slotmem_shm.html.en | 4 +- docs/manual/mod/mod_slotmem_shm.html.fr | 4 +- docs/manual/mod/mod_so.html.en | 20 +- docs/manual/mod/mod_so.html.fr | 23 +- docs/manual/mod/mod_so.html.ja.utf8 | 8 +- docs/manual/mod/mod_so.html.ko.euc-kr | 4 +- docs/manual/mod/mod_so.html.tr.utf8 | 8 +- docs/manual/mod/mod_socache_dbm.html.en | 4 +- docs/manual/mod/mod_socache_dbm.html.fr | 4 +- docs/manual/mod/mod_socache_dc.html.en | 4 +- docs/manual/mod/mod_socache_dc.html.fr | 4 +- docs/manual/mod/mod_socache_memcache.html.en | 4 +- docs/manual/mod/mod_socache_memcache.html.fr | 4 +- docs/manual/mod/mod_socache_shmcb.html.en | 4 +- docs/manual/mod/mod_socache_shmcb.html.fr | 4 +- docs/manual/mod/mod_speling.html.en | 4 +- docs/manual/mod/mod_speling.html.fr | 4 +- docs/manual/mod/mod_speling.html.ja.utf8 | 4 +- docs/manual/mod/mod_speling.html.ko.euc-kr | 4 +- docs/manual/mod/mod_ssl.html.en | 49 +- docs/manual/mod/mod_ssl.html.fr | 53 +- docs/manual/mod/mod_status.html.en | 4 +- docs/manual/mod/mod_status.html.fr | 4 +- docs/manual/mod/mod_status.html.ja.utf8 | 4 +- docs/manual/mod/mod_status.html.ko.euc-kr | 4 +- docs/manual/mod/mod_status.html.tr.utf8 | 4 +- docs/manual/mod/mod_substitute.html.en | 4 +- docs/manual/mod/mod_substitute.html.fr | 4 +- docs/manual/mod/mod_suexec.html.en | 4 +- docs/manual/mod/mod_suexec.html.fr | 4 +- docs/manual/mod/mod_suexec.html.ja.utf8 | 4 +- docs/manual/mod/mod_suexec.html.ko.euc-kr | 4 +- docs/manual/mod/mod_suexec.html.tr.utf8 | 4 +- docs/manual/mod/mod_unique_id.html.en | 4 +- docs/manual/mod/mod_unique_id.html.fr | 4 +- docs/manual/mod/mod_unique_id.html.ja.utf8 | 4 +- docs/manual/mod/mod_unique_id.html.ko.euc-kr | 4 +- docs/manual/mod/mod_unixd.html.en | 4 +- docs/manual/mod/mod_unixd.html.fr | 4 +- docs/manual/mod/mod_unixd.html.tr.utf8 | 4 +- docs/manual/mod/mod_userdir.html.en | 4 +- docs/manual/mod/mod_userdir.html.fr | 4 +- docs/manual/mod/mod_userdir.html.ja.utf8 | 4 +- docs/manual/mod/mod_userdir.html.ko.euc-kr | 4 +- docs/manual/mod/mod_userdir.html.tr.utf8 | 4 +- docs/manual/mod/mod_usertrack.html.en | 4 +- docs/manual/mod/mod_usertrack.html.fr | 4 +- docs/manual/mod/mod_version.html.en | 4 +- docs/manual/mod/mod_version.html.ja.utf8 | 4 +- docs/manual/mod/mod_version.html.ko.euc-kr | 4 +- docs/manual/mod/mod_vhost_alias.html.en | 4 +- docs/manual/mod/mod_vhost_alias.html.fr | 4 +- docs/manual/mod/mod_vhost_alias.html.tr.utf8 | 4 +- docs/manual/mod/mod_watchdog.html.en | 4 +- docs/manual/mod/mod_xml2enc.html.en | 4 +- docs/manual/mod/mod_xml2enc.html.fr | 4 +- docs/manual/mod/module-dict.html.en | 4 +- docs/manual/mod/module-dict.html.fr | 4 +- docs/manual/mod/module-dict.html.ja.utf8 | 4 +- docs/manual/mod/module-dict.html.ko.euc-kr | 4 +- docs/manual/mod/module-dict.html.tr.utf8 | 4 +- docs/manual/mod/mpm_common.html.de | 4 +- docs/manual/mod/mpm_common.html.en | 4 +- docs/manual/mod/mpm_common.html.fr | 4 +- docs/manual/mod/mpm_common.html.ja.utf8 | 4 +- docs/manual/mod/mpm_common.html.tr.utf8 | 77 +- docs/manual/mod/mpm_netware.html.en | 4 +- docs/manual/mod/mpm_netware.html.fr | 4 +- docs/manual/mod/mpm_winnt.html.de | 4 +- docs/manual/mod/mpm_winnt.html.en | 4 +- docs/manual/mod/mpm_winnt.html.fr | 4 +- docs/manual/mod/mpm_winnt.html.ja.utf8 | 4 +- docs/manual/mod/mpmt_os2.html.en | 4 +- docs/manual/mod/mpmt_os2.html.fr | 4 +- docs/manual/mod/prefork.html.de | 4 +- docs/manual/mod/prefork.html.en | 4 +- docs/manual/mod/prefork.html.fr | 4 +- docs/manual/mod/prefork.html.ja.utf8 | 4 +- docs/manual/mod/prefork.html.tr.utf8 | 4 +- docs/manual/mod/quickreference.html.de | 724 +- docs/manual/mod/quickreference.html.en | 724 +- docs/manual/mod/quickreference.html.es | 724 +- docs/manual/mod/quickreference.html.fr | 744 +- docs/manual/mod/quickreference.html.ja.utf8 | 704 +- docs/manual/mod/quickreference.html.ko.euc-kr | 718 +- docs/manual/mod/quickreference.html.tr.utf8 | 736 +- docs/manual/mod/quickreference.html.zh-cn.utf8 | 724 +- docs/manual/mod/worker.html.de | 4 +- docs/manual/mod/worker.html.en | 4 +- docs/manual/mod/worker.html.fr | 4 +- docs/manual/mod/worker.html.ja.utf8 | 4 +- docs/manual/mod/worker.html.tr.utf8 | 4 +- docs/manual/mpm.html.de | 4 +- docs/manual/mpm.html.en | 4 +- docs/manual/mpm.html.es | 4 +- docs/manual/mpm.html.fr | 4 +- docs/manual/mpm.html.ja.utf8 | 4 +- docs/manual/mpm.html.ko.euc-kr | 4 +- docs/manual/mpm.html.tr.utf8 | 4 +- docs/manual/mpm.html.zh-cn.utf8 | 4 +- docs/manual/new_features_2_0.html.de | 4 +- docs/manual/new_features_2_0.html.en | 4 +- docs/manual/new_features_2_0.html.fr | 4 +- docs/manual/new_features_2_0.html.ja.utf8 | 4 +- docs/manual/new_features_2_0.html.ko.euc-kr | 4 +- docs/manual/new_features_2_0.html.pt-br | 4 +- docs/manual/new_features_2_0.html.ru.koi8-r | 4 +- docs/manual/new_features_2_0.html.tr.utf8 | 4 +- docs/manual/new_features_2_2.html.en | 4 +- docs/manual/new_features_2_2.html.fr | 4 +- docs/manual/new_features_2_2.html.ko.euc-kr | 4 +- docs/manual/new_features_2_2.html.pt-br | 4 +- docs/manual/new_features_2_2.html.tr.utf8 | 4 +- docs/manual/new_features_2_4.html.en | 11 +- docs/manual/new_features_2_4.html.fr | 7 +- docs/manual/new_features_2_4.html.tr.utf8 | 7 +- docs/manual/platform/ebcdic.html.en | 4 +- docs/manual/platform/ebcdic.html.ko.euc-kr | 4 +- docs/manual/platform/index.html.en | 4 +- docs/manual/platform/index.html.fr | 4 +- docs/manual/platform/index.html.ko.euc-kr | 4 +- docs/manual/platform/index.html.zh-cn.utf8 | 4 +- docs/manual/platform/netware.html.en | 4 +- docs/manual/platform/netware.html.fr | 4 +- docs/manual/platform/netware.html.ko.euc-kr | 4 +- docs/manual/platform/perf-hp.html.en | 4 +- docs/manual/platform/perf-hp.html.fr | 4 +- docs/manual/platform/perf-hp.html.ko.euc-kr | 4 +- docs/manual/platform/rpm.html.en | 4 +- docs/manual/platform/win_compiling.html.en | 4 +- docs/manual/platform/win_compiling.html.fr | 4 +- docs/manual/platform/win_compiling.html.ko.euc-kr | 4 +- docs/manual/platform/windows.html.en | 4 +- docs/manual/platform/windows.html.fr | 4 +- docs/manual/platform/windows.html.ko.euc-kr | 4 +- docs/manual/programs/ab.html.en | 4 +- docs/manual/programs/ab.html.fr | 4 +- docs/manual/programs/ab.html.ko.euc-kr | 4 +- docs/manual/programs/ab.html.tr.utf8 | 4 +- docs/manual/programs/apachectl.html.en | 4 +- docs/manual/programs/apachectl.html.fr | 4 +- docs/manual/programs/apachectl.html.ko.euc-kr | 4 +- docs/manual/programs/apachectl.html.tr.utf8 | 4 +- docs/manual/programs/apxs.html.en | 4 +- docs/manual/programs/apxs.html.fr | 4 +- docs/manual/programs/apxs.html.ko.euc-kr | 4 +- docs/manual/programs/apxs.html.tr.utf8 | 4 +- docs/manual/programs/configure.html.en | 4 +- docs/manual/programs/configure.html.fr | 4 +- docs/manual/programs/configure.html.ko.euc-kr | 4 +- docs/manual/programs/configure.html.tr.utf8 | 4 +- docs/manual/programs/dbmmanage.html.en | 4 +- docs/manual/programs/dbmmanage.html.fr | 4 +- docs/manual/programs/dbmmanage.html.ko.euc-kr | 4 +- docs/manual/programs/dbmmanage.html.tr.utf8 | 4 +- docs/manual/programs/fcgistarter.html.en | 4 +- docs/manual/programs/fcgistarter.html.fr | 4 +- docs/manual/programs/fcgistarter.html.tr.utf8 | 4 +- docs/manual/programs/htcacheclean.html.en | 4 +- docs/manual/programs/htcacheclean.html.fr | 4 +- docs/manual/programs/htcacheclean.html.ko.euc-kr | 4 +- docs/manual/programs/htcacheclean.html.tr.utf8 | 4 +- docs/manual/programs/htdbm.html.en | 4 +- docs/manual/programs/htdbm.html.fr | 4 +- docs/manual/programs/htdbm.html.tr.utf8 | 4 +- docs/manual/programs/htdigest.html.en | 4 +- docs/manual/programs/htdigest.html.fr | 4 +- docs/manual/programs/htdigest.html.ko.euc-kr | 4 +- docs/manual/programs/htdigest.html.tr.utf8 | 4 +- docs/manual/programs/htpasswd.html.en | 4 +- docs/manual/programs/htpasswd.html.fr | 4 +- docs/manual/programs/htpasswd.html.ko.euc-kr | 4 +- docs/manual/programs/htpasswd.html.tr.utf8 | 4 +- docs/manual/programs/httpd.html.en | 4 +- docs/manual/programs/httpd.html.fr | 4 +- docs/manual/programs/httpd.html.ko.euc-kr | 4 +- docs/manual/programs/httpd.html.tr.utf8 | 4 +- docs/manual/programs/httxt2dbm.html.en | 4 +- docs/manual/programs/httxt2dbm.html.fr | 4 +- docs/manual/programs/httxt2dbm.html.tr.utf8 | 4 +- docs/manual/programs/index.html.en | 4 +- docs/manual/programs/index.html.es | 4 +- docs/manual/programs/index.html.fr | 4 +- docs/manual/programs/index.html.ko.euc-kr | 4 +- docs/manual/programs/index.html.tr.utf8 | 4 +- docs/manual/programs/index.html.zh-cn.utf8 | 4 +- docs/manual/programs/log_server_status.html.en | 4 +- docs/manual/programs/logresolve.html.en | 4 +- docs/manual/programs/logresolve.html.fr | 4 +- docs/manual/programs/logresolve.html.ko.euc-kr | 4 +- docs/manual/programs/logresolve.html.tr.utf8 | 4 +- docs/manual/programs/other.html.en | 4 +- docs/manual/programs/other.html.fr | 4 +- docs/manual/programs/other.html.ko.euc-kr | 4 +- docs/manual/programs/other.html.tr.utf8 | 4 +- docs/manual/programs/rotatelogs.html.en | 4 +- docs/manual/programs/rotatelogs.html.fr | 4 +- docs/manual/programs/rotatelogs.html.ko.euc-kr | 4 +- docs/manual/programs/rotatelogs.html.tr.utf8 | 4 +- docs/manual/programs/split-logfile.html.en | 4 +- docs/manual/programs/suexec.html.en | 4 +- docs/manual/programs/suexec.html.ko.euc-kr | 4 +- docs/manual/programs/suexec.html.tr.utf8 | 4 +- docs/manual/rewrite/access.html.en | 4 +- docs/manual/rewrite/access.html.fr | 4 +- docs/manual/rewrite/advanced.html.en | 4 +- docs/manual/rewrite/advanced.html.fr | 4 +- docs/manual/rewrite/avoid.html.en | 32 +- docs/manual/rewrite/avoid.html.fr | 32 +- docs/manual/rewrite/flags.html.en | 28 +- docs/manual/rewrite/flags.html.fr | 30 +- docs/manual/rewrite/htaccess.html.en | 4 +- docs/manual/rewrite/htaccess.html.fr | 4 +- docs/manual/rewrite/index.html.en | 4 +- docs/manual/rewrite/index.html.fr | 4 +- docs/manual/rewrite/index.html.tr.utf8 | 4 +- docs/manual/rewrite/index.html.zh-cn.utf8 | 4 +- docs/manual/rewrite/intro.html.en | 4 +- docs/manual/rewrite/intro.html.fr | 4 +- docs/manual/rewrite/proxy.html.en | 4 +- docs/manual/rewrite/proxy.html.fr | 4 +- docs/manual/rewrite/remapping.html.en | 4 +- docs/manual/rewrite/remapping.html.fr | 4 +- docs/manual/rewrite/rewritemap.html.en | 18 +- docs/manual/rewrite/rewritemap.html.fr | 6 +- docs/manual/rewrite/tech.html.en | 4 +- docs/manual/rewrite/tech.html.fr | 4 +- docs/manual/rewrite/vhosts.html.en | 4 +- docs/manual/rewrite/vhosts.html.fr | 4 +- docs/manual/sections.html.en | 67 +- docs/manual/sections.html.fr | 106 +- docs/manual/sections.html.ja.utf8 | 4 +- docs/manual/sections.html.ko.euc-kr | 4 +- docs/manual/sections.html.tr.utf8 | 91 +- docs/manual/server-wide.html.en | 4 +- docs/manual/server-wide.html.fr | 4 +- docs/manual/server-wide.html.ja.utf8 | 4 +- docs/manual/server-wide.html.ko.euc-kr | 4 +- docs/manual/server-wide.html.tr.utf8 | 4 +- docs/manual/sitemap.html.de | 7 +- docs/manual/sitemap.html.en | 5 +- docs/manual/sitemap.html.es | 4 +- docs/manual/sitemap.html.fr | 6 +- docs/manual/sitemap.html.ja.utf8 | 4 +- docs/manual/sitemap.html.ko.euc-kr | 4 +- docs/manual/sitemap.html.tr.utf8 | 5 +- docs/manual/sitemap.html.zh-cn.utf8 | 4 +- docs/manual/socache.html.en | 4 +- docs/manual/socache.html.fr | 4 +- docs/manual/ssl/index.html.en | 4 +- docs/manual/ssl/index.html.fr | 4 +- docs/manual/ssl/index.html.ja.utf8 | 4 +- docs/manual/ssl/index.html.tr.utf8 | 4 +- docs/manual/ssl/index.html.zh-cn.utf8 | 4 +- docs/manual/ssl/ssl_compat.html.en | 4 +- docs/manual/ssl/ssl_compat.html.fr | 4 +- docs/manual/ssl/ssl_faq.html.en | 4 +- docs/manual/ssl/ssl_faq.html.fr | 4 +- docs/manual/ssl/ssl_howto.html.en | 4 +- docs/manual/ssl/ssl_howto.html.fr | 4 +- docs/manual/ssl/ssl_intro.html.en | 4 +- docs/manual/ssl/ssl_intro.html.fr | 4 +- docs/manual/ssl/ssl_intro.html.ja.utf8 | 4 +- docs/manual/stopping.html.de | 4 +- docs/manual/stopping.html.en | 4 +- docs/manual/stopping.html.es | 4 +- docs/manual/stopping.html.fr | 4 +- docs/manual/stopping.html.ja.utf8 | 4 +- docs/manual/stopping.html.ko.euc-kr | 4 +- docs/manual/stopping.html.tr.utf8 | 4 +- docs/manual/style/version.ent | 2 +- docs/manual/suexec.html.en | 4 +- docs/manual/suexec.html.fr | 4 +- docs/manual/suexec.html.ja.utf8 | 4 +- docs/manual/suexec.html.ko.euc-kr | 4 +- docs/manual/suexec.html.tr.utf8 | 4 +- docs/manual/upgrading.html.en | 4 +- docs/manual/upgrading.html.fr | 4 +- docs/manual/urlmapping.html.en | 4 +- docs/manual/urlmapping.html.fr | 4 +- docs/manual/urlmapping.html.ja.utf8 | 4 +- docs/manual/urlmapping.html.ko.euc-kr | 4 +- docs/manual/urlmapping.html.tr.utf8 | 4 +- docs/manual/vhosts/details.html.en | 4 +- docs/manual/vhosts/details.html.fr | 4 +- docs/manual/vhosts/details.html.ko.euc-kr | 4 +- docs/manual/vhosts/details.html.tr.utf8 | 4 +- docs/manual/vhosts/examples.html.en | 4 +- docs/manual/vhosts/examples.html.fr | 4 +- docs/manual/vhosts/examples.html.ja.utf8 | 4 +- docs/manual/vhosts/examples.html.ko.euc-kr | 4 +- docs/manual/vhosts/examples.html.tr.utf8 | 4 +- docs/manual/vhosts/fd-limits.html.en | 4 +- docs/manual/vhosts/fd-limits.html.fr | 4 +- docs/manual/vhosts/fd-limits.html.ja.utf8 | 4 +- docs/manual/vhosts/fd-limits.html.ko.euc-kr | 4 +- docs/manual/vhosts/fd-limits.html.tr.utf8 | 4 +- docs/manual/vhosts/index.html.de | 4 +- docs/manual/vhosts/index.html.en | 4 +- docs/manual/vhosts/index.html.fr | 4 +- docs/manual/vhosts/index.html.ja.utf8 | 4 +- docs/manual/vhosts/index.html.ko.euc-kr | 4 +- docs/manual/vhosts/index.html.tr.utf8 | 4 +- docs/manual/vhosts/index.html.zh-cn.utf8 | 4 +- docs/manual/vhosts/ip-based.html.en | 4 +- docs/manual/vhosts/ip-based.html.fr | 4 +- docs/manual/vhosts/ip-based.html.ja.utf8 | 4 +- docs/manual/vhosts/ip-based.html.ko.euc-kr | 4 +- docs/manual/vhosts/ip-based.html.tr.utf8 | 4 +- docs/manual/vhosts/mass.html.en | 4 +- docs/manual/vhosts/mass.html.fr | 4 +- docs/manual/vhosts/mass.html.ko.euc-kr | 4 +- docs/manual/vhosts/mass.html.tr.utf8 | 4 +- docs/manual/vhosts/name-based.html.de | 4 +- docs/manual/vhosts/name-based.html.en | 4 +- docs/manual/vhosts/name-based.html.fr | 4 +- docs/manual/vhosts/name-based.html.ja.utf8 | 4 +- docs/manual/vhosts/name-based.html.ko.euc-kr | 4 +- docs/manual/vhosts/name-based.html.tr.utf8 | 4 +- httpd.dep | 68 + httpd.mak | 344 + httpd.spec | 2 +- include/ap_mmn.h | 13 +- include/ap_release.h | 4 +- include/http_connection.h | 14 + include/http_core.h | 32 +- include/http_protocol.h | 2 +- include/httpd.h | 13 +- include/scoreboard.h | 5 + libhttpd.dep | 2421 ++++ libhttpd.mak | 1325 +++ modules/aaa/mod_access_compat.c | 6 +- modules/aaa/mod_access_compat.dep | 59 + modules/aaa/mod_access_compat.mak | 353 + modules/aaa/mod_allowmethods.dep | 56 + modules/aaa/mod_allowmethods.mak | 353 + modules/aaa/mod_auth_basic.dep | 63 + modules/aaa/mod_auth_basic.mak | 353 + modules/aaa/mod_auth_digest.dep | 68 + modules/aaa/mod_auth_digest.mak | 353 + modules/aaa/mod_auth_form.c | 4 +- modules/aaa/mod_auth_form.dep | 66 + modules/aaa/mod_auth_form.mak | 353 + modules/aaa/mod_authn_anon.dep | 58 + modules/aaa/mod_authn_anon.mak | 381 + modules/aaa/mod_authn_core.dep | 58 + modules/aaa/mod_authn_core.mak | 381 + modules/aaa/mod_authn_dbd.dep | 56 + modules/aaa/mod_authn_dbd.mak | 409 + modules/aaa/mod_authn_dbm.dep | 61 + modules/aaa/mod_authn_dbm.mak | 381 + modules/aaa/mod_authn_file.dep | 60 + modules/aaa/mod_authn_file.mak | 381 + modules/aaa/mod_authn_socache.c | 21 +- modules/aaa/mod_authn_socache.dep | 62 + modules/aaa/mod_authn_socache.mak | 353 + modules/aaa/mod_authnz_fcgi.dep | 61 + modules/aaa/mod_authnz_fcgi.mak | 353 + modules/aaa/mod_authnz_ldap.c | 4 +- modules/aaa/mod_authnz_ldap.dep | 70 + modules/aaa/mod_authnz_ldap.mak | 381 + modules/aaa/mod_authz_core.dep | 60 + modules/aaa/mod_authz_core.mak | 381 + modules/aaa/mod_authz_dbd.c | 32 +- modules/aaa/mod_authz_dbd.dep | 61 + modules/aaa/mod_authz_dbd.mak | 409 + modules/aaa/mod_authz_dbm.dep | 62 + modules/aaa/mod_authz_dbm.mak | 381 + modules/aaa/mod_authz_groupfile.dep | 61 + modules/aaa/mod_authz_groupfile.mak | 381 + modules/aaa/mod_authz_host.c | 80 +- modules/aaa/mod_authz_host.dep | 60 + modules/aaa/mod_authz_host.mak | 381 + modules/aaa/mod_authz_owner.dep | 59 + modules/aaa/mod_authz_owner.mak | 381 + modules/aaa/mod_authz_user.dep | 58 + modules/aaa/mod_authz_user.mak | 381 + modules/arch/netware/mod_nw_ssl.c | 7 +- modules/arch/unix/mod_privileges.c | 38 +- modules/arch/win32/mod_isapi.c | 22 +- modules/arch/win32/mod_isapi.dep | 61 + modules/arch/win32/mod_isapi.mak | 353 + modules/arch/win32/mod_win32.c | 4 +- modules/cache/mod_cache.dep | 194 + modules/cache/mod_cache.mak | 370 + modules/cache/mod_cache_disk.dep | 59 + modules/cache/mod_cache_disk.mak | 381 + modules/cache/mod_cache_socache.c | 72 +- modules/cache/mod_cache_socache.dep | 67 + modules/cache/mod_cache_socache.mak | 381 + modules/cache/mod_file_cache.dep | 56 + modules/cache/mod_file_cache.mak | 353 + modules/cache/mod_socache_dbm.c | 3 - modules/cache/mod_socache_dbm.dep | 60 + modules/cache/mod_socache_dbm.mak | 353 + modules/cache/mod_socache_dc.dep | 55 + modules/cache/mod_socache_dc.mak | 353 + modules/cache/mod_socache_memcache.dep | 59 + modules/cache/mod_socache_memcache.mak | 353 + modules/cache/mod_socache_shmcb.c | 4 + modules/cache/mod_socache_shmcb.dep | 56 + modules/cache/mod_socache_shmcb.mak | 353 + modules/cluster/mod_heartbeat.dep | 55 + modules/cluster/mod_heartbeat.mak | 380 + modules/cluster/mod_heartmonitor.c | 43 +- modules/cluster/mod_heartmonitor.dep | 63 + modules/cluster/mod_heartmonitor.mak | 380 + modules/core/mod_macro.c | 2 +- modules/core/mod_macro.dep | 45 + modules/core/mod_macro.mak | 353 + modules/core/mod_watchdog.c | 27 +- modules/core/mod_watchdog.dep | 59 + modules/core/mod_watchdog.mak | 353 + modules/database/mod_dbd.dep | 58 + modules/database/mod_dbd.mak | 353 + modules/dav/fs/mod_dav_fs.dep | 203 + modules/dav/fs/mod_dav_fs.mak | 407 + modules/dav/lock/mod_dav_lock.dep | 100 + modules/dav/lock/mod_dav_lock.mak | 389 + modules/dav/main/mod_dav.c | 1 + modules/dav/main/mod_dav.dep | 354 + modules/dav/main/mod_dav.mak | 406 + modules/dav/main/props.c | 1 - modules/debugging/mod_bucketeer.dep | 53 + modules/debugging/mod_bucketeer.mak | 353 + modules/debugging/mod_dumpio.dep | 50 + modules/debugging/mod_dumpio.mak | 353 + modules/echo/mod_echo.c | 1 - modules/echo/mod_echo.dep | 56 + modules/echo/mod_echo.mak | 353 + modules/examples/mod_case_filter.dep | 46 + modules/examples/mod_case_filter.mak | 353 + modules/examples/mod_case_filter_in.dep | 46 + modules/examples/mod_case_filter_in.mak | 353 + modules/examples/mod_example_hooks.c | 3 +- modules/examples/mod_example_hooks.dep | 62 + modules/examples/mod_example_hooks.mak | 353 + modules/examples/mod_example_ipc.c | 12 +- modules/examples/mod_example_ipc.dep | 56 + modules/examples/mod_example_ipc.mak | 353 + modules/filters/mod_buffer.dep | 48 + modules/filters/mod_buffer.mak | 353 + modules/filters/mod_charset_lite.c | 2 +- modules/filters/mod_charset_lite.dep | 60 + modules/filters/mod_charset_lite.mak | 353 + modules/filters/mod_data.dep | 55 + modules/filters/mod_data.mak | 353 + modules/filters/mod_deflate.c | 17 +- modules/filters/mod_deflate.dep | 52 + modules/filters/mod_deflate.mak | 353 + modules/filters/mod_ext_filter.dep | 58 + modules/filters/mod_ext_filter.mak | 353 + modules/filters/mod_filter.c | 2 - modules/filters/mod_filter.dep | 50 + modules/filters/mod_filter.mak | 353 + modules/filters/mod_include.c | 27 +- modules/filters/mod_include.dep | 63 + modules/filters/mod_include.mak | 353 + modules/filters/mod_proxy_html.dep | 58 + modules/filters/mod_proxy_html.mak | 352 + modules/filters/mod_ratelimit.c | 3 +- modules/filters/mod_ratelimit.dep | 45 + modules/filters/mod_ratelimit.mak | 353 + modules/filters/mod_reflector.dep | 57 + modules/filters/mod_reflector.mak | 353 + modules/filters/mod_reqtimeout.c | 33 +- modules/filters/mod_reqtimeout.dep | 58 + modules/filters/mod_reqtimeout.mak | 353 + modules/filters/mod_request.dep | 55 + modules/filters/mod_request.mak | 353 + modules/filters/mod_sed.c | 2 +- modules/filters/mod_sed.dep | 109 + modules/filters/mod_sed.mak | 380 + modules/filters/mod_substitute.c | 2 +- modules/filters/mod_substitute.dep | 53 + modules/filters/mod_substitute.mak | 353 + modules/filters/mod_xml2enc.dep | 54 + modules/filters/mod_xml2enc.mak | 352 + modules/generators/mod_asis.dep | 56 + modules/generators/mod_asis.mak | 353 + modules/generators/mod_autoindex.dep | 61 + modules/generators/mod_autoindex.mak | 353 + modules/generators/mod_cgi.c | 19 +- modules/generators/mod_cgi.dep | 64 + modules/generators/mod_cgi.mak | 353 + modules/generators/mod_cgid.c | 29 +- modules/generators/mod_info.dep | 66 + modules/generators/mod_info.mak | 353 + modules/generators/mod_status.c | 10 +- modules/generators/mod_status.dep | 60 + modules/generators/mod_status.mak | 353 + modules/http/http_protocol.c | 25 +- modules/http/mod_mime.dep | 55 + modules/http/mod_mime.mak | 353 + modules/http2/NWGNUmakefile | 117 +- modules/http2/NWGNUmod_http2 | 416 + modules/http2/config.m4 | 197 - modules/http2/config2.m4 | 211 + modules/http2/h2.h | 158 + modules/http2/h2_alt_svc.c | 16 +- modules/http2/h2_bucket_eoc.h | 1 + modules/http2/h2_bucket_eos.h | 1 + modules/http2/h2_config.c | 98 +- modules/http2/h2_config.h | 5 +- modules/http2/h2_conn.c | 386 +- modules/http2/h2_conn.h | 37 +- modules/http2/h2_conn_io.c | 418 +- modules/http2/h2_conn_io.h | 47 +- modules/http2/h2_ctx.c | 51 +- modules/http2/h2_ctx.h | 20 +- modules/http2/h2_filter.c | 322 + modules/http2/h2_filter.h | 77 + modules/http2/h2_from_h1.c | 24 +- modules/http2/h2_from_h1.h | 2 - modules/http2/h2_h2.c | 270 +- modules/http2/h2_h2.h | 41 - modules/http2/h2_int_queue.c | 187 + modules/http2/h2_int_queue.h | 108 + modules/http2/h2_io.c | 409 +- modules/http2/h2_io.h | 100 +- modules/http2/h2_io_set.c | 20 +- modules/http2/h2_io_set.h | 7 +- modules/http2/h2_mplx.c | 1372 ++- modules/http2/h2_mplx.h | 154 +- modules/http2/h2_ngn_shed.c | 352 + modules/http2/h2_ngn_shed.h | 76 + modules/http2/h2_private.h | 13 +- modules/http2/h2_push.c | 722 +- modules/http2/h2_push.h | 85 + modules/http2/h2_request.c | 122 +- modules/http2/h2_request.h | 47 +- modules/http2/h2_response.c | 80 +- modules/http2/h2_response.h | 13 +- modules/http2/h2_session.c | 1692 ++- modules/http2/h2_session.h | 119 +- modules/http2/h2_stream.c | 514 +- modules/http2/h2_stream.h | 78 +- modules/http2/h2_switch.c | 29 +- modules/http2/h2_task.c | 218 +- modules/http2/h2_task.h | 47 +- modules/http2/h2_task_input.c | 79 +- modules/http2/h2_task_input.h | 8 +- modules/http2/h2_task_output.c | 182 +- modules/http2/h2_task_output.h | 22 +- modules/http2/h2_task_queue.c | 6 +- modules/http2/h2_task_queue.h | 2 - modules/http2/h2_util.c | 521 +- modules/http2/h2_util.h | 139 +- modules/http2/h2_version.h | 14 +- modules/http2/h2_worker.c | 128 +- modules/http2/h2_worker.h | 16 +- modules/http2/h2_workers.c | 300 +- modules/http2/h2_workers.h | 58 +- modules/http2/mod_http2.c | 203 +- modules/http2/mod_http2.dep | 1641 +++ modules/http2/mod_http2.dsp | 24 +- modules/http2/mod_http2.h | 93 + modules/http2/mod_http2.mak | 596 + modules/ldap/mod_ldap.dep | 192 + modules/ldap/mod_ldap.mak | 371 + modules/loggers/mod_log_config.c | 37 +- modules/loggers/mod_log_config.dep | 62 + modules/loggers/mod_log_config.mak | 353 + modules/loggers/mod_log_debug.c | 8 +- modules/loggers/mod_log_debug.dep | 54 + modules/loggers/mod_log_debug.mak | 325 + modules/loggers/mod_log_forensic.dep | 53 + modules/loggers/mod_log_forensic.mak | 353 + modules/loggers/mod_logio.c | 1 - modules/loggers/mod_logio.dep | 59 + modules/loggers/mod_logio.mak | 353 + modules/lua/lua_request.c | 53 +- modules/lua/lua_vmprep.c | 38 +- modules/lua/mod_lua.c | 6 +- modules/lua/mod_lua.dep | 418 + modules/lua/mod_lua.mak | 407 + modules/mappers/mod_actions.dep | 58 + modules/mappers/mod_actions.mak | 353 + modules/mappers/mod_alias.c | 213 +- modules/mappers/mod_alias.dep | 51 + modules/mappers/mod_alias.mak | 353 + modules/mappers/mod_dir.dep | 60 + modules/mappers/mod_dir.mak | 353 + modules/mappers/mod_imagemap.c | 8 +- modules/mappers/mod_imagemap.dep | 60 + modules/mappers/mod_imagemap.mak | 353 + modules/mappers/mod_negotiation.c | 28 +- modules/mappers/mod_negotiation.dep | 58 + modules/mappers/mod_negotiation.mak | 353 + modules/mappers/mod_rewrite.c | 58 +- modules/mappers/mod_rewrite.dep | 65 + modules/mappers/mod_rewrite.mak | 353 + modules/mappers/mod_speling.c | 8 +- modules/mappers/mod_speling.dep | 51 + modules/mappers/mod_speling.mak | 353 + modules/mappers/mod_userdir.dep | 46 + modules/mappers/mod_userdir.mak | 353 + modules/mappers/mod_vhost_alias.dep | 50 + modules/mappers/mod_vhost_alias.mak | 353 + modules/metadata/mod_cern_meta.dep | 55 + modules/metadata/mod_cern_meta.mak | 353 + modules/metadata/mod_env.dep | 47 + modules/metadata/mod_env.mak | 353 + modules/metadata/mod_expires.c | 2 +- modules/metadata/mod_expires.dep | 54 + modules/metadata/mod_expires.mak | 353 + modules/metadata/mod_headers.dep | 57 + modules/metadata/mod_headers.mak | 353 + modules/metadata/mod_ident.dep | 52 + modules/metadata/mod_ident.mak | 353 + modules/metadata/mod_mime_magic.dep | 58 + modules/metadata/mod_mime_magic.mak | 353 + modules/metadata/mod_remoteip.c | 21 +- modules/metadata/mod_remoteip.dep | 53 + modules/metadata/mod_remoteip.mak | 353 + modules/metadata/mod_setenvif.c | 3 +- modules/metadata/mod_setenvif.dep | 56 + modules/metadata/mod_setenvif.mak | 353 + modules/metadata/mod_unique_id.dep | 50 + modules/metadata/mod_unique_id.mak | 353 + modules/metadata/mod_usertrack.c | 1 - modules/metadata/mod_usertrack.dep | 51 + modules/metadata/mod_usertrack.mak | 353 + modules/metadata/mod_version.dep | 45 + modules/metadata/mod_version.mak | 353 + modules/proxy/NWGNUproxy | 2 + modules/proxy/ajp_header.c | 4 +- modules/proxy/ajp_msg.c | 4 +- .../proxy/balancers/mod_lbmethod_bybusyness.dep | 76 + .../proxy/balancers/mod_lbmethod_bybusyness.mak | 408 + .../proxy/balancers/mod_lbmethod_byrequests.dep | 76 + .../proxy/balancers/mod_lbmethod_byrequests.mak | 408 + modules/proxy/balancers/mod_lbmethod_bytraffic.dep | 76 + modules/proxy/balancers/mod_lbmethod_bytraffic.mak | 408 + modules/proxy/balancers/mod_lbmethod_heartbeat.c | 20 +- modules/proxy/balancers/mod_lbmethod_heartbeat.dep | 77 + modules/proxy/balancers/mod_lbmethod_heartbeat.mak | 408 + modules/proxy/examples/mod_lbmethod_rr.c | 134 - modules/proxy/examples/mod_lbmethod_rr.dsp | 111 - modules/proxy/mod_proxy.c | 15 +- modules/proxy/mod_proxy.dep | 153 + modules/proxy/mod_proxy.h | 61 + modules/proxy/mod_proxy.mak | 361 + modules/proxy/mod_proxy_ajp.dep | 356 + modules/proxy/mod_proxy_ajp.mak | 416 + modules/proxy/mod_proxy_balancer.dep | 76 + modules/proxy/mod_proxy_balancer.mak | 380 + modules/proxy/mod_proxy_connect.c | 83 +- modules/proxy/mod_proxy_connect.dep | 73 + modules/proxy/mod_proxy_connect.mak | 380 + modules/proxy/mod_proxy_express.c | 10 +- modules/proxy/mod_proxy_express.dep | 74 + modules/proxy/mod_proxy_express.mak | 380 + modules/proxy/mod_proxy_fcgi.c | 10 + modules/proxy/mod_proxy_fcgi.dep | 75 + modules/proxy/mod_proxy_fcgi.mak | 380 + modules/proxy/mod_proxy_ftp.c | 3 +- modules/proxy/mod_proxy_ftp.dep | 74 + modules/proxy/mod_proxy_ftp.mak | 380 + modules/proxy/mod_proxy_http.c | 61 +- modules/proxy/mod_proxy_http.dep | 73 + modules/proxy/mod_proxy_http.mak | 380 + modules/proxy/mod_proxy_scgi.dep | 75 + modules/proxy/mod_proxy_scgi.mak | 380 + modules/proxy/mod_proxy_wstunnel.c | 79 +- modules/proxy/mod_proxy_wstunnel.dep | 73 + modules/proxy/mod_proxy_wstunnel.mak | 380 + modules/proxy/proxy_util.c | 138 +- modules/session/mod_session.dep | 56 + modules/session/mod_session.mak | 353 + modules/session/mod_session_cookie.dep | 49 + modules/session/mod_session_cookie.mak | 381 + modules/session/mod_session_crypto.dep | 57 + modules/session/mod_session_crypto.mak | 381 + modules/session/mod_session_dbd.dep | 60 + modules/session/mod_session_dbd.mak | 409 + modules/slotmem/mod_slotmem_plain.dep | 51 + modules/slotmem/mod_slotmem_plain.mak | 353 + modules/slotmem/mod_slotmem_shm.dep | 57 + modules/slotmem/mod_slotmem_shm.mak | 353 + modules/ssl/mod_ssl.c | 17 +- modules/ssl/mod_ssl.dep | 1086 ++ modules/ssl/mod_ssl.dsp | 4 +- modules/ssl/mod_ssl.h | 21 + modules/ssl/mod_ssl.mak | 487 + modules/ssl/mod_ssl_openssl.h | 73 + modules/ssl/ssl_engine_config.c | 16 +- modules/ssl/ssl_engine_init.c | 28 +- modules/ssl/ssl_engine_io.c | 55 +- modules/ssl/ssl_engine_kernel.c | 80 +- modules/ssl/ssl_engine_ocsp.c | 2 +- modules/ssl/ssl_engine_vars.c | 3 +- modules/ssl/ssl_private.h | 4 +- modules/ssl/ssl_util_ocsp.c | 45 +- modules/ssl/ssl_util_stapling.c | 8 +- os/win32/BaseAddr.ref | 1 - server/config.c | 17 +- server/connection.c | 21 +- server/core.c | 170 +- server/core_filters.c | 1 - server/gen_test_char.dep | 7 + server/gen_test_char.mak | 234 + server/main.c | 22 +- server/mpm/event/event.c | 153 +- server/mpm/mpmt_os2/mpmt_os2.c | 40 +- server/mpm/netware/mpm_netware.c | 35 +- server/mpm/prefork/prefork.c | 40 +- server/mpm/winnt/mpm_winnt.c | 20 +- server/mpm/worker/worker.c | 85 +- server/mpm_common.c | 1 - server/protocol.c | 9 +- server/request.c | 7 +- server/scoreboard.c | 117 +- server/util_expr_eval.c | 23 +- server/util_filter.c | 3 +- server/util_mutex.c | 3 +- server/util_regex.c | 7 +- server/util_script.c | 10 +- server/vhost.c | 4 +- support/ab.dep | 37 + support/ab.mak | 317 + support/abs.dep | 37 + support/abs.mak | 336 + support/fcgistarter.dep | 29 + support/fcgistarter.mak | 317 + support/htcacheclean.dep | 37 + support/htcacheclean.mak | 317 + support/htdbm.dep | 58 + support/htdbm.mak | 326 + support/htdigest.dep | 27 + support/htdigest.mak | 317 + support/htpasswd.dep | 57 + support/htpasswd.mak | 326 + support/httxt2dbm.dep | 26 + support/httxt2dbm.mak | 317 + support/logresolve.dep | 26 + support/logresolve.mak | 317 + support/rotatelogs.dep | 28 + support/rotatelogs.mak | 317 + support/suexec.c | 1 + support/win32/ApacheMonitor.dep | 18 + support/win32/ApacheMonitor.mak | 309 + support/win32/wintty.dep | 5 + support/win32/wintty.mak | 317 + 1237 files changed, 84420 insertions(+), 15370 deletions(-) create mode 100644 docs/manual/howto/reverse_proxy.html create mode 100644 docs/manual/howto/reverse_proxy.html.en create mode 100644 docs/manual/images/bal-man-b.png create mode 100644 docs/manual/images/bal-man-w.png create mode 100644 docs/manual/images/bal-man.png create mode 100644 docs/manual/images/reverse-proxy-arch.png create mode 100644 httpd.dep create mode 100644 httpd.mak create mode 100644 libhttpd.dep create mode 100644 libhttpd.mak create mode 100644 modules/aaa/mod_access_compat.dep create mode 100644 modules/aaa/mod_access_compat.mak create mode 100644 modules/aaa/mod_allowmethods.dep create mode 100644 modules/aaa/mod_allowmethods.mak create mode 100644 modules/aaa/mod_auth_basic.dep create mode 100644 modules/aaa/mod_auth_basic.mak create mode 100644 modules/aaa/mod_auth_digest.dep create mode 100644 modules/aaa/mod_auth_digest.mak create mode 100644 modules/aaa/mod_auth_form.dep create mode 100644 modules/aaa/mod_auth_form.mak create mode 100644 modules/aaa/mod_authn_anon.dep create mode 100644 modules/aaa/mod_authn_anon.mak create mode 100644 modules/aaa/mod_authn_core.dep create mode 100644 modules/aaa/mod_authn_core.mak create mode 100644 modules/aaa/mod_authn_dbd.dep create mode 100644 modules/aaa/mod_authn_dbd.mak create mode 100644 modules/aaa/mod_authn_dbm.dep create mode 100644 modules/aaa/mod_authn_dbm.mak create mode 100644 modules/aaa/mod_authn_file.dep create mode 100644 modules/aaa/mod_authn_file.mak create mode 100644 modules/aaa/mod_authn_socache.dep create mode 100644 modules/aaa/mod_authn_socache.mak create mode 100644 modules/aaa/mod_authnz_fcgi.dep create mode 100644 modules/aaa/mod_authnz_fcgi.mak create mode 100644 modules/aaa/mod_authnz_ldap.dep create mode 100644 modules/aaa/mod_authnz_ldap.mak create mode 100644 modules/aaa/mod_authz_core.dep create mode 100644 modules/aaa/mod_authz_core.mak create mode 100644 modules/aaa/mod_authz_dbd.dep create mode 100644 modules/aaa/mod_authz_dbd.mak create mode 100644 modules/aaa/mod_authz_dbm.dep create mode 100644 modules/aaa/mod_authz_dbm.mak create mode 100644 modules/aaa/mod_authz_groupfile.dep create mode 100644 modules/aaa/mod_authz_groupfile.mak create mode 100644 modules/aaa/mod_authz_host.dep create mode 100644 modules/aaa/mod_authz_host.mak create mode 100644 modules/aaa/mod_authz_owner.dep create mode 100644 modules/aaa/mod_authz_owner.mak create mode 100644 modules/aaa/mod_authz_user.dep create mode 100644 modules/aaa/mod_authz_user.mak create mode 100644 modules/arch/win32/mod_isapi.dep create mode 100644 modules/arch/win32/mod_isapi.mak create mode 100644 modules/cache/mod_cache.dep create mode 100644 modules/cache/mod_cache.mak create mode 100644 modules/cache/mod_cache_disk.dep create mode 100644 modules/cache/mod_cache_disk.mak create mode 100644 modules/cache/mod_cache_socache.dep create mode 100644 modules/cache/mod_cache_socache.mak create mode 100644 modules/cache/mod_file_cache.dep create mode 100644 modules/cache/mod_file_cache.mak create mode 100644 modules/cache/mod_socache_dbm.dep create mode 100644 modules/cache/mod_socache_dbm.mak create mode 100644 modules/cache/mod_socache_dc.dep create mode 100644 modules/cache/mod_socache_dc.mak create mode 100644 modules/cache/mod_socache_memcache.dep create mode 100644 modules/cache/mod_socache_memcache.mak create mode 100644 modules/cache/mod_socache_shmcb.dep create mode 100644 modules/cache/mod_socache_shmcb.mak create mode 100644 modules/cluster/mod_heartbeat.dep create mode 100644 modules/cluster/mod_heartbeat.mak create mode 100644 modules/cluster/mod_heartmonitor.dep create mode 100644 modules/cluster/mod_heartmonitor.mak create mode 100644 modules/core/mod_macro.dep create mode 100644 modules/core/mod_macro.mak create mode 100644 modules/core/mod_watchdog.dep create mode 100644 modules/core/mod_watchdog.mak create mode 100644 modules/database/mod_dbd.dep create mode 100644 modules/database/mod_dbd.mak create mode 100644 modules/dav/fs/mod_dav_fs.dep create mode 100644 modules/dav/fs/mod_dav_fs.mak create mode 100644 modules/dav/lock/mod_dav_lock.dep create mode 100644 modules/dav/lock/mod_dav_lock.mak create mode 100644 modules/dav/main/mod_dav.dep create mode 100644 modules/dav/main/mod_dav.mak create mode 100644 modules/debugging/mod_bucketeer.dep create mode 100644 modules/debugging/mod_bucketeer.mak create mode 100644 modules/debugging/mod_dumpio.dep create mode 100644 modules/debugging/mod_dumpio.mak create mode 100644 modules/echo/mod_echo.dep create mode 100644 modules/echo/mod_echo.mak create mode 100644 modules/examples/mod_case_filter.dep create mode 100644 modules/examples/mod_case_filter.mak create mode 100644 modules/examples/mod_case_filter_in.dep create mode 100644 modules/examples/mod_case_filter_in.mak create mode 100644 modules/examples/mod_example_hooks.dep create mode 100644 modules/examples/mod_example_hooks.mak create mode 100644 modules/examples/mod_example_ipc.dep create mode 100644 modules/examples/mod_example_ipc.mak create mode 100644 modules/filters/mod_buffer.dep create mode 100644 modules/filters/mod_buffer.mak create mode 100644 modules/filters/mod_charset_lite.dep create mode 100644 modules/filters/mod_charset_lite.mak create mode 100644 modules/filters/mod_data.dep create mode 100644 modules/filters/mod_data.mak create mode 100644 modules/filters/mod_deflate.dep create mode 100644 modules/filters/mod_deflate.mak create mode 100644 modules/filters/mod_ext_filter.dep create mode 100644 modules/filters/mod_ext_filter.mak create mode 100644 modules/filters/mod_filter.dep create mode 100644 modules/filters/mod_filter.mak create mode 100644 modules/filters/mod_include.dep create mode 100644 modules/filters/mod_include.mak create mode 100644 modules/filters/mod_proxy_html.dep create mode 100644 modules/filters/mod_proxy_html.mak create mode 100644 modules/filters/mod_ratelimit.dep create mode 100644 modules/filters/mod_ratelimit.mak create mode 100644 modules/filters/mod_reflector.dep create mode 100644 modules/filters/mod_reflector.mak create mode 100644 modules/filters/mod_reqtimeout.dep create mode 100644 modules/filters/mod_reqtimeout.mak create mode 100644 modules/filters/mod_request.dep create mode 100644 modules/filters/mod_request.mak create mode 100644 modules/filters/mod_sed.dep create mode 100644 modules/filters/mod_sed.mak create mode 100644 modules/filters/mod_substitute.dep create mode 100644 modules/filters/mod_substitute.mak create mode 100644 modules/filters/mod_xml2enc.dep create mode 100644 modules/filters/mod_xml2enc.mak create mode 100644 modules/generators/mod_asis.dep create mode 100644 modules/generators/mod_asis.mak create mode 100644 modules/generators/mod_autoindex.dep create mode 100644 modules/generators/mod_autoindex.mak create mode 100644 modules/generators/mod_cgi.dep create mode 100644 modules/generators/mod_cgi.mak create mode 100644 modules/generators/mod_info.dep create mode 100644 modules/generators/mod_info.mak create mode 100644 modules/generators/mod_status.dep create mode 100644 modules/generators/mod_status.mak create mode 100644 modules/http/mod_mime.dep create mode 100644 modules/http/mod_mime.mak create mode 100644 modules/http2/NWGNUmod_http2 delete mode 100644 modules/http2/config.m4 create mode 100644 modules/http2/config2.m4 create mode 100644 modules/http2/h2.h create mode 100644 modules/http2/h2_filter.c create mode 100644 modules/http2/h2_filter.h create mode 100644 modules/http2/h2_int_queue.c create mode 100644 modules/http2/h2_int_queue.h create mode 100644 modules/http2/h2_ngn_shed.c create mode 100644 modules/http2/h2_ngn_shed.h create mode 100644 modules/http2/mod_http2.dep create mode 100644 modules/http2/mod_http2.h create mode 100644 modules/http2/mod_http2.mak create mode 100644 modules/ldap/mod_ldap.dep create mode 100644 modules/ldap/mod_ldap.mak create mode 100644 modules/loggers/mod_log_config.dep create mode 100644 modules/loggers/mod_log_config.mak create mode 100644 modules/loggers/mod_log_debug.dep create mode 100644 modules/loggers/mod_log_debug.mak create mode 100644 modules/loggers/mod_log_forensic.dep create mode 100644 modules/loggers/mod_log_forensic.mak create mode 100644 modules/loggers/mod_logio.dep create mode 100644 modules/loggers/mod_logio.mak create mode 100644 modules/lua/mod_lua.dep create mode 100644 modules/lua/mod_lua.mak create mode 100644 modules/mappers/mod_actions.dep create mode 100644 modules/mappers/mod_actions.mak create mode 100644 modules/mappers/mod_alias.dep create mode 100644 modules/mappers/mod_alias.mak create mode 100644 modules/mappers/mod_dir.dep create mode 100644 modules/mappers/mod_dir.mak create mode 100644 modules/mappers/mod_imagemap.dep create mode 100644 modules/mappers/mod_imagemap.mak create mode 100644 modules/mappers/mod_negotiation.dep create mode 100644 modules/mappers/mod_negotiation.mak create mode 100644 modules/mappers/mod_rewrite.dep create mode 100644 modules/mappers/mod_rewrite.mak create mode 100644 modules/mappers/mod_speling.dep create mode 100644 modules/mappers/mod_speling.mak create mode 100644 modules/mappers/mod_userdir.dep create mode 100644 modules/mappers/mod_userdir.mak create mode 100644 modules/mappers/mod_vhost_alias.dep create mode 100644 modules/mappers/mod_vhost_alias.mak create mode 100644 modules/metadata/mod_cern_meta.dep create mode 100644 modules/metadata/mod_cern_meta.mak create mode 100644 modules/metadata/mod_env.dep create mode 100644 modules/metadata/mod_env.mak create mode 100644 modules/metadata/mod_expires.dep create mode 100644 modules/metadata/mod_expires.mak create mode 100644 modules/metadata/mod_headers.dep create mode 100644 modules/metadata/mod_headers.mak create mode 100644 modules/metadata/mod_ident.dep create mode 100644 modules/metadata/mod_ident.mak create mode 100644 modules/metadata/mod_mime_magic.dep create mode 100644 modules/metadata/mod_mime_magic.mak create mode 100644 modules/metadata/mod_remoteip.dep create mode 100644 modules/metadata/mod_remoteip.mak create mode 100644 modules/metadata/mod_setenvif.dep create mode 100644 modules/metadata/mod_setenvif.mak create mode 100644 modules/metadata/mod_unique_id.dep create mode 100644 modules/metadata/mod_unique_id.mak create mode 100644 modules/metadata/mod_usertrack.dep create mode 100644 modules/metadata/mod_usertrack.mak create mode 100644 modules/metadata/mod_version.dep create mode 100644 modules/metadata/mod_version.mak create mode 100644 modules/proxy/balancers/mod_lbmethod_bybusyness.dep create mode 100644 modules/proxy/balancers/mod_lbmethod_bybusyness.mak create mode 100644 modules/proxy/balancers/mod_lbmethod_byrequests.dep create mode 100644 modules/proxy/balancers/mod_lbmethod_byrequests.mak create mode 100644 modules/proxy/balancers/mod_lbmethod_bytraffic.dep create mode 100644 modules/proxy/balancers/mod_lbmethod_bytraffic.mak create mode 100644 modules/proxy/balancers/mod_lbmethod_heartbeat.dep create mode 100644 modules/proxy/balancers/mod_lbmethod_heartbeat.mak delete mode 100644 modules/proxy/examples/mod_lbmethod_rr.c delete mode 100644 modules/proxy/examples/mod_lbmethod_rr.dsp create mode 100644 modules/proxy/mod_proxy.dep create mode 100644 modules/proxy/mod_proxy.mak create mode 100644 modules/proxy/mod_proxy_ajp.dep create mode 100644 modules/proxy/mod_proxy_ajp.mak create mode 100644 modules/proxy/mod_proxy_balancer.dep create mode 100644 modules/proxy/mod_proxy_balancer.mak create mode 100644 modules/proxy/mod_proxy_connect.dep create mode 100644 modules/proxy/mod_proxy_connect.mak create mode 100644 modules/proxy/mod_proxy_express.dep create mode 100644 modules/proxy/mod_proxy_express.mak create mode 100644 modules/proxy/mod_proxy_fcgi.dep create mode 100644 modules/proxy/mod_proxy_fcgi.mak create mode 100644 modules/proxy/mod_proxy_ftp.dep create mode 100644 modules/proxy/mod_proxy_ftp.mak create mode 100644 modules/proxy/mod_proxy_http.dep create mode 100644 modules/proxy/mod_proxy_http.mak create mode 100644 modules/proxy/mod_proxy_scgi.dep create mode 100644 modules/proxy/mod_proxy_scgi.mak create mode 100644 modules/proxy/mod_proxy_wstunnel.dep create mode 100644 modules/proxy/mod_proxy_wstunnel.mak create mode 100644 modules/session/mod_session.dep create mode 100644 modules/session/mod_session.mak create mode 100644 modules/session/mod_session_cookie.dep create mode 100644 modules/session/mod_session_cookie.mak create mode 100644 modules/session/mod_session_crypto.dep create mode 100644 modules/session/mod_session_crypto.mak create mode 100644 modules/session/mod_session_dbd.dep create mode 100644 modules/session/mod_session_dbd.mak create mode 100644 modules/slotmem/mod_slotmem_plain.dep create mode 100644 modules/slotmem/mod_slotmem_plain.mak create mode 100644 modules/slotmem/mod_slotmem_shm.dep create mode 100644 modules/slotmem/mod_slotmem_shm.mak create mode 100644 modules/ssl/mod_ssl.dep create mode 100644 modules/ssl/mod_ssl.mak create mode 100644 modules/ssl/mod_ssl_openssl.h create mode 100644 server/gen_test_char.dep create mode 100644 server/gen_test_char.mak create mode 100644 support/ab.dep create mode 100644 support/ab.mak create mode 100644 support/abs.dep create mode 100644 support/abs.mak create mode 100644 support/fcgistarter.dep create mode 100644 support/fcgistarter.mak create mode 100644 support/htcacheclean.dep create mode 100644 support/htcacheclean.mak create mode 100644 support/htdbm.dep create mode 100644 support/htdbm.mak create mode 100644 support/htdigest.dep create mode 100644 support/htdigest.mak create mode 100644 support/htpasswd.dep create mode 100644 support/htpasswd.mak create mode 100644 support/httxt2dbm.dep create mode 100644 support/httxt2dbm.mak create mode 100644 support/logresolve.dep create mode 100644 support/logresolve.mak create mode 100644 support/rotatelogs.dep create mode 100644 support/rotatelogs.mak create mode 100644 support/win32/ApacheMonitor.dep create mode 100644 support/win32/ApacheMonitor.mak create mode 100644 support/win32/wintty.dep create mode 100644 support/win32/wintty.mak diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index 8f336803..3fbc62d2 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -68,9 +68,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name mod_example_ipc End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_lbmethod_rr - End Project Dependency }}} ############################################################################### @@ -1987,30 +1984,6 @@ Package=<4> ############################################################################### -Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libapr - End Project Dependency - Begin Project Dependency - Project_Dep_Name libhttpd - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_proxy - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_proxy_balancer - End Project Dependency -}}} - -############################################################################### - Project: "mod_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index 1b0f8c6b..a77b870a 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -71,9 +71,6 @@ Package=<4> Begin Project Dependency Project_Dep_Name mod_example_ipc End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_lbmethod_rr - End Project Dependency }}} ############################################################################### @@ -2344,33 +2341,6 @@ Package=<4> ############################################################################### -Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libapr - End Project Dependency - Begin Project Dependency - Project_Dep_Name libaprutil - End Project Dependency - Begin Project Dependency - Project_Dep_Name libhttpd - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_proxy - End Project Dependency - Begin Project Dependency - Project_Dep_Name mod_proxy_balancer - End Project Dependency -}}} - -############################################################################### - Project: "mod_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4> Package=<5> diff --git a/CHANGES b/CHANGES index ef9a38bc..65c8b54a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,254 @@ -*- coding: utf-8 -*- +Changes with Apache 2.4.20 + + *) core: Do not read .htaccess if AllowOverride and AllowOverrideList + are "None". PR 58528. + [Michael Schlenker ] + + *) core/util_script: relax alphanumeric filter of enviroment variable names + on Windows to allow '(' and ')' for passing PROGRAMFILES(X86) et.al. + unadulterated in 64 bit versions of Windows. PR 46751. + [John ] + + *) mod_http2: incrementing keepalives on each request started so that logging + %k gives increasing numbers per master http2 connection. + New documented variables in env, usable in custom log formats: H2_PUSH, + H2_PUSHED, H2_PUSHED_ON, H2_STREAM_ID and H2_STREAM_TAG. + [Stefan Eissing] + + *) mod_http2: more efficient passing of response bodies with less contention + and file bucket forwarding. [Stefan Eissing] + + *) mod_http2: fix for missing score board updates on request count, fix for + memory leak on slave connection reuse. [Stefan Eissing] + + *) mod_http2: Fix build on Windows from dsp files. + [Stefan Eissing] + +Changes with Apache 2.4.19 + + *) mod_include: Add variable DOCUMENT_ARGS, with the arguments to the + request for the SSI document. [Jeff Trawick] + + *) mod_authz_host: Add a new "forward-dns" authorization type, not relying on + reverse DNS lookups. [Fabien] + + *) mod_ssl: Add hooks to allow other modules to perform processing at + several stages of initialization and connection handling. See + mod_ssl_openssl.h. [Jeff Trawick] + + *) mod_http2: disabling PUSH when client sends GOAWAY. Slave connections are + reused for several requests, improved performance and better memory use. + [Stefan Eissing] + + *) mod_rewrite: Don't implicitly URL-escape the original query string + when no substitution has changed it (like PR50447 but server context) + [Evgeny Kotkov ] + + *) mod_http2: fixes problem with wrong lifetime of file buckets on main + connection. [Stefan Eissing] + + *) mod_http2: fixes incorrect denial of requests without :authority header. + [Stefan Eissing] + + *) mod_reqtimeout: Prevent long response times from triggering a timeout once + the request has been fully read. PR 59045. [Yann Ylavic] + + *) ap_expr: expression support for variable HTTP2=on|off. [Stefan Eissing] + + *) mod_http2: give control to async mpm for keepalive timeouts only when + no streams are open and even if only after 1 sec delay. Under load, event + mpm discards connections otherwise too quickly. [Stefan Eissing] + + *) mod_ssl: Don't lose track of the SSL context if an unlikely failure occurs + in ssl_init_ssl_connection(). [Graham Leggett] + + *) mod_rewrite: Add QSL|qslast flag to allow rewrites to files with + literal question marks in their names. PR 58777. [Eric Covener] + + *) event: use pre_connection hook to properly initialize connection state for + slave connections. use protocol_switch hook to initialize server config + early based on SNI selected vhost. + [Stefan Eissing] + + *) hostname: Test and log useragent_host per-request across various modules, + including the scoreboard, expression and rewrite engines, setenvif, + authz_host, access_compat, custom logging, ssl and REMOTE_HOST variables. + PR55348 [William Rowe] + + *) core: Track the useragent_host per-request when mod_remoteip or similar + modules track a per-request useragent_ip. Modules should be updated + to inquire for ap_get_useragent_host() in place of ap_get_remote_host(). + [William Rowe] + + *) core: fix a bug in directive processing. When used, the last + 'ed variable was also withdrawn. PR 59019 + [Christophe Jaillet] + + *) mod_http2: Accept-Encoding is, when present on the initiating request, + added to push promises. This lets compressed content work in pushes. + by the client. [Stefan Eissing] + + *) mod_http2: fixed possible read after free when streams were cancelled early + by the client. [Stefan Eissing] + + *) mod_http2: fixed possible deadlock during connection shutdown. Thanks to + @FrankStolle for reporting and getting the necessary data. + [Stefan Eissing] + + *) mod_http2: fixed apr_uint64_t formatting in a log statement to user proper + APR def, thanks to @Sp1l. + + *) mod_http2: number of worker threads allowed to a connection is adjusting + dynamically. Starting with 4, the number is doubled when streams can be + served without block on http/2 connection flow. The number is halfed, when + the server has to wait on client flow control grants. + This can happen with a maximum frequency of 5 times per second. + When a connection occupies too many workers, repeatable requests + (GET/HEAD/OPTIONS) are cancelled and placed back in the queue. Should that + not suffice and a stream is busy longer than the server timeout, the + connection will be aborted with error code ENHANCE_YOUR_CALM. + This does *not* limit the number of streams a client may open, rather the + number of server threads a connection might use. + [Stefan Eissing] + + *) mod_http2: allowing link header to specify multiple "rel" values, + space-separated inside a quoted string. Prohibiting push when Link + parameter "nopush" is present. + [Stefan Eissing] + + *) mod_http2: reworked connection state handling. Idle connections accept a + GOAWAY from the client without further reply. Otherwise the + module makes a best effort to send one last GOAWAY to the client. + + *) mod_http2: the values from standard directives Timeout and KeepAliveTimeout + properly are applied to http/2 connections. + [Stefan Eissing] + + *) mod_http2: idle connections are returned to async mpms. new hook + "pre_close_connection" used to send GOAWAY frame when not already done. + Setting event mpm server config "by hand" for the main connection to + the correct negotiated server. + [Stefan Eissing] + + *) mod_http2: keep-alive blocking reads are done with 1 second timeouts to + check for MPM stopping. Will announce early GOAWAY and finish processing + open streams, then close. + [Stefan Eissing] + + *) mod_http2: bytes read/written on slave connections are reported via the + optional mod_logio functions. Fixes PR 58871. + + *) prefork: Initialize the POD when running in ONE_PROCESS (or -X) mode to + avoid a crash. [Jan Kaluza, Yann Ylavic] + + *) mod_ssl: When SSLVerify is disabled (NONE), don't force a renegotiation if + the SSLVerifyDepth applied with the default/handshaken vhost differs from + the one applicable with the finally selected vhost. [Yann Ylavic] + + *) core: Ensure that httpd exits with an error status when the MPM fails + to run. [Yann Ylavic] + + *) mod_ssl: Fix a possible memory leak on restart for custom [EC]DH params. + [Jan Kaluza, Yann Ylavic] + + *) mod_ssl: Add SSLOCSPProxyURL to add the possibility to do all queries + to OCSP responders through a HTTP proxy. [Ruediger Pluem] + + *) mod_proxy: Play/restore the TLS-SNI on new backend connections which + had to be issued because the remote closed the previous/reusable one + during idle (keep-alive) time. [Yann Ylavic] + + *) mod_cache_socache: Fix a possible cached entity body corruption when it + is received from an origin server in multiple batches and forwarded by + mod_proxy. [Yann Ylavic] + + *) core: Add expression support to SetHandler. + [Eric Covener] + + *) mod_remoteip: Prevent an external proxy from presenting an internal + proxy. PR 55962. [Mike Rumph] + + *) core: Prevent a server crash in case of an invalid CONNECT request with + a custom error page for status code 400 that uses server side includes. + PR 58929 [Ruediger Pluem] + + *) mod_ssl: handle TIMEOUT on empty SSL input as non-fatal, returning + APR_TIMEUP and preserving connection state for later retry. + [Stefan Eissing] + + *) mod_ssl: Save some TLS record (application data) fragmentations by + including the last and subsequent suitable buckets when coalescing. + [Yann Ylavic] + + *) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075, + "Error dispatching request", when the cause appears to be + due to the client closing the connection. + PR58118. [Tobias Adolph ] + + *) mod_cgid: Message AH02550, failure to flush a response to the client, + is now logged at TRACE1 level to match the underlying core output filter + severity. [Eric Covener] + + *) mime.types: add common extension "m4a" for MPEG 4 Audio. + PR 57895 [Dylan Millikin ] + + *) Added many log numbers to log statements that had none. + [Rainer Jung] + + *) mod_log_config: Add GlobalLog to allow a globally defined log to + be inherited by virtual hosts that define a CustomLog. + [Edward Lu] + + *) mod_http2: connections how keep a "push diary" where hashes of already + pushed resources are kept. See directive H2PushDiarySize for managing this. + Push diaries can be initialized by clients via the "Cache-Digest" request + header. This carries a base64url encoded. compressed Golomb set as described + in https://datatracker.ietf.org/doc/draft-kazuho-h2-cache-digest/ + Introduced a status handler for HTTP/2 connections, giving various counters + and statistics about the current connection, plus its cache digest value + in a JSON record. Not a replacement for more HTTP/2 in the server status. + Configured as + + SetHandler http2-status + + [Stefan Eissing] + + *) mod_http2: Fixed flushing of last GOAWAY frame. Previously, that frame + did not always reach the client, causing some to fail the next request. + Fixed calculation of last stream id accepted as described in rfc7540. + Reading in KEEPALIVE state now correctly shown in scoreboard. + Fixed possible race in connection shutdown after review by Ylavic. + Fixed segfault on connection shutdown, callback ran into a semi dismantled session. + [Stefan Eissing] + + *) mod_http2: Added support for experimental accept-push-policy draft + (https://tools.ietf.org/html/draft-ruellan-http-accept-push-policy-00). Clients + may now influence server pushes by sending accept-push-policy headers. + [Stefan Eissing] + + *) mod_http2: new r->subprocess_env variables HTTP2 and H2PUSH, set to "on" + when available for request. + [Stefan Eissing] + + *) mod_http2: fixed bug in input window size calculation by moving chunked + request body encoding into later stage of processing. Fixes PR 58825. + [Stefan Eissing] + + *) core: new hook "pre_close_connection" which is run before the lingering + close of connections is started. This gives protocol handlers one last + chance to use a connection before it goes down. + [Stefan Eissing] + + *) mod_status/scoreboard: showing connection protocol in new column, new + ap_update_child_status methods for updating server/description. mod_ssl + sets vhost negotiated by servername directly. + [Stefan Eissing] + Changes with Apache 2.4.18 *) mod_ssl: for all ssl_engine_vars.c lookups, fall back to master connection @@ -77,6 +326,9 @@ Changes with Apache 2.4.18 Renegotiation is 403ed when a master connection is present. Exact reason is given additionally in a request note. [Stefan Eissing] + *) mod_ssl: Make the output filter more friendly with deferred write and + response pipelining. [Yann Ylavic, Joe Orton] + *) core: Fix scoreboard crash (SIGBUS) on hardware requiring strict 64bit alignment (SPARC64, PPC64). [Yann Ylavic] @@ -103,9 +355,6 @@ Changes with Apache 2.4.17 to avoid reusing it should the close be effective after some new request is ready to be sent. [Yann Ylavic] - *) mod_ssl: Make the output filter more friendly with deferred write and - response pipelining. [Yann Ylavic, Joe Orton] - *) mod_substitute: Allow to configure the patterns merge order with the new SubstituteInheritBefore on|off directive. PR 57641 [Marc.Stern , Yann Ylavic, William Rowe] @@ -148,6 +397,11 @@ Changes with Apache 2.4.17 records for scalability. [Yingqi Lu , Jeff Trawick, Jim Jagielski, Yann Ylavic] + *) mod_alias: Introduce expression parser support for Alias, ScriptAlias + and Redirect. Limit Redirect expressions to directory (Location) context + and redirect statuses (implicit or explicit). + [Graham Leggett, Yann Ylavic, Ruediger Pluem] + *) mod_proxy: Fix a race condition that caused a failed worker to be retried before the retry period is over. [Ruediger Pluem] diff --git a/CMakeLists.txt b/CMakeLists.txt index 7de4c5a1..2ea01808 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -382,16 +382,17 @@ SET(mod_http2_extra_sources modules/http2/h2_alt_svc.c modules/http2/h2_bucket_eoc.c modules/http2/h2_bucket_eos.c modules/http2/h2_config.c modules/http2/h2_conn.c modules/http2/h2_conn_io.c - modules/http2/h2_ctx.c modules/http2/h2_from_h1.c - modules/http2/h2_h2.c modules/http2/h2_io.c - modules/http2/h2_io_set.c modules/http2/h2_mplx.c - modules/http2/h2_push.c modules/http2/h2_request.c - modules/http2/h2_response.c modules/http2/h2_session.c - modules/http2/h2_stream.c modules/http2/h2_stream_set.c - modules/http2/h2_switch.c modules/http2/h2_task.c - modules/http2/h2_task_input.c modules/http2/h2_task_output.c - modules/http2/h2_task_queue.c modules/http2/h2_util.c - modules/http2/h2_worker.c modules/http2/h2_workers.c + modules/http2/h2_ctx.c modules/http2/h2_filter.c + modules/http2/h2_from_h1.c modules/http2/h2_h2.c + modules/http2/h2_io.c modules/http2/h2_io_set.c + modules/http2/h2_mplx.c modules/http2/h2_push.c + modules/http2/h2_request.c modules/http2/h2_response.c + modules/http2/h2_session.c modules/http2/h2_stream.c + modules/http2/h2_switch.c modules/http2/h2_ngn_shed.c + modules/http2/h2_task.c modules/http2/h2_task_input.c + modules/http2/h2_task_output.c modules/http2/h2_int_queue.c + modules/http2/h2_util.c modules/http2/h2_worker.c + modules/http2/h2_workers.c ) SET(mod_ldap_extra_defines LDAP_DECLARE_EXPORT) SET(mod_ldap_extra_libs wldap32) @@ -444,6 +445,7 @@ SET(mod_session_crypto_requires APU_HAVE_CRYPTO) SET(mod_session_crypto_extra_libs mod_session) SET(mod_session_dbd_extra_libs mod_session) SET(mod_socache_dc_requires AN_UNIMPLEMENTED_SUPPORT_LIBRARY_REQUIREMENT) +SET(mod_ssl_extra_defines SSL_DECLARE_EXPORT) SET(mod_ssl_requires OPENSSL_FOUND) IF(OPENSSL_FOUND) SET(mod_ssl_extra_includes ${OPENSSL_INCLUDE_DIR}) @@ -638,6 +640,7 @@ SET(other_installed_h ${CMAKE_CURRENT_SOURCE_DIR}/modules/proxy/mod_proxy.h ${CMAKE_CURRENT_SOURCE_DIR}/modules/session/mod_session.h ${CMAKE_CURRENT_SOURCE_DIR}/modules/ssl/mod_ssl.h + ${CMAKE_CURRENT_SOURCE_DIR}/modules/ssl/mod_ssl_openssl.h ) # When mod_serf is buildable, don't forget to copy modules/proxy/mod_serf.h diff --git a/Makefile.in b/Makefile.in index c1b08f9b..6d952b24 100644 --- a/Makefile.in +++ b/Makefile.in @@ -234,6 +234,7 @@ INSTALL_HEADERS = \ $(srcdir)/modules/proxy/mod_proxy.h \ $(srcdir)/modules/session/mod_session.h \ $(srcdir)/modules/ssl/mod_ssl.h \ + $(srcdir)/modules/ssl/mod_ssl_openssl.h \ $(srcdir)/os/$(OS_DIR)/*.h install-include: diff --git a/Makefile.win b/Makefile.win index 570037fa..f6a82e5b 100644 --- a/Makefile.win +++ b/Makefile.win @@ -564,11 +564,6 @@ _build: $(MAKE) $(MAKEOPT) -f mod_lbmethod_bytraffic.mak CFG="mod_lbmethod_bytraffic - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_lbmethod_heartbeat.mak CFG="mod_lbmethod_heartbeat - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\..\.. -!IFDEF ALL - cd modules\proxy\examples - $(MAKE) $(MAKEOPT) -f mod_lbmethod_rr.mak CFG="mod_lbmethod_rr - Win32 $(LONG)" RECURSE=0 $(CTARGET) - cd ..\..\.. -!ENDIF cd modules\session $(MAKE) $(MAKEOPT) -f mod_session.mak CFG="mod_session - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -836,9 +831,6 @@ _copybin: copy modules\proxy\balancers\$(LONG)\mod_lbmethod_byrequests.$(src_so) "$(inst_so)" <.y copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bytraffic.$(src_so) "$(inst_so)" <.y copy modules\proxy\balancers\$(LONG)\mod_lbmethod_heartbeat.$(src_so) "$(inst_so)" <.y -!IFDEF ALL - copy modules\proxy\examples\$(LONG)\mod_lbmethod_rr.$(src_so) "$(inst_so)" <.y -!ENDIF copy modules\session\$(LONG)\mod_session.$(src_so) "$(inst_so)" <.y copy modules\session\$(LONG)\mod_session_cookie.$(src_so) "$(inst_so)" <.y copy modules\session\$(LONG)\mod_session_dbd.$(src_so) "$(inst_so)" <.y @@ -1132,6 +1124,7 @@ BEGIN { modules\mappers\mod_rewrite.h \ modules\proxy\mod_proxy.h \ modules\ssl\mod_ssl.h \ + modules\ssl\mod_ssl_openssl.h \ ) do \ @copy %f "$(INSTDIR)\include" < .y > nul copy srclib\apr\Lib$(SHORT)\apr-1.lib "$(INSTDIR)\lib" <.y diff --git a/NOTICE b/NOTICE index d24cb1dd..3e80c98a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache HTTP Server -Copyright 2015 The Apache Software Foundation. +Copyright 2016 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/NWGNUmakefile b/NWGNUmakefile index e382203d..904430d2 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -446,6 +446,7 @@ installdev :: FORCE $(call COPY,$(STDMOD)/proxy/mod_proxy.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/session/mod_session.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/ssl/mod_ssl.h, $(INSTALLBASE)/include/) + $(call COPY,$(STDMOD)/ssl/mod_ssl_openssl.h, $(INSTALLBASE)/include/) $(call COPY,$(APR)/*.imp, $(INSTALLBASE)/lib/) $(call COPY,$(NWOS)/*.imp, $(INSTALLBASE)/lib/) $(call COPY,$(NWOS)/*.xdc, $(INSTALLBASE)/lib/) diff --git a/README.cmake b/README.cmake index 20fda180..60fcc422 100644 --- a/README.cmake +++ b/README.cmake @@ -309,8 +309,7 @@ Known Bugs and Limitations of httpd and support libraries in a manner suitable for typical users * no logic to find support libraries or otherwise build these modules: + mod_socache_dc (requires distcache), mod_serf (requires serf) - + additionally, mod_lbmethod_rr and mod_firehose don't compile on Windows - anyway + + additionally, mod_firehose doesn't compile on Windows anyway * buildmark.c isn't necessarily rebuilt when httpd.exe is regenerated * ApacheMonitor has a build error and is disabled * CGI examples aren't installed diff --git a/acinclude.m4 b/acinclude.m4 index 7ee0ad20..e1537585 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -488,6 +488,8 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ ap_openssl_found="" ap_openssl_base="" ap_openssl_libs="" + ap_openssl_mod_cflags="" + ap_openssl_mod_ldflags="" dnl Determine the OpenSSL base directory, if any AC_MSG_CHECKING([for user-provided OpenSSL base directory]) @@ -590,9 +592,15 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[ CPPFLAGS="$saved_CPPFLAGS" LIBS="$saved_LIBS" LDFLAGS="$saved_LDFLAGS" + + dnl cache MOD_LDFLAGS, MOD_CFLAGS + ap_openssl_mod_cflags=$MOD_CFLAGS + ap_openssl_mod_ldflags=$MOD_LDFLAGS ]) if test "x$ac_cv_openssl" = "xyes"; then AC_DEFINE(HAVE_OPENSSL, 1, [Define if OpenSSL is available]) + APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_mod_ldflags]) + APR_ADDTO(MOD_CFLAGS, [$ap_openssl_mod_cflags]) fi ]) diff --git a/configure b/configure index 9f97e0d7..41817df3 100755 --- a/configure +++ b/configure @@ -724,6 +724,7 @@ MOD_LBMETHOD_HEARTBEAT_LDADD MOD_LBMETHOD_BYBUSYNESS_LDADD MOD_LBMETHOD_BYTRAFFIC_LDADD MOD_LBMETHOD_BYREQUESTS_LDADD +MOD_HTTP2_LDADD APACHECTL_ULIMIT NONPORTABLE_SUPPORT fcgistarter_LTFLAGS @@ -742,6 +743,8 @@ MOD_OPTIONAL_FN_IMPORT_LDADD MOD_OPTIONAL_HOOK_IMPORT_LDADD MOD_OPTIONAL_HOOK_EXPORT_LDADD MOD_SSL_LDADD +ab_LDFLAGS +ab_CFLAGS MOD_SLOTMEM_PLAIN_LDADD MOD_SLOTMEM_SHM_LDADD MOD_SESSION_DBD_LDADD @@ -778,9 +781,6 @@ MOD_LOG_FORENSIC_LDADD MOD_LOG_DEBUG_LDADD MOD_LOG_CONFIG_LDADD MOD_LDAP_LDADD -MOD_HTTP2_LDADD -ab_LDFLAGS -ab_CFLAGS MOD_MIME_LDADD MOD_HTTP_LDADD MOD_PROXY_HTML_LDADD @@ -1036,9 +1036,6 @@ with_libxml2 enable_proxy_html enable_http enable_mime -enable_http2 -with_nghttp2 -enable_nghttp2_staticlib_deps enable_ldap enable_log_config enable_log_debug @@ -1094,6 +1091,9 @@ enable_static_checkgid enable_static_htcacheclean enable_static_httxt2dbm enable_static_fcgistarter +enable_http2 +with_nghttp2 +enable_nghttp2_staticlib_deps enable_lbmethod_byrequests enable_lbmethod_bytraffic enable_lbmethod_bybusyness @@ -1852,17 +1852,6 @@ Optional Features: linked statically. --disable-mime mapping of file-extension to MIME. Disabling this module is normally not recommended. - --enable-http2 HTTP/2 protocol handling in addition to HTTP - protocol handling. Implemented by mod_http2. This - module requires a libnghttp2 installation. See - --with-nghttp2 on how to manage non-standard - locations. This module is usually linked shared and - requires loading. - --enable-nghttp2-staticlib-deps - link mod_http2 with dependencies of libnghttp2's - static libraries (as indicated by "pkg-config - --static"). Must be specified in addition to - --enable-http2. --enable-ldap LDAP caching and connection pooling services --disable-log-config logging configuration. You won't be able to log requests to the server without this module. @@ -1943,6 +1932,17 @@ Optional Features: Build a statically linked version of httxt2dbm --enable-static-fcgistarter Build a statically linked version of fcgistarter + --enable-http2 HTTP/2 protocol handling in addition to HTTP + protocol handling. Implemented by mod_http2. This + module requires a libnghttp2 installation. See + --with-nghttp2 on how to manage non-standard + locations. This module is usually linked shared and + requires loading. + --enable-nghttp2-staticlib-deps + link mod_http2 with dependencies of libnghttp2's + static libraries (as indicated by "pkg-config + --static"). Must be specified in addition to + --enable-http2. --enable-lbmethod-byrequests Apache proxy Load balancing by request counting --enable-lbmethod-bytraffic @@ -1997,9 +1997,9 @@ Optional Packages: --with-distcache=PATH Distcache installation directory --with-z=PATH use a specific zlib library --with-libxml2=PATH location for libxml2 - --with-nghttp2=PATH nghttp2 installation directory --with-lua=PATH Path to the Lua 5.2/5.1 prefix --with-ssl=PATH OpenSSL installation directory + --with-nghttp2=PATH nghttp2 installation directory --with-mpm=MPM Choose the process model for Apache to use by default. MPM={event|worker|prefork|winnt} This will be statically linked as the only available MPM @@ -18151,34 +18151,31 @@ EOF - current_dir=http2 - modpath_current=modules/http2 + + current_dir=ldap + modpath_current=modules/ldap modpath_static= modpath_shared= for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do eval MOD_$var= done - test -d http2 || $srcdir/build/mkdir.sh $modpath_current + test -d ldap || $srcdir/build/mkdir.sh $modpath_current > $modpath_current/modules.mk -http2_objs="mod_http2.lo h2_alt_svc.lo h2_bucket_eoc.lo h2_bucket_eos.lo h2_config.lo h2_conn.lo h2_conn_io.lo h2_ctx.lo h2_from_h1.lo h2_h2.lo h2_io.lo h2_io_set.lo h2_mplx.lo h2_push.lo h2_request.lo h2_response.lo h2_session.lo h2_stream.lo h2_stream_set.lo h2_switch.lo h2_task.lo h2_task_input.lo h2_task_output.lo h2_task_queue.lo h2_util.lo h2_worker.lo h2_workers.lo " - - - - +ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_http2" >&5 -$as_echo_n "checking whether to enable mod_http2... " >&6; } - # Check whether --enable-http2 was given. -if test "${enable_http2+set}" = set; then : - enableval=$enable_http2; force_http2=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ldap" >&5 +$as_echo_n "checking whether to enable mod_ldap... " >&6; } + # Check whether --enable-ldap was given. +if test "${enable_ldap+set}" = set; then : + enableval=$enable_ldap; force_ldap=$enableval else - enable_http2=most + enable_ldap=most fi _apmod_extra_msg="" - case "$enable_http2" in + case "$enable_ldap" in yes|static|shared) _apmod_required="yes" ;; @@ -18192,682 +18189,617 @@ fi ;; esac esac - if test "$enable_http2" = "static"; then - enable_http2=static - elif test "$enable_http2" = "yes"; then - enable_http2=$module_default - elif test "$enable_http2" = "most"; then + if test "$enable_ldap" = "static"; then + enable_ldap=static + elif test "$enable_ldap" = "yes"; then + enable_ldap=$module_default + elif test "$enable_ldap" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_http2=$module_default + enable_ldap=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_http2=no + enable_ldap=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_http2" = "maybe-all"; then + elif test "$enable_ldap" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_http2=$module_default + enable_ldap=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_http2=no + enable_ldap=no fi - elif test "$enable_http2" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_http2" != "no" ; then - enable_http2=$module_default + elif test "$enable_ldap" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_ldap" != "no" ; then + enable_ldap=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_http2" != "no"; then + if test "$enable_ldap" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 $as_echo "checking dependencies" >&6; } : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nghttp2" >&5 -$as_echo_n "checking for nghttp2... " >&6; } -if ${ac_cv_nghttp2+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap support in apr/apr-util" >&5 +$as_echo_n "checking for ldap support in apr/apr-util... " >&6; } +if ${ac_cv_APR_HAS_LDAP+:} false; then : $as_echo_n "(cached) " >&6 else - ac_cv_nghttp2=no - ap_nghttp2_found="" - ap_nghttp2_base="" - ap_nghttp2_libs="" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided nghttp2 base directory" >&5 -$as_echo_n "checking for user-provided nghttp2 base directory... " >&6; } + apache_old_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCLUDES" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Check whether --with-nghttp2 was given. -if test "${with_nghttp2+set}" = set; then : - withval=$with_nghttp2; - if test "x$withval" != "xyes" -a "x$withval" != "x"; then - ap_nghttp2_base="`cd $withval ; pwd`" - fi +#include +#if APR_HAS_LDAP +YES_IS_DEFINED +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then : + ac_cv_APR_HAS_LDAP=yes +else + ac_cv_APR_HAS_LDAP=no fi +rm -f conftest* - if test "x$ap_nghttp2_base" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_nghttp2_base" >&5 -$as_echo "$ap_nghttp2_base" >&6; } - fi - - saved_CPPFLAGS="$CPPFLAGS" - saved_LIBS="$LIBS" - saved_LDFLAGS="$LDFLAGS" - - if test -n "$PKGCONFIG"; then - saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config along $PKG_CONFIG_PATH" >&5 -$as_echo_n "checking for pkg-config along $PKG_CONFIG_PATH... " >&6; } - if test "x$ap_nghttp2_base" != "x" -a \ - -f "${ap_nghttp2_base}/lib/pkgconfig/libnghttp2.pc"; then - PKG_CONFIG_PATH="${ap_nghttp2_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" - export PKG_CONFIG_PATH - fi - # Check whether --enable-nghttp2-staticlib-deps was given. -if test "${enable_nghttp2_staticlib_deps+set}" = set; then : - enableval=$enable_nghttp2_staticlib_deps; - if test "$enableval" = "yes"; then - PKGCONFIG_LIBOPTS="--static" - fi + CPPFLAGS="$apache_old_cppflags" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_APR_HAS_LDAP" >&5 +$as_echo "$ac_cv_APR_HAS_LDAP" >&6; } - ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`" - if test $? -eq 0; then - ap_nghttp2_found="yes" - pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`" + if test "$ac_cv_APR_HAS_LDAP" = "yes" ; then + if test -z "$apu_config" ; then + LDAP_LIBS="`$apr_config --ldap-libs`" + else + LDAP_LIBS="`$apu_config --ldap-libs`" + fi - if test "x$CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"$pkglookup\"" - CPPFLAGS="$pkglookup" + if test "x$MOD_LDAP_LDADD" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDAP_LDADD to \"$LDAP_LIBS\"" + MOD_LDAP_LDADD="$LDAP_LIBS" else - apr_addto_bugger="$pkglookup" + apr_addto_bugger="$LDAP_LIBS" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $CPPFLAGS; do + for j in $MOD_LDAP_LDADD; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" - CPPFLAGS="$CPPFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDAP_LDADD" + MOD_LDAP_LDADD="$MOD_LDAP_LDADD $i" fi done fi - if test "x$MOD_CFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"$pkglookup\"" - MOD_CFLAGS="$pkglookup" else - apr_addto_bugger="$pkglookup" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_CFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" - MOD_CFLAGS="$MOD_CFLAGS $i" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: apr/apr-util is compiled without ldap support" >&5 +$as_echo "$as_me: WARNING: apr/apr-util is compiled without ldap support" >&2;} + enable_ldap=no + fi + + : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ldap" >&5 +$as_echo_n "checking whether to enable mod_ldap... " >&6; } + if test "$enable_ldap" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ldap$_apmod_extra_msg" >&5 +$as_echo "$enable_ldap$_apmod_extra_msg" >&6; } + if test "$enable_ldap" != "no"; then + case "$enable_ldap" in + static*) + MODLIST="$MODLIST ldap" + if test "ldap" = "so"; then + sharedobjs=yes fi - done + shared="";; + *) + enable_ldap=`echo $enable_ldap|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES ldap" + if test "most " = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ldap" + fi + ;; + esac + + + if test -z "$ldap_objects"; then + objects="mod_ldap.lo" + else + objects="$ldap_objects" fi + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_ldap.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done + if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then + MODULE_DIRS="$MODULE_DIRS $current_dir" else - apr_addto_bugger="$pkglookup" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_LDFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" - MOD_LDFLAGS="$MOD_LDFLAGS $i" - fi - done + MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" fi - fi - PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" - fi + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" - if test "x$ap_nghttp2_base" != "x" -a "x$ap_nghttp2_found" = "x"; then - if test "x$CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$ap_nghttp2_base/include\"" - CPPFLAGS="-I$ap_nghttp2_base/include" - else - apr_addto_bugger="-I$ap_nghttp2_base/include" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $CPPFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" - CPPFLAGS="$CPPFLAGS $i" - fi - done + + + + + current_dir=loggers + modpath_current=modules/loggers + modpath_static= + modpath_shared= + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + eval MOD_$var= + done + test -d loggers || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_config" >&5 +$as_echo_n "checking whether to enable mod_log_config... " >&6; } + # Check whether --enable-log-config was given. +if test "${enable_log_config+set}" = set; then : + enableval=$enable_log_config; force_log_config=$enableval +else + enable_log_config=yes +fi + + _apmod_extra_msg="" + case "$enable_log_config" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_log_config" = "static"; then + enable_log_config=static + elif test "$enable_log_config" = "yes"; then + enable_log_config=$module_default + elif test "$enable_log_config" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_log_config=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_log_config=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_log_config" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_log_config=$module_default + _apmod_extra_msg=" ($module_selection)" + else + enable_log_config=no + fi + elif test "$enable_log_config" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_log_config" != "no" ; then + enable_log_config=$module_default + _apmod_extra_msg=" ($module_selection)" fi + if test "$enable_log_config" != "no"; then + : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_config$_apmod_extra_msg" >&5 +$as_echo "$enable_log_config$_apmod_extra_msg" >&6; } + if test "$enable_log_config" != "no"; then + case "$enable_log_config" in + static*) + MODLIST="$MODLIST log_config" + if test "log_config" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_log_config=`echo $enable_log_config|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES log_config" + if test "yes" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_config" + fi + ;; + esac - if test "x$MOD_CFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"-I$ap_nghttp2_base/include\"" - MOD_CFLAGS="-I$ap_nghttp2_base/include" + if test -z ""; then + objects="mod_log_config.lo" else - apr_addto_bugger="-I$ap_nghttp2_base/include" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_CFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" - MOD_CFLAGS="$MOD_CFLAGS $i" - fi - done + objects="" fi + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_log_config.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<= 1.2.1" >&5 -$as_echo_n "checking for nghttp2 version >= 1.2.1... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -#if !defined(NGHTTP2_VERSION_NUM) -#error "Missing nghttp2 version" -#endif -#if NGHTTP2_VERSION_NUM < 0x010201 -#error "Unsupported nghttp2 version " NGHTTP2_VERSION_TEXT -#endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } - ac_cv_nghttp2=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_debug" >&5 +$as_echo_n "checking whether to enable mod_log_debug... " >&6; } + # Check whether --enable-log-debug was given. +if test "${enable_log_debug+set}" = set; then : + enableval=$enable_log_debug; force_log_debug=$enableval else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5 -$as_echo "FAILED" >&6; } + enable_log_debug=most fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "x$ac_cv_nghttp2" = "xyes"; then - ap_nghttp2_libs="${ap_nghttp2_libs:--lnghttp2} `$apr_config --libs`" + _apmod_extra_msg="" + case "$enable_log_debug" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_log_debug" = "static"; then + enable_log_debug=static + elif test "$enable_log_debug" = "yes"; then + enable_log_debug=$module_default + elif test "$enable_log_debug" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_log_debug=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_log_debug=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_log_debug" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_log_debug=$module_default + _apmod_extra_msg=" ($module_selection)" + else + enable_log_debug=no + fi + elif test "$enable_log_debug" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_log_debug" != "no" ; then + enable_log_debug=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_log_debug" != "no"; then + : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_debug$_apmod_extra_msg" >&5 +$as_echo "$enable_log_debug$_apmod_extra_msg" >&6; } + if test "$enable_log_debug" != "no"; then + case "$enable_log_debug" in + static*) + MODLIST="$MODLIST log_debug" + if test "log_debug" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_log_debug=`echo $enable_log_debug|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES log_debug" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_debug" + fi + ;; + esac - if test "x$MOD_LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_nghttp2_libs\"" - MOD_LDFLAGS="$ap_nghttp2_libs" + + if test -z ""; then + objects="mod_log_debug.lo" else - apr_addto_bugger="$ap_nghttp2_libs" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_LDFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" - MOD_LDFLAGS="$MOD_LDFLAGS $i" - fi - done + objects="" fi + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_log_debug.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<>confdefs.h <<_ACEOF -#define HAVE_NGHTTP2_NGHTTP2_H 1 -_ACEOF - -fi - -done - - for ac_func in nghttp2_session_server_new2 -do : - ac_fn_c_check_func "$LINENO" "nghttp2_session_server_new2" "ac_cv_func_nghttp2_session_server_new2" -if test "x$ac_cv_func_nghttp2_session_server_new2" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NGHTTP2_SESSION_SERVER_NEW2 1 -_ACEOF - + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_forensic" >&5 +$as_echo_n "checking whether to enable mod_log_forensic... " >&6; } + # Check whether --enable-log-forensic was given. +if test "${enable_log_forensic+set}" = set; then : + enableval=$enable_log_forensic; force_log_forensic=$enableval else - liberrors="yes" -fi -done - - if test "x$liberrors" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 library is unusable" >&5 -$as_echo "$as_me: WARNING: nghttp2 library is unusable" >&2;} - fi - for ac_func in nghttp2_stream_get_weight -do : - ac_fn_c_check_func "$LINENO" "nghttp2_stream_get_weight" "ac_cv_func_nghttp2_stream_get_weight" -if test "x$ac_cv_func_nghttp2_stream_get_weight" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NGHTTP2_STREAM_GET_WEIGHT 1 -_ACEOF - - if test "x$MOD_CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_CPPFLAGS to \""-DH2_NG2_STREAM_API"\"" - MOD_CPPFLAGS=""-DH2_NG2_STREAM_API"" - else - apr_addto_bugger=""-DH2_NG2_STREAM_API"" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_CPPFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CPPFLAGS" - MOD_CPPFLAGS="$MOD_CPPFLAGS $i" - fi - done - fi - -fi -done - - for ac_func in nghttp2_session_change_stream_priority -do : - ac_fn_c_check_func "$LINENO" "nghttp2_session_change_stream_priority" "ac_cv_func_nghttp2_session_change_stream_priority" -if test "x$ac_cv_func_nghttp2_session_change_stream_priority" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NGHTTP2_SESSION_CHANGE_STREAM_PRIORITY 1 -_ACEOF - - if test "x$MOD_CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_CPPFLAGS to \""-DH2_NG2_CHANGE_PRIO"\"" - MOD_CPPFLAGS=""-DH2_NG2_CHANGE_PRIO"" - else - apr_addto_bugger=""-DH2_NG2_CHANGE_PRIO"" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_CPPFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CPPFLAGS" - MOD_CPPFLAGS="$MOD_CPPFLAGS $i" - fi - done - fi - + enable_log_forensic=maybe-all fi -done - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 version is too old" >&5 -$as_echo "$as_me: WARNING: nghttp2 version is too old" >&2;} + _apmod_extra_msg="" + case "$enable_log_forensic" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_log_forensic" = "static"; then + enable_log_forensic=static + elif test "$enable_log_forensic" = "yes"; then + enable_log_forensic=$module_default + elif test "$enable_log_forensic" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_log_forensic=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_log_forensic=no fi - - CPPFLAGS="$saved_CPPFLAGS" - LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_nghttp2" >&5 -$as_echo "$ac_cv_nghttp2" >&6; } - if test "x$ac_cv_nghttp2" = "xyes"; then - -$as_echo "#define HAVE_NGHTTP2 1" >>confdefs.h - - fi - - if test "$ac_cv_nghttp2" = "yes" ; then - if test "x$enable_http2" = "xshared"; then - # The only symbol which needs to be exported is the module - # structure, so ask libtool to hide everything else: - - if test "x$MOD_HTTP2_LDADD" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_HTTP2_LDADD to \"-export-symbols-regex http2_module\"" - MOD_HTTP2_LDADD="-export-symbols-regex http2_module" - else - apr_addto_bugger="-export-symbols-regex http2_module" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_HTTP2_LDADD; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_HTTP2_LDADD" - MOD_HTTP2_LDADD="$MOD_HTTP2_LDADD $i" - fi - done - fi - - fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_log_forensic" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_log_forensic=$module_default + _apmod_extra_msg=" ($module_selection)" else - enable_http2=no + enable_log_forensic=no fi - + elif test "$enable_log_forensic" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_log_forensic" != "no" ; then + enable_log_forensic=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_log_forensic" != "no"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_http2" >&5 -$as_echo_n "checking whether to enable mod_http2... " >&6; } - if test "$enable_http2" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_http2 has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_http2$_apmod_extra_msg" >&5 -$as_echo "$enable_http2$_apmod_extra_msg" >&6; } - if test "$enable_http2" != "no"; then - case "$enable_http2" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_forensic$_apmod_extra_msg" >&5 +$as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; } + if test "$enable_log_forensic" != "no"; then + case "$enable_log_forensic" in static*) - MODLIST="$MODLIST http2" - if test "http2" = "so"; then + MODLIST="$MODLIST log_forensic" + if test "log_forensic" = "so"; then sharedobjs=yes fi shared="";; *) - enable_http2=`echo $enable_http2|sed 's/shared,*//'` + enable_log_forensic=`echo $enable_log_forensic|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES http2" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},http2" + DSO_MODULES="$DSO_MODULES log_forensic" + if test "" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_forensic" fi ;; esac - if test -z "$http2_objs"; then - objects="mod_http2.lo" + if test -z ""; then + objects="mod_log_forensic.lo" else - objects="$http2_objs" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_http2.la" + libname="libmod_log_forensic.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - if eval val=\"\$MOD_$var\"; test -n "$val"; then - echo "MOD_$var = $val" >> $modpath_current/modules.mk - fi - done - if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then - MODULE_DIRS="$MODULE_DIRS $current_dir" + if test "x$INCLUDES" = "x"; then + test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_builddir)/server\"" + INCLUDES="-I\$(top_builddir)/server" else - MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + apr_addto_bugger="-I\$(top_builddir)/server" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $INCLUDES; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES" + INCLUDES="$INCLUDES $i" + fi + done fi - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" - - - - - - - - current_dir=ldap - modpath_current=modules/ldap - modpath_static= - modpath_shared= - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - eval MOD_$var= - done - test -d ldap || $srcdir/build/mkdir.sh $modpath_current - > $modpath_current/modules.mk - +fi -ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ldap" >&5 -$as_echo_n "checking whether to enable mod_ldap... " >&6; } - # Check whether --enable-ldap was given. -if test "${enable_ldap+set}" = set; then : - enableval=$enable_ldap; force_ldap=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_logio" >&5 +$as_echo_n "checking whether to enable mod_logio... " >&6; } + # Check whether --enable-logio was given. +if test "${enable_logio+set}" = set; then : + enableval=$enable_logio; force_logio=$enableval else - enable_ldap=most + enable_logio=most fi _apmod_extra_msg="" - case "$enable_ldap" in + case "$enable_logio" in yes|static|shared) _apmod_required="yes" ;; @@ -18964,159 +18886,80 @@ fi ;; esac esac - if test "$enable_ldap" = "static"; then - enable_ldap=static - elif test "$enable_ldap" = "yes"; then - enable_ldap=$module_default - elif test "$enable_ldap" = "most"; then + if test "$enable_logio" = "static"; then + enable_logio=static + elif test "$enable_logio" = "yes"; then + enable_logio=$module_default + elif test "$enable_logio" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_ldap=$module_default + enable_logio=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_ldap=no + enable_logio=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_ldap" = "maybe-all"; then + elif test "$enable_logio" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_ldap=$module_default + enable_logio=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_ldap=no + enable_logio=no fi - elif test "$enable_ldap" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_ldap" != "no" ; then - enable_ldap=$module_default + elif test "$enable_logio" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_logio" != "no" ; then + enable_logio=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_ldap" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - : - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap support in apr/apr-util" >&5 -$as_echo_n "checking for ldap support in apr/apr-util... " >&6; } -if ${ac_cv_APR_HAS_LDAP+:} false; then : - $as_echo_n "(cached) " >&6 -else - - apache_old_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCLUDES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#if APR_HAS_LDAP -YES_IS_DEFINED -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then : - ac_cv_APR_HAS_LDAP=yes -else - ac_cv_APR_HAS_LDAP=no -fi -rm -f conftest* - - CPPFLAGS="$apache_old_cppflags" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_APR_HAS_LDAP" >&5 -$as_echo "$ac_cv_APR_HAS_LDAP" >&6; } - - if test "$ac_cv_APR_HAS_LDAP" = "yes" ; then - if test -z "$apu_config" ; then - LDAP_LIBS="`$apr_config --ldap-libs`" - else - LDAP_LIBS="`$apu_config --ldap-libs`" - fi - - if test "x$MOD_LDAP_LDADD" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_LDAP_LDADD to \"$LDAP_LIBS\"" - MOD_LDAP_LDADD="$LDAP_LIBS" - else - apr_addto_bugger="$LDAP_LIBS" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_LDAP_LDADD; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDAP_LDADD" - MOD_LDAP_LDADD="$MOD_LDAP_LDADD $i" - fi - done - fi - - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: apr/apr-util is compiled without ldap support" >&5 -$as_echo "$as_me: WARNING: apr/apr-util is compiled without ldap support" >&2;} - enable_ldap=no - fi - + if test "$enable_logio" != "no"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ldap" >&5 -$as_echo_n "checking whether to enable mod_ldap... " >&6; } - if test "$enable_ldap" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_ldap has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ldap$_apmod_extra_msg" >&5 -$as_echo "$enable_ldap$_apmod_extra_msg" >&6; } - if test "$enable_ldap" != "no"; then - case "$enable_ldap" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_logio$_apmod_extra_msg" >&5 +$as_echo "$enable_logio$_apmod_extra_msg" >&6; } + if test "$enable_logio" != "no"; then + case "$enable_logio" in static*) - MODLIST="$MODLIST ldap" - if test "ldap" = "so"; then + MODLIST="$MODLIST logio" + if test "logio" = "so"; then sharedobjs=yes fi shared="";; *) - enable_ldap=`echo $enable_ldap|sed 's/shared,*//'` + enable_logio=`echo $enable_logio|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES ldap" - if test "most " = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ldap" + DSO_MODULES="$DSO_MODULES logio" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},logio" fi ;; esac - if test -z "$ldap_objects"; then - objects="mod_ldap.lo" + if test -z ""; then + objects="mod_logio.lo" else - objects="$ldap_objects" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_ldap.la" + libname="libmod_logio.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk< $modpath_current/modules.mk - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_log_config" >&5 -$as_echo_n "checking whether to enable mod_log_config... " >&6; } - # Check whether --enable-log-config was given. -if test "${enable_log_config+set}" = set; then : - enableval=$enable_log_config; force_log_config=$enableval + +lua_objects="lua_apr.lo lua_config.lo mod_lua.lo lua_request.lo lua_vmprep.lo lua_dbd.lo lua_passwd.lo" + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lua" >&5 +$as_echo_n "checking whether to enable mod_lua... " >&6; } + # Check whether --enable-lua was given. +if test "${enable_lua+set}" = set; then : + enableval=$enable_lua; force_lua=$enableval else - enable_log_config=yes + enable_lua=maybe-all fi _apmod_extra_msg="" - case "$enable_log_config" in + case "$enable_lua" in yes|static|shared) _apmod_required="yes" ;; @@ -19233,59 +19079,1029 @@ fi ;; esac esac - if test "$enable_log_config" = "static"; then - enable_log_config=static - elif test "$enable_log_config" = "yes"; then - enable_log_config=$module_default - elif test "$enable_log_config" = "most"; then + if test "$enable_lua" = "static"; then + enable_lua=static + elif test "$enable_lua" = "yes"; then + enable_lua=$module_default + elif test "$enable_lua" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_log_config=$module_default + enable_lua=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_log_config=no + enable_lua=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_log_config" = "maybe-all"; then + elif test "$enable_lua" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_log_config=$module_default + enable_lua=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_log_config=no + enable_lua=no fi - elif test "$enable_log_config" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_log_config" != "no" ; then - enable_log_config=$module_default + elif test "$enable_lua" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_lua" != "no" ; then + enable_lua=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_log_config" != "no"; then + if test "$enable_lua" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_config$_apmod_extra_msg" >&5 -$as_echo "$enable_log_config$_apmod_extra_msg" >&6; } - if test "$enable_log_config" != "no"; then - case "$enable_log_config" in - static*) - MODLIST="$MODLIST log_config" - if test "log_config" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_log_config=`echo $enable_log_config|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES log_config" + + + +# Check whether --with-lua was given. +if test "${with_lua+set}" = set; then : + withval=$with_lua; lua_path="$withval" +else + : +fi + + +if test -z "$lua_path"; then + test_paths=". /usr/local /usr" +else + test_paths="${lua_path}" +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 +$as_echo_n "checking for pow in -lm... " >&6; } +if ${ac_cv_lib_m_pow+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pow (); +int +main () +{ +return pow (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_pow=yes +else + ac_cv_lib_m_pow=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 +$as_echo "$ac_cv_lib_m_pow" >&6; } +if test "x$ac_cv_lib_m_pow" = xyes; then : + lib_m="-lm" +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +$as_echo_n "checking for sqrt in -lm... " >&6; } +if ${ac_cv_lib_m_sqrt+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqrt (); +int +main () +{ +return sqrt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_sqrt=yes +else + ac_cv_lib_m_sqrt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 +$as_echo "$ac_cv_lib_m_sqrt" >&6; } +if test "x$ac_cv_lib_m_sqrt" = xyes; then : + lib_m="-lm" +fi + +for x in $test_paths ; do + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua-5.2" >&5 +$as_echo_n "checking for lua.h in ${x}/include/lua-5.2... " >&6; } + if test -f ${x}/include/lua-5.2/lua.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS" + LDFLAGS="-L$x/lib/lua-5.2 $LDFLAGS $lib_m" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.2" >&5 +$as_echo_n "checking for luaL_newstate in -llua-5.2... " >&6; } +if ${ac_cv_lib_lua_5_2_luaL_newstate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llua-5.2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (); +int +main () +{ +return luaL_newstate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lua_5_2_luaL_newstate=yes +else + ac_cv_lib_lua_5_2_luaL_newstate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_5_2_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua_5_2_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua_5_2_luaL_newstate" = xyes; then : + + LUA_LIBS="-L$x/lib/lua-5.2 -llua-5.2 $lib_m" + if test "x$ap_platform_runtime_link_flag" != "x"; then + + if test "x$LUA_LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua-5.2\"" + LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua-5.2" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua-5.2" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LUA_LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" + LUA_LIBS="$LUA_LIBS $i" + fi + done + fi + + fi + LUA_CFLAGS="-I$x/include/lua-5.2" + +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua5.2" >&5 +$as_echo_n "checking for lua.h in ${x}/include/lua5.2... " >&6; } + if test -f ${x}/include/lua5.2/lua.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS" + LDFLAGS="-L$x/lib $LDFLAGS $lib_m" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2" >&5 +$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; } +if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llua5.2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (); +int +main () +{ +return luaL_newstate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lua5_2_luaL_newstate=yes +else + ac_cv_lib_lua5_2_luaL_newstate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_2_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua5_2_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua5_2_luaL_newstate" = xyes; then : + + LUA_LIBS="-L$x/lib -llua5.2 $lib_m" + if test "x$ap_platform_runtime_link_flag" != "x"; then + + if test "x$LUA_LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\"" + LUA_LIBS="$ap_platform_runtime_link_flag$x/lib" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LUA_LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" + LUA_LIBS="$LUA_LIBS $i" + fi + done + fi + + fi + LUA_CFLAGS="-I$x/include/lua5.2" + +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua52" >&5 +$as_echo_n "checking for lua.h in ${x}/include/lua52... " >&6; } + if test -f ${x}/include/lua52/lua.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS" + LDFLAGS="-L$x/lib/lua52 $LDFLAGS $lib_m" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5 +$as_echo_n "checking for luaL_newstate in -llua... " >&6; } +if ${ac_cv_lib_lua_luaL_newstate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llua $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (); +int +main () +{ +return luaL_newstate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lua_luaL_newstate=yes +else + ac_cv_lib_lua_luaL_newstate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then : + + LUA_LIBS="-L$x/lib/lua52 -llua $lib_m" + if test "x$ap_platform_runtime_link_flag" != "x"; then + + if test "x$LUA_LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua52\"" + LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua52" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua52" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LUA_LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" + LUA_LIBS="$LUA_LIBS $i" + fi + done + fi + + fi + LUA_CFLAGS="-I$x/include/lua52" + +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include" >&5 +$as_echo_n "checking for lua.h in ${x}/include... " >&6; } + if test -f ${x}/include/lua.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS" + LDFLAGS="-L$x/lib $LDFLAGS $lib_m" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5 +$as_echo_n "checking for luaL_newstate in -llua... " >&6; } +if ${ac_cv_lib_lua_luaL_newstate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llua $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (); +int +main () +{ +return luaL_newstate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lua_luaL_newstate=yes +else + ac_cv_lib_lua_luaL_newstate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then : + + LUA_LIBS="-L$x/lib -llua $lib_m" + if test "x$ap_platform_runtime_link_flag" != "x"; then + + if test "x$LUA_LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\"" + LUA_LIBS="$ap_platform_runtime_link_flag$x/lib" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LUA_LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" + LUA_LIBS="$LUA_LIBS $i" + fi + done + fi + + fi + LUA_CFLAGS="-I$x/include" + +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua-5.1" >&5 +$as_echo_n "checking for lua.h in ${x}/include/lua-5.1... " >&6; } + if test -f ${x}/include/lua-5.1/lua.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS" + LDFLAGS="-L$x/lib/lua-5.1 $LDFLAGS $lib_m" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.1" >&5 +$as_echo_n "checking for luaL_newstate in -llua-5.1... " >&6; } +if ${ac_cv_lib_lua_5_1_luaL_newstate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llua-5.1 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (); +int +main () +{ +return luaL_newstate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lua_5_1_luaL_newstate=yes +else + ac_cv_lib_lua_5_1_luaL_newstate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_5_1_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua_5_1_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua_5_1_luaL_newstate" = xyes; then : + + LUA_LIBS="-L$x/lib/lua-5.1 -llua-5.1 $lib_m" + if test "x$ap_platform_runtime_link_flag" != "x"; then + + if test "x$LUA_LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua-5.1\"" + LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua-5.1" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua-5.1" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LUA_LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" + LUA_LIBS="$LUA_LIBS $i" + fi + done + fi + + fi + LUA_CFLAGS="-I$x/include/lua-5.1" + +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua5.1" >&5 +$as_echo_n "checking for lua.h in ${x}/include/lua5.1... " >&6; } + if test -f ${x}/include/lua5.1/lua.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS" + LDFLAGS="-L$x/lib $LDFLAGS $lib_m" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5 +$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; } +if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llua5.1 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (); +int +main () +{ +return luaL_newstate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lua5_1_luaL_newstate=yes +else + ac_cv_lib_lua5_1_luaL_newstate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then : + + LUA_LIBS="-L$x/lib -llua5.1 $lib_m" + if test "x$ap_platform_runtime_link_flag" != "x"; then + + if test "x$LUA_LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\"" + LUA_LIBS="$ap_platform_runtime_link_flag$x/lib" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LUA_LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" + LUA_LIBS="$LUA_LIBS $i" + fi + done + fi + + fi + LUA_CFLAGS="-I$x/include/lua5.1" + +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua51" >&5 +$as_echo_n "checking for lua.h in ${x}/include/lua51... " >&6; } + if test -f ${x}/include/lua51/lua.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + save_CFLAGS=$CFLAGS + save_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS" + LDFLAGS="-L$x/lib/lua51 $LDFLAGS $lib_m" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5 +$as_echo_n "checking for luaL_newstate in -llua... " >&6; } +if ${ac_cv_lib_lua_luaL_newstate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llua $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char luaL_newstate (); +int +main () +{ +return luaL_newstate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lua_luaL_newstate=yes +else + ac_cv_lib_lua_luaL_newstate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 +$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; } +if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then : + + LUA_LIBS="-L$x/lib/lua51 -llua $lib_m" + if test "x$ap_platform_runtime_link_flag" != "x"; then + + if test "x$LUA_LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua51\"" + LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua51" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua51" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LUA_LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" + LUA_LIBS="$LUA_LIBS $i" + fi + done + fi + + fi + LUA_CFLAGS="-I$x/include/lua51" + +fi + + CFLAGS=$save_CFLAGS + LDFLAGS=$save_LDFLAGS + break + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +done + + + + +if test -z "${LUA_LIBS}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Lua 5.2 or 5.1 library not found." >&5 +$as_echo "$as_me: WARNING: *** Lua 5.2 or 5.1 library not found." >&2;} + enable_lua="no" + if test -z "${lua_path}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Lua 5.2 or 5.1 library is required" >&5 +$as_echo "$as_me: WARNING: Lua 5.2 or 5.1 library is required" >&2;} + else + as_fn_error $? "Lua 5.2 or 5.1 library is required" "$LINENO" 5 + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: using '${LUA_LIBS}' for Lua Library" >&5 +$as_echo "$as_me: using '${LUA_LIBS}' for Lua Library" >&6;} + # Check whether --enable-luajit was given. +if test "${enable_luajit+set}" = set; then : + enableval=$enable_luajit; + if test "$enableval" = "yes"; then + + if test "x$MOD_CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_CPPFLAGS to \""-DAP_ENABLE_LUAJIT"\"" + MOD_CPPFLAGS=""-DAP_ENABLE_LUAJIT"" + else + apr_addto_bugger=""-DAP_ENABLE_LUAJIT"" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_CPPFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CPPFLAGS" + MOD_CPPFLAGS="$MOD_CPPFLAGS $i" + fi + done + fi + + fi + +fi + + +fi + + if test "x$enable_lua" != "xno" ; then + + if test "x$MOD_INCLUDES" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_INCLUDES to \"$LUA_CFLAGS\"" + MOD_INCLUDES="$LUA_CFLAGS" + else + apr_addto_bugger="$LUA_CFLAGS" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_INCLUDES; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_INCLUDES" + MOD_INCLUDES="$MOD_INCLUDES $i" + fi + done + fi + + + if test "x$MOD_LUA_LDADD" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LUA_LDADD to \"$LUA_LIBS\"" + MOD_LUA_LDADD="$LUA_LIBS" + else + apr_addto_bugger="$LUA_LIBS" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LUA_LDADD; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LUA_LDADD" + MOD_LUA_LDADD="$MOD_LUA_LDADD $i" + fi + done + fi + + fi + + : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lua" >&5 +$as_echo_n "checking whether to enable mod_lua... " >&6; } + if test "$enable_lua" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_lua has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lua$_apmod_extra_msg" >&5 +$as_echo "$enable_lua$_apmod_extra_msg" >&6; } + if test "$enable_lua" != "no"; then + case "$enable_lua" in + static*) + MODLIST="$MODLIST lua" + if test "lua" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_lua=`echo $enable_lua|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES lua" + if test "" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lua" + fi + ;; + esac + + + if test -z "$lua_objects"; then + objects="mod_lua.lo" + else + objects="$lua_objects" + fi + + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_lua.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done + if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then + MODULE_DIRS="$MODULE_DIRS $current_dir" + else + MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + fi + + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" + + + + + + + current_dir=metadata + modpath_current=modules/metadata + modpath_static= + modpath_shared= + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + eval MOD_$var= + done + test -d metadata || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_env" >&5 +$as_echo_n "checking whether to enable mod_env... " >&6; } + # Check whether --enable-env was given. +if test "${enable_env+set}" = set; then : + enableval=$enable_env; force_env=$enableval +else + enable_env=yes +fi + + _apmod_extra_msg="" + case "$enable_env" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_env" = "static"; then + enable_env=static + elif test "$enable_env" = "yes"; then + enable_env=$module_default + elif test "$enable_env" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_env=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_env=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_env" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_env=$module_default + _apmod_extra_msg=" ($module_selection)" + else + enable_env=no + fi + elif test "$enable_env" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_env" != "no" ; then + enable_env=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_env" != "no"; then + : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_env$_apmod_extra_msg" >&5 +$as_echo "$enable_env$_apmod_extra_msg" >&6; } + if test "$enable_env" != "no"; then + case "$enable_env" in + static*) + MODLIST="$MODLIST env" + if test "env" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_env=`echo $enable_env|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES env" if test "yes" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_config" + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},env" fi ;; esac if test -z ""; then - objects="mod_log_config.lo" + objects="mod_env.lo" else objects="" fi @@ -19293,20 +20109,20 @@ $as_echo "$enable_log_config$_apmod_extra_msg" >&6; } if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_log_config.la" + libname="libmod_env.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_log_debug... " >&6; } - # Check whether --enable-log-debug was given. -if test "${enable_log_debug+set}" = set; then : - enableval=$enable_log_debug; force_log_debug=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_mime_magic" >&5 +$as_echo_n "checking whether to enable mod_mime_magic... " >&6; } + # Check whether --enable-mime-magic was given. +if test "${enable_mime_magic+set}" = set; then : + enableval=$enable_mime_magic; force_mime_magic=$enableval else - enable_log_debug=most + enable_mime_magic=maybe-all fi _apmod_extra_msg="" - case "$enable_log_debug" in + case "$enable_mime_magic" in yes|static|shared) _apmod_required="yes" ;; @@ -19367,59 +20183,193 @@ fi ;; esac esac - if test "$enable_log_debug" = "static"; then - enable_log_debug=static - elif test "$enable_log_debug" = "yes"; then - enable_log_debug=$module_default - elif test "$enable_log_debug" = "most"; then + if test "$enable_mime_magic" = "static"; then + enable_mime_magic=static + elif test "$enable_mime_magic" = "yes"; then + enable_mime_magic=$module_default + elif test "$enable_mime_magic" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_log_debug=$module_default + enable_mime_magic=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_log_debug=no + enable_mime_magic=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_log_debug" = "maybe-all"; then + elif test "$enable_mime_magic" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_log_debug=$module_default + enable_mime_magic=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_log_debug=no + enable_mime_magic=no fi - elif test "$enable_log_debug" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_log_debug" != "no" ; then - enable_log_debug=$module_default + elif test "$enable_mime_magic" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_mime_magic" != "no" ; then + enable_mime_magic=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_log_debug" != "no"; then + if test "$enable_mime_magic" != "no"; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_debug$_apmod_extra_msg" >&5 -$as_echo "$enable_log_debug$_apmod_extra_msg" >&6; } - if test "$enable_log_debug" != "no"; then - case "$enable_log_debug" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mime_magic$_apmod_extra_msg" >&5 +$as_echo "$enable_mime_magic$_apmod_extra_msg" >&6; } + if test "$enable_mime_magic" != "no"; then + case "$enable_mime_magic" in static*) - MODLIST="$MODLIST log_debug" - if test "log_debug" = "so"; then + MODLIST="$MODLIST mime_magic" + if test "mime_magic" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_mime_magic=`echo $enable_mime_magic|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES mime_magic" + if test "" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mime_magic" + fi + ;; + esac + + + if test -z ""; then + objects="mod_mime_magic.lo" + else + objects="" + fi + + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_mime_magic.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 +$as_echo_n "checking whether to enable mod_cern_meta... " >&6; } + # Check whether --enable-cern-meta was given. +if test "${enable_cern_meta+set}" = set; then : + enableval=$enable_cern_meta; force_cern_meta=$enableval +else + enable_cern_meta=no +fi + + _apmod_extra_msg="" + case "$enable_cern_meta" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_cern_meta" = "static"; then + enable_cern_meta=static + elif test "$enable_cern_meta" = "yes"; then + enable_cern_meta=$module_default + elif test "$enable_cern_meta" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_cern_meta=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_cern_meta=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_cern_meta" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_cern_meta=$module_default + _apmod_extra_msg=" ($module_selection)" + else + enable_cern_meta=no + fi + elif test "$enable_cern_meta" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_cern_meta" != "no" ; then + enable_cern_meta=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_cern_meta" != "no"; then + : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cern_meta$_apmod_extra_msg" >&5 +$as_echo "$enable_cern_meta$_apmod_extra_msg" >&6; } + if test "$enable_cern_meta" != "no"; then + case "$enable_cern_meta" in + static*) + MODLIST="$MODLIST cern_meta" + if test "cern_meta" = "so"; then sharedobjs=yes fi shared="";; *) - enable_log_debug=`echo $enable_log_debug|sed 's/shared,*//'` + enable_cern_meta=`echo $enable_cern_meta|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES log_debug" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_debug" + DSO_MODULES="$DSO_MODULES cern_meta" + if test "no" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cern_meta" fi ;; esac if test -z ""; then - objects="mod_log_debug.lo" + objects="mod_cern_meta.lo" else objects="" fi @@ -19427,20 +20377,20 @@ $as_echo "$enable_log_debug$_apmod_extra_msg" >&6; } if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_log_debug.la" + libname="libmod_cern_meta.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_log_forensic... " >&6; } - # Check whether --enable-log-forensic was given. -if test "${enable_log_forensic+set}" = set; then : - enableval=$enable_log_forensic; force_log_forensic=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_expires" >&5 +$as_echo_n "checking whether to enable mod_expires... " >&6; } + # Check whether --enable-expires was given. +if test "${enable_expires+set}" = set; then : + enableval=$enable_expires; force_expires=$enableval else - enable_log_forensic=maybe-all + enable_expires=most fi _apmod_extra_msg="" - case "$enable_log_forensic" in + case "$enable_expires" in yes|static|shared) _apmod_required="yes" ;; @@ -19501,59 +20451,59 @@ fi ;; esac esac - if test "$enable_log_forensic" = "static"; then - enable_log_forensic=static - elif test "$enable_log_forensic" = "yes"; then - enable_log_forensic=$module_default - elif test "$enable_log_forensic" = "most"; then + if test "$enable_expires" = "static"; then + enable_expires=static + elif test "$enable_expires" = "yes"; then + enable_expires=$module_default + elif test "$enable_expires" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_log_forensic=$module_default + enable_expires=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_log_forensic=no + enable_expires=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_log_forensic" = "maybe-all"; then + elif test "$enable_expires" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_log_forensic=$module_default + enable_expires=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_log_forensic=no + enable_expires=no fi - elif test "$enable_log_forensic" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_log_forensic" != "no" ; then - enable_log_forensic=$module_default + elif test "$enable_expires" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_expires" != "no" ; then + enable_expires=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_log_forensic" != "no"; then + if test "$enable_expires" != "no"; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_log_forensic$_apmod_extra_msg" >&5 -$as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; } - if test "$enable_log_forensic" != "no"; then - case "$enable_log_forensic" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_expires$_apmod_extra_msg" >&5 +$as_echo "$enable_expires$_apmod_extra_msg" >&6; } + if test "$enable_expires" != "no"; then + case "$enable_expires" in static*) - MODLIST="$MODLIST log_forensic" - if test "log_forensic" = "so"; then + MODLIST="$MODLIST expires" + if test "expires" = "so"; then sharedobjs=yes fi shared="";; *) - enable_log_forensic=`echo $enable_log_forensic|sed 's/shared,*//'` + enable_expires=`echo $enable_expires|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES log_forensic" - if test "" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},log_forensic" + DSO_MODULES="$DSO_MODULES expires" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},expires" fi ;; esac if test -z ""; then - objects="mod_log_forensic.lo" + objects="mod_expires.lo" else objects="" fi @@ -19561,20 +20511,20 @@ $as_echo "$enable_log_forensic$_apmod_extra_msg" >&6; } if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_log_forensic.la" + libname="libmod_expires.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_logio... " >&6; } - # Check whether --enable-logio was given. -if test "${enable_logio+set}" = set; then : - enableval=$enable_logio; force_logio=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_headers" >&5 +$as_echo_n "checking whether to enable mod_headers... " >&6; } + # Check whether --enable-headers was given. +if test "${enable_headers+set}" = set; then : + enableval=$enable_headers; force_headers=$enableval else - enable_logio=most + enable_headers=yes fi _apmod_extra_msg="" - case "$enable_logio" in + case "$enable_headers" in yes|static|shared) _apmod_required="yes" ;; @@ -19661,59 +20585,59 @@ fi ;; esac esac - if test "$enable_logio" = "static"; then - enable_logio=static - elif test "$enable_logio" = "yes"; then - enable_logio=$module_default - elif test "$enable_logio" = "most"; then + if test "$enable_headers" = "static"; then + enable_headers=static + elif test "$enable_headers" = "yes"; then + enable_headers=$module_default + elif test "$enable_headers" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_logio=$module_default + enable_headers=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_logio=no + enable_headers=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_logio" = "maybe-all"; then + elif test "$enable_headers" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_logio=$module_default + enable_headers=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_logio=no + enable_headers=no fi - elif test "$enable_logio" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_logio" != "no" ; then - enable_logio=$module_default + elif test "$enable_headers" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_headers" != "no" ; then + enable_headers=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_logio" != "no"; then + if test "$enable_headers" != "no"; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_logio$_apmod_extra_msg" >&5 -$as_echo "$enable_logio$_apmod_extra_msg" >&6; } - if test "$enable_logio" != "no"; then - case "$enable_logio" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_headers$_apmod_extra_msg" >&5 +$as_echo "$enable_headers$_apmod_extra_msg" >&6; } + if test "$enable_headers" != "no"; then + case "$enable_headers" in static*) - MODLIST="$MODLIST logio" - if test "logio" = "so"; then + MODLIST="$MODLIST headers" + if test "headers" = "so"; then sharedobjs=yes fi shared="";; *) - enable_logio=`echo $enable_logio|sed 's/shared,*//'` + enable_headers=`echo $enable_headers|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES logio" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},logio" + DSO_MODULES="$DSO_MODULES headers" + if test "yes" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},headers" fi ;; esac if test -z ""; then - objects="mod_logio.lo" + objects="mod_headers.lo" else objects="" fi @@ -19721,126 +20645,67 @@ $as_echo "$enable_logio$_apmod_extra_msg" >&6; } if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_logio.la" + libname="libmod_headers.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - if eval val=\"\$MOD_$var\"; test -n "$val"; then - echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + else + apache_need_shared=yes + libname="mod_headers.la" + shobjects=`echo $objects | sed 's/\.lo/.slo/g'` + modpath_shared="$modpath_shared $libname" + cat >>$modpath_current/modules.mk< $modpath_current/modules.mk + APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_HEADERS_LDADD" -lua_objects="lua_apr.lo lua_config.lo mod_lua.lo lua_request.lo lua_vmprep.lo lua_dbd.lo lua_passwd.lo" + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lua" >&5 -$as_echo_n "checking whether to enable mod_lua... " >&6; } - # Check whether --enable-lua was given. -if test "${enable_lua+set}" = set; then : - enableval=$enable_lua; force_lua=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ident" >&5 +$as_echo_n "checking whether to enable mod_ident... " >&6; } + # Check whether --enable-ident was given. +if test "${enable_ident+set}" = set; then : + enableval=$enable_ident; force_ident=$enableval else - enable_lua=maybe-all + enable_ident=no fi _apmod_extra_msg="" - case "$enable_lua" in + case "$enable_ident" in yes|static|shared) _apmod_required="yes" ;; @@ -19854,860 +20719,789 @@ fi ;; esac esac - if test "$enable_lua" = "static"; then - enable_lua=static - elif test "$enable_lua" = "yes"; then - enable_lua=$module_default - elif test "$enable_lua" = "most"; then + if test "$enable_ident" = "static"; then + enable_ident=static + elif test "$enable_ident" = "yes"; then + enable_ident=$module_default + elif test "$enable_ident" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_lua=$module_default + enable_ident=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_lua=no + enable_ident=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_lua" = "maybe-all"; then + elif test "$enable_ident" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_lua=$module_default + enable_ident=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_lua=no + enable_ident=no fi - elif test "$enable_lua" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_lua" != "no" ; then - enable_lua=$module_default + elif test "$enable_ident" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_ident" != "no" ; then + enable_ident=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_lua" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } + if test "$enable_ident" != "no"; then : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ident$_apmod_extra_msg" >&5 +$as_echo "$enable_ident$_apmod_extra_msg" >&6; } + if test "$enable_ident" != "no"; then + case "$enable_ident" in + static*) + MODLIST="$MODLIST ident" + if test "ident" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_ident=`echo $enable_ident|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES ident" + if test "no" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ident" + fi + ;; + esac - -# Check whether --with-lua was given. -if test "${with_lua+set}" = set; then : - withval=$with_lua; lua_path="$withval" -else - : -fi - - -if test -z "$lua_path"; then - test_paths=". /usr/local /usr" -else - test_paths="${lua_path}" -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 -$as_echo_n "checking for pow in -lm... " >&6; } -if ${ac_cv_lib_m_pow+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); -int -main () -{ -return pow (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_pow=yes -else - ac_cv_lib_m_pow=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 -$as_echo "$ac_cv_lib_m_pow" >&6; } -if test "x$ac_cv_lib_m_pow" = xyes; then : - lib_m="-lm" -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 -$as_echo_n "checking for sqrt in -lm... " >&6; } -if ${ac_cv_lib_m_sqrt+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sqrt (); -int -main () -{ -return sqrt (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_sqrt=yes -else - ac_cv_lib_m_sqrt=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5 -$as_echo "$ac_cv_lib_m_sqrt" >&6; } -if test "x$ac_cv_lib_m_sqrt" = xyes; then : - lib_m="-lm" -fi - -for x in $test_paths ; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua-5.2" >&5 -$as_echo_n "checking for lua.h in ${x}/include/lua-5.2... " >&6; } - if test -f ${x}/include/lua-5.2/lua.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS" - LDFLAGS="-L$x/lib/lua-5.2 $LDFLAGS $lib_m" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.2" >&5 -$as_echo_n "checking for luaL_newstate in -llua-5.2... " >&6; } -if ${ac_cv_lib_lua_5_2_luaL_newstate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua-5.2 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char luaL_newstate (); -int -main () -{ -return luaL_newstate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua_5_2_luaL_newstate=yes -else - ac_cv_lib_lua_5_2_luaL_newstate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_5_2_luaL_newstate" >&5 -$as_echo "$ac_cv_lib_lua_5_2_luaL_newstate" >&6; } -if test "x$ac_cv_lib_lua_5_2_luaL_newstate" = xyes; then : - - LUA_LIBS="-L$x/lib/lua-5.2 -llua-5.2 $lib_m" - if test "x$ap_platform_runtime_link_flag" != "x"; then - - if test "x$LUA_LIBS" = "x"; then - test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua-5.2\"" - LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua-5.2" + if test -z ""; then + objects="mod_ident.lo" else - apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua-5.2" + objects="" + fi + + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_ident.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo "no" >&6; } + apache_need_shared=yes + libname="mod_ident.la" + shobjects=`echo $objects | sed 's/\.lo/.slo/g'` + modpath_shared="$modpath_shared $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo_n "checking for lua.h in ${x}/include/lua5.2... " >&6; } - if test -f ${x}/include/lua5.2/lua.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS" - LDFLAGS="-L$x/lib $LDFLAGS $lib_m" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.2" >&5 -$as_echo_n "checking for luaL_newstate in -llua5.2... " >&6; } -if ${ac_cv_lib_lua5_2_luaL_newstate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua5.2 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + fi + + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_IDENT_LDADD" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char luaL_newstate (); -int -main () -{ -return luaL_newstate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua5_2_luaL_newstate=yes -else - ac_cv_lib_lua5_2_luaL_newstate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_2_luaL_newstate" >&5 -$as_echo "$ac_cv_lib_lua5_2_luaL_newstate" >&6; } -if test "x$ac_cv_lib_lua5_2_luaL_newstate" = xyes; then : - LUA_LIBS="-L$x/lib -llua5.2 $lib_m" - if test "x$ap_platform_runtime_link_flag" != "x"; then - if test "x$LUA_LIBS" = "x"; then - test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\"" - LUA_LIBS="$ap_platform_runtime_link_flag$x/lib" - else - apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $LUA_LIBS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" - LUA_LIBS="$LUA_LIBS $i" - fi - done fi - fi - LUA_CFLAGS="-I$x/include/lua5.2" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_usertrack" >&5 +$as_echo_n "checking whether to enable mod_usertrack... " >&6; } + # Check whether --enable-usertrack was given. +if test "${enable_usertrack+set}" = set; then : + enableval=$enable_usertrack; force_usertrack=$enableval +else + enable_usertrack=maybe-all fi - CFLAGS=$save_CFLAGS - LDFLAGS=$save_LDFLAGS - break + _apmod_extra_msg="" + case "$enable_usertrack" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_usertrack" = "static"; then + enable_usertrack=static + elif test "$enable_usertrack" = "yes"; then + enable_usertrack=$module_default + elif test "$enable_usertrack" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_usertrack=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_usertrack=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_usertrack" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_usertrack=$module_default + _apmod_extra_msg=" ($module_selection)" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + enable_usertrack=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua52" >&5 -$as_echo_n "checking for lua.h in ${x}/include/lua52... " >&6; } - if test -f ${x}/include/lua52/lua.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS" - LDFLAGS="-L$x/lib/lua52 $LDFLAGS $lib_m" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5 -$as_echo_n "checking for luaL_newstate in -llua... " >&6; } -if ${ac_cv_lib_lua_luaL_newstate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + elif test "$enable_usertrack" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_usertrack" != "no" ; then + enable_usertrack=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_usertrack" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + : -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char luaL_newstate (); -int -main () -{ -return luaL_newstate (); - ; - return 0; -} + for ac_header in sys/times.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_times_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_TIMES_H 1 _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua_luaL_newstate=yes -else - ac_cv_lib_lua_luaL_newstate=no + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +done + + for ac_func in times +do : + ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times" +if test "x$ac_cv_func_times" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TIMES 1 +_ACEOF + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 -$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; } -if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then : +done + + + : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_usertrack" >&5 +$as_echo_n "checking whether to enable mod_usertrack... " >&6; } + if test "$enable_usertrack" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_usertrack has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_usertrack$_apmod_extra_msg" >&5 +$as_echo "$enable_usertrack$_apmod_extra_msg" >&6; } + if test "$enable_usertrack" != "no"; then + case "$enable_usertrack" in + static*) + MODLIST="$MODLIST usertrack" + if test "usertrack" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_usertrack=`echo $enable_usertrack|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES usertrack" + if test "" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},usertrack" + fi + ;; + esac - LUA_LIBS="-L$x/lib/lua52 -llua $lib_m" - if test "x$ap_platform_runtime_link_flag" != "x"; then - if test "x$LUA_LIBS" = "x"; then - test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua52\"" - LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua52" + if test -z ""; then + objects="mod_usertrack.lo" else - apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua52" + objects="" + fi + + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_usertrack.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo "no" >&6; } + apache_need_shared=yes + libname="mod_usertrack.la" + shobjects=`echo $objects | sed 's/\.lo/.slo/g'` + modpath_shared="$modpath_shared $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo_n "checking for lua.h in ${x}/include... " >&6; } - if test -f ${x}/include/lua.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS" - LDFLAGS="-L$x/lib $LDFLAGS $lib_m" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5 -$as_echo_n "checking for luaL_newstate in -llua... " >&6; } -if ${ac_cv_lib_lua_luaL_newstate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char luaL_newstate (); -int -main () -{ -return luaL_newstate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua_luaL_newstate=yes -else - ac_cv_lib_lua_luaL_newstate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 -$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; } -if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then : - LUA_LIBS="-L$x/lib -llua $lib_m" - if test "x$ap_platform_runtime_link_flag" != "x"; then + APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_USERTRACK_LDADD" - if test "x$LUA_LIBS" = "x"; then - test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\"" - LUA_LIBS="$ap_platform_runtime_link_flag$x/lib" - else - apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $LUA_LIBS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" - LUA_LIBS="$LUA_LIBS $i" - fi - done - fi - fi - LUA_CFLAGS="-I$x/include" -fi + fi - CFLAGS=$save_CFLAGS - LDFLAGS=$save_LDFLAGS - break - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua-5.1" >&5 -$as_echo_n "checking for lua.h in ${x}/include/lua-5.1... " >&6; } - if test -f ${x}/include/lua-5.1/lua.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS" - LDFLAGS="-L$x/lib/lua-5.1 $LDFLAGS $lib_m" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-5.1" >&5 -$as_echo_n "checking for luaL_newstate in -llua-5.1... " >&6; } -if ${ac_cv_lib_lua_5_1_luaL_newstate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua-5.1 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char luaL_newstate (); -int -main () -{ -return luaL_newstate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua_5_1_luaL_newstate=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_unique_id" >&5 +$as_echo_n "checking whether to enable mod_unique_id... " >&6; } + # Check whether --enable-unique-id was given. +if test "${enable_unique_id+set}" = set; then : + enableval=$enable_unique_id; force_unique_id=$enableval else - ac_cv_lib_lua_5_1_luaL_newstate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + enable_unique_id=most fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_5_1_luaL_newstate" >&5 -$as_echo "$ac_cv_lib_lua_5_1_luaL_newstate" >&6; } -if test "x$ac_cv_lib_lua_5_1_luaL_newstate" = xyes; then : - LUA_LIBS="-L$x/lib/lua-5.1 -llua-5.1 $lib_m" - if test "x$ap_platform_runtime_link_flag" != "x"; then + _apmod_extra_msg="" + case "$enable_unique_id" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_unique_id" = "static"; then + enable_unique_id=static + elif test "$enable_unique_id" = "yes"; then + enable_unique_id=$module_default + elif test "$enable_unique_id" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_unique_id=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_unique_id=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_unique_id" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_unique_id=$module_default + _apmod_extra_msg=" ($module_selection)" + else + enable_unique_id=no + fi + elif test "$enable_unique_id" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_unique_id" != "no" ; then + enable_unique_id=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_unique_id" != "no"; then + : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_unique_id$_apmod_extra_msg" >&5 +$as_echo "$enable_unique_id$_apmod_extra_msg" >&6; } + if test "$enable_unique_id" != "no"; then + case "$enable_unique_id" in + static*) + MODLIST="$MODLIST unique_id" + if test "unique_id" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_unique_id=`echo $enable_unique_id|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES unique_id" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},unique_id" + fi + ;; + esac + - if test "x$LUA_LIBS" = "x"; then - test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib/lua-5.1\"" - LUA_LIBS="$ap_platform_runtime_link_flag$x/lib/lua-5.1" + if test -z ""; then + objects="mod_unique_id.lo" else - apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib/lua-5.1" + objects="" + fi + + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_unique_id.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo "no" >&6; } + apache_need_shared=yes + libname="mod_unique_id.la" + shobjects=`echo $objects | sed 's/\.lo/.slo/g'` + modpath_shared="$modpath_shared $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo_n "checking for lua.h in ${x}/include/lua5.1... " >&6; } - if test -f ${x}/include/lua5.1/lua.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS" - LDFLAGS="-L$x/lib $LDFLAGS $lib_m" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua5.1" >&5 -$as_echo_n "checking for luaL_newstate in -llua5.1... " >&6; } -if ${ac_cv_lib_lua5_1_luaL_newstate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua5.1 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + fi + + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_UNIQUE_ID_LDADD" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char luaL_newstate (); -int -main () -{ -return luaL_newstate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua5_1_luaL_newstate=yes -else - ac_cv_lib_lua5_1_luaL_newstate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua5_1_luaL_newstate" >&5 -$as_echo "$ac_cv_lib_lua5_1_luaL_newstate" >&6; } -if test "x$ac_cv_lib_lua5_1_luaL_newstate" = xyes; then : - LUA_LIBS="-L$x/lib -llua5.1 $lib_m" - if test "x$ap_platform_runtime_link_flag" != "x"; then - if test "x$LUA_LIBS" = "x"; then - test "x$silent" != "xyes" && echo " setting LUA_LIBS to \"$ap_platform_runtime_link_flag$x/lib\"" - LUA_LIBS="$ap_platform_runtime_link_flag$x/lib" - else - apr_addto_bugger="$ap_platform_runtime_link_flag$x/lib" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $LUA_LIBS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LUA_LIBS" - LUA_LIBS="$LUA_LIBS $i" - fi - done fi - fi - LUA_CFLAGS="-I$x/include/lua5.1" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_setenvif" >&5 +$as_echo_n "checking whether to enable mod_setenvif... " >&6; } + # Check whether --enable-setenvif was given. +if test "${enable_setenvif+set}" = set; then : + enableval=$enable_setenvif; force_setenvif=$enableval +else + enable_setenvif=yes fi - CFLAGS=$save_CFLAGS - LDFLAGS=$save_LDFLAGS - break + _apmod_extra_msg="" + case "$enable_setenvif" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_setenvif" = "static"; then + enable_setenvif=static + elif test "$enable_setenvif" = "yes"; then + enable_setenvif=$module_default + elif test "$enable_setenvif" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_setenvif=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_setenvif=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_setenvif" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_setenvif=$module_default + _apmod_extra_msg=" ($module_selection)" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + enable_setenvif=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lua.h in ${x}/include/lua51" >&5 -$as_echo_n "checking for lua.h in ${x}/include/lua51... " >&6; } - if test -f ${x}/include/lua51/lua.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS - CFLAGS="$CFLAGS" - LDFLAGS="-L$x/lib/lua51 $LDFLAGS $lib_m" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua" >&5 -$as_echo_n "checking for luaL_newstate in -llua... " >&6; } -if ${ac_cv_lib_lua_luaL_newstate+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-llua $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + elif test "$enable_setenvif" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_setenvif" != "no" ; then + enable_setenvif=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_setenvif" != "no"; then + : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_setenvif$_apmod_extra_msg" >&5 +$as_echo "$enable_setenvif$_apmod_extra_msg" >&6; } + if test "$enable_setenvif" != "no"; then + case "$enable_setenvif" in + static*) + MODLIST="$MODLIST setenvif" + if test "setenvif" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_setenvif=`echo $enable_setenvif|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES setenvif" + if test "yes" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},setenvif" + fi + ;; + esac -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char luaL_newstate (); -int -main () -{ -return luaL_newstate (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lua_luaL_newstate=yes -else - ac_cv_lib_lua_luaL_newstate=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lua_luaL_newstate" >&5 -$as_echo "$ac_cv_lib_lua_luaL_newstate" >&6; } -if test "x$ac_cv_lib_lua_luaL_newstate" = xyes; then : - LUA_LIBS="-L$x/lib/lua51 -llua $lib_m" - if test "x$ap_platform_runtime_link_flag" != "x"; then + if test -z ""; then + objects="mod_setenvif.lo" + else + objects="" + fi + + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_setenvif.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo "no" >&6; } + apache_need_shared=yes + libname="mod_setenvif.la" + shobjects=`echo $objects | sed 's/\.lo/.slo/g'` + modpath_shared="$modpath_shared $libname" + cat >>$modpath_current/modules.mk<&5 -$as_echo "$as_me: WARNING: *** Lua 5.2 or 5.1 library not found." >&2;} - enable_lua="no" - if test -z "${lua_path}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Lua 5.2 or 5.1 library is required" >&5 -$as_echo "$as_me: WARNING: Lua 5.2 or 5.1 library is required" >&2;} + + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_version" >&5 +$as_echo_n "checking whether to enable mod_version... " >&6; } + # Check whether --enable-version was given. +if test "${enable_version+set}" = set; then : + enableval=$enable_version; force_version=$enableval +else + enable_version=yes +fi + + _apmod_extra_msg="" + case "$enable_version" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_version" = "static"; then + enable_version=static + elif test "$enable_version" = "yes"; then + enable_version=$module_default + elif test "$enable_version" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_version=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_version=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_version" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_version=$module_default + _apmod_extra_msg=" ($module_selection)" else - as_fn_error $? "Lua 5.2 or 5.1 library is required" "$LINENO" 5 + enable_version=no fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: using '${LUA_LIBS}' for Lua Library" >&5 -$as_echo "$as_me: using '${LUA_LIBS}' for Lua Library" >&6;} - # Check whether --enable-luajit was given. -if test "${enable_luajit+set}" = set; then : - enableval=$enable_luajit; - if test "$enableval" = "yes"; then + elif test "$enable_version" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_version" != "no" ; then + enable_version=$module_default + _apmod_extra_msg=" ($module_selection)" + fi + if test "$enable_version" != "no"; then + : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_version$_apmod_extra_msg" >&5 +$as_echo "$enable_version$_apmod_extra_msg" >&6; } + if test "$enable_version" != "no"; then + case "$enable_version" in + static*) + MODLIST="$MODLIST version" + if test "version" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_version=`echo $enable_version|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES version" + if test "yes" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},version" + fi + ;; + esac - if test "x$MOD_CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_CPPFLAGS to \""-DAP_ENABLE_LUAJIT"\"" - MOD_CPPFLAGS=""-DAP_ENABLE_LUAJIT"" + + if test -z ""; then + objects="mod_version.lo" else - apr_addto_bugger=""-DAP_ENABLE_LUAJIT"" + objects="" + fi + + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_version.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 +$as_echo_n "checking whether to enable mod_remoteip... " >&6; } + # Check whether --enable-remoteip was given. +if test "${enable_remoteip+set}" = set; then : + enableval=$enable_remoteip; force_remoteip=$enableval +else + enable_remoteip=most +fi + _apmod_extra_msg="" + case "$enable_remoteip" in + yes|static|shared) + _apmod_required="yes" + ;; + *) + case "$module_selection" in + reallyall|all|most) + _apmod_required="no" + ;; + *) + _apmod_required="yes" + ;; + esac + esac + if test "$enable_remoteip" = "static"; then + enable_remoteip=static + elif test "$enable_remoteip" = "yes"; then + enable_remoteip=$module_default + elif test "$enable_remoteip" = "most"; then + if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ + "$module_selection" = "reallyall" + then + enable_remoteip=$module_default + elif test "$module_selection" = "few" -o "$module_selection" = "none"; then + enable_remoteip=no + fi + _apmod_extra_msg=" ($module_selection)" + elif test "$enable_remoteip" = "maybe-all"; then + if test "$module_selection" = "all" -o "$module_selection" = "reallyall" + then + enable_remoteip=$module_default + _apmod_extra_msg=" ($module_selection)" + else + enable_remoteip=no + fi + elif test "$enable_remoteip" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_remoteip" != "no" ; then + enable_remoteip=$module_default + _apmod_extra_msg=" ($module_selection)" fi - + if test "$enable_remoteip" != "no"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_lua" >&5 -$as_echo_n "checking whether to enable mod_lua... " >&6; } - if test "$enable_lua" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_lua has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_lua$_apmod_extra_msg" >&5 -$as_echo "$enable_lua$_apmod_extra_msg" >&6; } - if test "$enable_lua" != "no"; then - case "$enable_lua" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_remoteip$_apmod_extra_msg" >&5 +$as_echo "$enable_remoteip$_apmod_extra_msg" >&6; } + if test "$enable_remoteip" != "no"; then + case "$enable_remoteip" in static*) - MODLIST="$MODLIST lua" - if test "lua" = "so"; then + MODLIST="$MODLIST remoteip" + if test "remoteip" = "so"; then sharedobjs=yes fi shared="";; *) - enable_lua=`echo $enable_lua|sed 's/shared,*//'` + enable_remoteip=`echo $enable_remoteip|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES lua" - if test "" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},lua" + DSO_MODULES="$DSO_MODULES remoteip" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},remoteip" fi ;; esac - if test -z "$lua_objects"; then - objects="mod_lua.lo" + if test -z ""; then + objects="mod_remoteip.lo" else - objects="$lua_objects" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_lua.la" + libname="libmod_remoteip.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk< $modpath_current/modules.mk +if test "$enable_proxy" = "shared"; then + proxy_mods_enable=shared +elif test "$enable_proxy" = "yes"; then + proxy_mods_enable=yes +else + proxy_mods_enable=most +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_env" >&5 -$as_echo_n "checking whether to enable mod_env... " >&6; } - # Check whether --enable-env was given. -if test "${enable_env+set}" = set; then : - enableval=$enable_env; force_env=$enableval +proxy_objs="mod_proxy.lo proxy_util.lo" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy" >&5 +$as_echo_n "checking whether to enable mod_proxy... " >&6; } + # Check whether --enable-proxy was given. +if test "${enable_proxy+set}" = set; then : + enableval=$enable_proxy; force_proxy=$enableval else - enable_env=yes + enable_proxy=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_env" in + case "$enable_proxy" in yes|static|shared) _apmod_required="yes" ;; @@ -20824,80 +21604,80 @@ fi ;; esac esac - if test "$enable_env" = "static"; then - enable_env=static - elif test "$enable_env" = "yes"; then - enable_env=$module_default - elif test "$enable_env" = "most"; then + if test "$enable_proxy" = "static"; then + enable_proxy=static + elif test "$enable_proxy" = "yes"; then + enable_proxy=$module_default + elif test "$enable_proxy" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_env=$module_default + enable_proxy=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_env=no + enable_proxy=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_env" = "maybe-all"; then + elif test "$enable_proxy" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_env=$module_default + enable_proxy=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_env=no + enable_proxy=no fi - elif test "$enable_env" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_env" != "no" ; then - enable_env=$module_default + elif test "$enable_proxy" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy" != "no" ; then + enable_proxy=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_env" != "no"; then + if test "$enable_proxy" != "no"; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_env$_apmod_extra_msg" >&5 -$as_echo "$enable_env$_apmod_extra_msg" >&6; } - if test "$enable_env" != "no"; then - case "$enable_env" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy$_apmod_extra_msg" >&6; } + if test "$enable_proxy" != "no"; then + case "$enable_proxy" in static*) - MODLIST="$MODLIST env" - if test "env" = "so"; then + MODLIST="$MODLIST proxy" + if test "proxy" = "so"; then sharedobjs=yes fi shared="";; *) - enable_env=`echo $enable_env|sed 's/shared,*//'` + enable_proxy=`echo $enable_proxy|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES env" - if test "yes" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},env" + DSO_MODULES="$DSO_MODULES proxy" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy" fi ;; esac - if test -z ""; then - objects="mod_env.lo" + if test -z "$proxy_objs"; then + objects="mod_proxy.lo" else - objects="" + objects="$proxy_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_env.la" + libname="libmod_proxy.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_mime_magic... " >&6; } - # Check whether --enable-mime-magic was given. -if test "${enable_mime_magic+set}" = set; then : - enableval=$enable_mime_magic; force_mime_magic=$enableval +proxy_connect_objs="mod_proxy_connect.lo" +proxy_ftp_objs="mod_proxy_ftp.lo" +proxy_http_objs="mod_proxy_http.lo" +proxy_fcgi_objs="mod_proxy_fcgi.lo" +proxy_scgi_objs="mod_proxy_scgi.lo" +proxy_fdpass_objs="mod_proxy_fdpass.lo" +proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo" +proxy_wstunnel_objs="mod_proxy_wstunnel.lo" +proxy_balancer_objs="mod_proxy_balancer.lo" + +case "$host" in + *os2*) + # OS/2 DLLs must resolve all symbols at build time and + # these sub-modules need some from the main proxy module + proxy_connect_objs="$proxy_connect_objs mod_proxy.la" + proxy_ftp_objs="$proxy_ftp_objs mod_proxy.la" + proxy_http_objs="$proxy_http_objs mod_proxy.la" + proxy_fcgi_objs="$proxy_fcgi_objs mod_proxy.la" + proxy_scgi_objs="$proxy_scgi_objs mod_proxy.la" + proxy_fdpass_objs="$proxy_fdpass_objs mod_proxy.la" + proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la" + proxy_wstunnel_objs="$proxy_wstunnel_objs mod_proxy.la" + proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la" + ;; +esac + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_connect" >&5 +$as_echo_n "checking whether to enable mod_proxy_connect... " >&6; } + # Check whether --enable-proxy-connect was given. +if test "${enable_proxy_connect+set}" = set; then : + enableval=$enable_proxy_connect; force_proxy_connect=$enableval else - enable_mime_magic=maybe-all + enable_proxy_connect=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_mime_magic" in + case "$enable_proxy_connect" in yes|static|shared) _apmod_required="yes" ;; @@ -20958,80 +21765,101 @@ fi ;; esac esac - if test "$enable_mime_magic" = "static"; then - enable_mime_magic=static - elif test "$enable_mime_magic" = "yes"; then - enable_mime_magic=$module_default - elif test "$enable_mime_magic" = "most"; then + if test "$enable_proxy_connect" = "static"; then + enable_proxy_connect=static + elif test "$enable_proxy_connect" = "yes"; then + enable_proxy_connect=$module_default + elif test "$enable_proxy_connect" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_mime_magic=$module_default + enable_proxy_connect=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_mime_magic=no + enable_proxy_connect=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_mime_magic" = "maybe-all"; then + elif test "$enable_proxy_connect" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_mime_magic=$module_default + enable_proxy_connect=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_mime_magic=no + enable_proxy_connect=no fi - elif test "$enable_mime_magic" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_mime_magic" != "no" ; then - enable_mime_magic=$module_default + elif test "$enable_proxy_connect" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_connect" != "no" ; then + enable_proxy_connect=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_mime_magic" != "no"; then + if test "$enable_proxy_connect" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_connect=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_connect\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_connect\"" >&2;} + elif test "$enable_proxy_connect" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_connect=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_connect statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_connect statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_connect" >&5 +$as_echo_n "checking whether to enable mod_proxy_connect... " >&6; } + if test "$enable_proxy_connect" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_connect has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mime_magic$_apmod_extra_msg" >&5 -$as_echo "$enable_mime_magic$_apmod_extra_msg" >&6; } - if test "$enable_mime_magic" != "no"; then - case "$enable_mime_magic" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_connect$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_connect$_apmod_extra_msg" >&6; } + if test "$enable_proxy_connect" != "no"; then + case "$enable_proxy_connect" in static*) - MODLIST="$MODLIST mime_magic" - if test "mime_magic" = "so"; then + MODLIST="$MODLIST proxy_connect" + if test "proxy_connect" = "so"; then sharedobjs=yes fi shared="";; *) - enable_mime_magic=`echo $enable_mime_magic|sed 's/shared,*//'` + enable_proxy_connect=`echo $enable_proxy_connect|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES mime_magic" - if test "" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mime_magic" + DSO_MODULES="$DSO_MODULES proxy_connect" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_connect" fi ;; esac - if test -z ""; then - objects="mod_mime_magic.lo" + if test -z "$proxy_connect_objs"; then + objects="mod_proxy_connect.lo" else - objects="" + objects="$proxy_connect_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_mime_magic.la" + libname="libmod_proxy_connect.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_cern_meta... " >&6; } - # Check whether --enable-cern-meta was given. -if test "${enable_cern_meta+set}" = set; then : - enableval=$enable_cern_meta; force_cern_meta=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ftp" >&5 +$as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; } + # Check whether --enable-proxy-ftp was given. +if test "${enable_proxy_ftp+set}" = set; then : + enableval=$enable_proxy_ftp; force_proxy_ftp=$enableval else - enable_cern_meta=no + enable_proxy_ftp=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_cern_meta" in + case "$enable_proxy_ftp" in yes|static|shared) _apmod_required="yes" ;; @@ -21092,80 +21920,101 @@ fi ;; esac esac - if test "$enable_cern_meta" = "static"; then - enable_cern_meta=static - elif test "$enable_cern_meta" = "yes"; then - enable_cern_meta=$module_default - elif test "$enable_cern_meta" = "most"; then + if test "$enable_proxy_ftp" = "static"; then + enable_proxy_ftp=static + elif test "$enable_proxy_ftp" = "yes"; then + enable_proxy_ftp=$module_default + elif test "$enable_proxy_ftp" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_cern_meta=$module_default + enable_proxy_ftp=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_cern_meta=no + enable_proxy_ftp=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_cern_meta" = "maybe-all"; then + elif test "$enable_proxy_ftp" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_cern_meta=$module_default + enable_proxy_ftp=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_cern_meta=no + enable_proxy_ftp=no fi - elif test "$enable_cern_meta" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_cern_meta" != "no" ; then - enable_cern_meta=$module_default + elif test "$enable_proxy_ftp" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_ftp" != "no" ; then + enable_proxy_ftp=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_cern_meta" != "no"; then + if test "$enable_proxy_ftp" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_ftp=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_ftp\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_ftp\"" >&2;} + elif test "$enable_proxy_ftp" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_ftp=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_ftp statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_ftp statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ftp" >&5 +$as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; } + if test "$enable_proxy_ftp" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_ftp has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cern_meta$_apmod_extra_msg" >&5 -$as_echo "$enable_cern_meta$_apmod_extra_msg" >&6; } - if test "$enable_cern_meta" != "no"; then - case "$enable_cern_meta" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_ftp$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_ftp$_apmod_extra_msg" >&6; } + if test "$enable_proxy_ftp" != "no"; then + case "$enable_proxy_ftp" in static*) - MODLIST="$MODLIST cern_meta" - if test "cern_meta" = "so"; then + MODLIST="$MODLIST proxy_ftp" + if test "proxy_ftp" = "so"; then sharedobjs=yes fi shared="";; *) - enable_cern_meta=`echo $enable_cern_meta|sed 's/shared,*//'` + enable_proxy_ftp=`echo $enable_proxy_ftp|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES cern_meta" - if test "no" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},cern_meta" + DSO_MODULES="$DSO_MODULES proxy_ftp" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ftp" fi ;; esac - if test -z ""; then - objects="mod_cern_meta.lo" + if test -z "$proxy_ftp_objs"; then + objects="mod_proxy_ftp.lo" else - objects="" + objects="$proxy_ftp_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_cern_meta.la" + libname="libmod_proxy_ftp.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_expires... " >&6; } - # Check whether --enable-expires was given. -if test "${enable_expires+set}" = set; then : - enableval=$enable_expires; force_expires=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_http" >&5 +$as_echo_n "checking whether to enable mod_proxy_http... " >&6; } + # Check whether --enable-proxy-http was given. +if test "${enable_proxy_http+set}" = set; then : + enableval=$enable_proxy_http; force_proxy_http=$enableval else - enable_expires=most + enable_proxy_http=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_expires" in + case "$enable_proxy_http" in yes|static|shared) _apmod_required="yes" ;; @@ -21226,80 +22075,101 @@ fi ;; esac esac - if test "$enable_expires" = "static"; then - enable_expires=static - elif test "$enable_expires" = "yes"; then - enable_expires=$module_default - elif test "$enable_expires" = "most"; then + if test "$enable_proxy_http" = "static"; then + enable_proxy_http=static + elif test "$enable_proxy_http" = "yes"; then + enable_proxy_http=$module_default + elif test "$enable_proxy_http" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_expires=$module_default + enable_proxy_http=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_expires=no + enable_proxy_http=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_expires" = "maybe-all"; then + elif test "$enable_proxy_http" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_expires=$module_default + enable_proxy_http=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_expires=no + enable_proxy_http=no fi - elif test "$enable_expires" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_expires" != "no" ; then - enable_expires=$module_default + elif test "$enable_proxy_http" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_http" != "no" ; then + enable_proxy_http=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_expires" != "no"; then + if test "$enable_proxy_http" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_http=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_http\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_http\"" >&2;} + elif test "$enable_proxy_http" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_http=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_http statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_http statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_http" >&5 +$as_echo_n "checking whether to enable mod_proxy_http... " >&6; } + if test "$enable_proxy_http" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_http has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_expires$_apmod_extra_msg" >&5 -$as_echo "$enable_expires$_apmod_extra_msg" >&6; } - if test "$enable_expires" != "no"; then - case "$enable_expires" in - static*) - MODLIST="$MODLIST expires" - if test "expires" = "so"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_http$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_http$_apmod_extra_msg" >&6; } + if test "$enable_proxy_http" != "no"; then + case "$enable_proxy_http" in + static*) + MODLIST="$MODLIST proxy_http" + if test "proxy_http" = "so"; then sharedobjs=yes fi shared="";; *) - enable_expires=`echo $enable_expires|sed 's/shared,*//'` + enable_proxy_http=`echo $enable_proxy_http|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES expires" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},expires" + DSO_MODULES="$DSO_MODULES proxy_http" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_http" fi ;; esac - if test -z ""; then - objects="mod_expires.lo" + if test -z "$proxy_http_objs"; then + objects="mod_proxy_http.lo" else - objects="" + objects="$proxy_http_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_expires.la" + libname="libmod_proxy_http.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_headers... " >&6; } - # Check whether --enable-headers was given. -if test "${enable_headers+set}" = set; then : - enableval=$enable_headers; force_headers=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fcgi" >&5 +$as_echo_n "checking whether to enable mod_proxy_fcgi... " >&6; } + # Check whether --enable-proxy-fcgi was given. +if test "${enable_proxy_fcgi+set}" = set; then : + enableval=$enable_proxy_fcgi; force_proxy_fcgi=$enableval else - enable_headers=yes + enable_proxy_fcgi=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_headers" in + case "$enable_proxy_fcgi" in yes|static|shared) _apmod_required="yes" ;; @@ -21360,80 +22230,101 @@ fi ;; esac esac - if test "$enable_headers" = "static"; then - enable_headers=static - elif test "$enable_headers" = "yes"; then - enable_headers=$module_default - elif test "$enable_headers" = "most"; then + if test "$enable_proxy_fcgi" = "static"; then + enable_proxy_fcgi=static + elif test "$enable_proxy_fcgi" = "yes"; then + enable_proxy_fcgi=$module_default + elif test "$enable_proxy_fcgi" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_headers=$module_default + enable_proxy_fcgi=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_headers=no + enable_proxy_fcgi=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_headers" = "maybe-all"; then + elif test "$enable_proxy_fcgi" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_headers=$module_default + enable_proxy_fcgi=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_headers=no + enable_proxy_fcgi=no fi - elif test "$enable_headers" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_headers" != "no" ; then - enable_headers=$module_default + elif test "$enable_proxy_fcgi" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_fcgi" != "no" ; then + enable_proxy_fcgi=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_headers" != "no"; then + if test "$enable_proxy_fcgi" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_fcgi=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_fcgi\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_fcgi\"" >&2;} + elif test "$enable_proxy_fcgi" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_fcgi=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_fcgi statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_fcgi statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fcgi" >&5 +$as_echo_n "checking whether to enable mod_proxy_fcgi... " >&6; } + if test "$enable_proxy_fcgi" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_fcgi has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_headers$_apmod_extra_msg" >&5 -$as_echo "$enable_headers$_apmod_extra_msg" >&6; } - if test "$enable_headers" != "no"; then - case "$enable_headers" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_fcgi$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_fcgi$_apmod_extra_msg" >&6; } + if test "$enable_proxy_fcgi" != "no"; then + case "$enable_proxy_fcgi" in static*) - MODLIST="$MODLIST headers" - if test "headers" = "so"; then + MODLIST="$MODLIST proxy_fcgi" + if test "proxy_fcgi" = "so"; then sharedobjs=yes fi shared="";; *) - enable_headers=`echo $enable_headers|sed 's/shared,*//'` + enable_proxy_fcgi=`echo $enable_proxy_fcgi|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES headers" - if test "yes" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},headers" + DSO_MODULES="$DSO_MODULES proxy_fcgi" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fcgi" fi ;; esac - if test -z ""; then - objects="mod_headers.lo" + if test -z "$proxy_fcgi_objs"; then + objects="mod_proxy_fcgi.lo" else - objects="" + objects="$proxy_fcgi_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_headers.la" + libname="libmod_proxy_fcgi.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_ident... " >&6; } - # Check whether --enable-ident was given. -if test "${enable_ident+set}" = set; then : - enableval=$enable_ident; force_ident=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_scgi" >&5 +$as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; } + # Check whether --enable-proxy-scgi was given. +if test "${enable_proxy_scgi+set}" = set; then : + enableval=$enable_proxy_scgi; force_proxy_scgi=$enableval else - enable_ident=no + enable_proxy_scgi=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_ident" in + case "$enable_proxy_scgi" in yes|static|shared) _apmod_required="yes" ;; @@ -21494,80 +22385,101 @@ fi ;; esac esac - if test "$enable_ident" = "static"; then - enable_ident=static - elif test "$enable_ident" = "yes"; then - enable_ident=$module_default - elif test "$enable_ident" = "most"; then + if test "$enable_proxy_scgi" = "static"; then + enable_proxy_scgi=static + elif test "$enable_proxy_scgi" = "yes"; then + enable_proxy_scgi=$module_default + elif test "$enable_proxy_scgi" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_ident=$module_default + enable_proxy_scgi=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_ident=no + enable_proxy_scgi=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_ident" = "maybe-all"; then + elif test "$enable_proxy_scgi" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_ident=$module_default + enable_proxy_scgi=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_ident=no + enable_proxy_scgi=no fi - elif test "$enable_ident" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_ident" != "no" ; then - enable_ident=$module_default + elif test "$enable_proxy_scgi" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_scgi" != "no" ; then + enable_proxy_scgi=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_ident" != "no"; then + if test "$enable_proxy_scgi" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_scgi=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_scgi\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_scgi\"" >&2;} + elif test "$enable_proxy_scgi" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_scgi=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_scgi statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_scgi statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_scgi" >&5 +$as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; } + if test "$enable_proxy_scgi" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_scgi has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ident$_apmod_extra_msg" >&5 -$as_echo "$enable_ident$_apmod_extra_msg" >&6; } - if test "$enable_ident" != "no"; then - case "$enable_ident" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_scgi$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_scgi$_apmod_extra_msg" >&6; } + if test "$enable_proxy_scgi" != "no"; then + case "$enable_proxy_scgi" in static*) - MODLIST="$MODLIST ident" - if test "ident" = "so"; then + MODLIST="$MODLIST proxy_scgi" + if test "proxy_scgi" = "so"; then sharedobjs=yes fi shared="";; *) - enable_ident=`echo $enable_ident|sed 's/shared,*//'` + enable_proxy_scgi=`echo $enable_proxy_scgi|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES ident" - if test "no" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ident" + DSO_MODULES="$DSO_MODULES proxy_scgi" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_scgi" fi ;; esac - if test -z ""; then - objects="mod_ident.lo" + if test -z "$proxy_scgi_objs"; then + objects="mod_proxy_scgi.lo" else - objects="" + objects="$proxy_scgi_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_ident.la" + libname="libmod_proxy_scgi.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_usertrack... " >&6; } - # Check whether --enable-usertrack was given. -if test "${enable_usertrack+set}" = set; then : - enableval=$enable_usertrack; force_usertrack=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fdpass" >&5 +$as_echo_n "checking whether to enable mod_proxy_fdpass... " >&6; } + # Check whether --enable-proxy-fdpass was given. +if test "${enable_proxy_fdpass+set}" = set; then : + enableval=$enable_proxy_fdpass; force_proxy_fdpass=$enableval else - enable_usertrack=maybe-all + enable_proxy_fdpass=maybe-all fi _apmod_extra_msg="" - case "$enable_usertrack" in + case "$enable_proxy_fdpass" in yes|static|shared) _apmod_required="yes" ;; @@ -21629,117 +22540,116 @@ fi ;; esac esac - if test "$enable_usertrack" = "static"; then - enable_usertrack=static - elif test "$enable_usertrack" = "yes"; then - enable_usertrack=$module_default - elif test "$enable_usertrack" = "most"; then + if test "$enable_proxy_fdpass" = "static"; then + enable_proxy_fdpass=static + elif test "$enable_proxy_fdpass" = "yes"; then + enable_proxy_fdpass=$module_default + elif test "$enable_proxy_fdpass" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_usertrack=$module_default + enable_proxy_fdpass=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_usertrack=no + enable_proxy_fdpass=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_usertrack" = "maybe-all"; then + elif test "$enable_proxy_fdpass" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_usertrack=$module_default + enable_proxy_fdpass=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_usertrack=no + enable_proxy_fdpass=no fi - elif test "$enable_usertrack" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_usertrack" != "no" ; then - enable_usertrack=$module_default + elif test "$enable_proxy_fdpass" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_fdpass" != "no" ; then + enable_proxy_fdpass=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_usertrack" != "no"; then + if test "$enable_proxy_fdpass" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 $as_echo "checking dependencies" >&6; } - : - - for ac_header in sys/times.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_times_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIMES_H 1 -_ACEOF - -fi + if test "$enable_proxy" = "no" ; then + enable_proxy_fdpass=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_fdpass\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_fdpass\"" >&2;} + elif test "$enable_proxy_fdpass" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_fdpass=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_fdpass statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_fdpass statically if mod_proxy is built shared\"" >&2;} + else -done + ac_fn_c_check_decl "$LINENO" "CMSG_DATA" "ac_cv_have_decl_CMSG_DATA" " + #include + #include - for ac_func in times -do : - ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times" -if test "x$ac_cv_func_times" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_TIMES 1 -_ACEOF +" +if test "x$ac_cv_have_decl_CMSG_DATA" = xyes; then : fi -done + if test $ac_cv_have_decl_CMSG_DATA = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your system does not support CMSG_DATA." >&5 +$as_echo "$as_me: WARNING: Your system does not support CMSG_DATA." >&2;} + enable_proxy_fdpass=no + fi - : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_usertrack" >&5 -$as_echo_n "checking whether to enable mod_usertrack... " >&6; } - if test "$enable_usertrack" = "no"; then + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fdpass" >&5 +$as_echo_n "checking whether to enable mod_proxy_fdpass... " >&6; } + if test "$enable_proxy_fdpass" = "no"; then if test "$_apmod_required" = "no"; then _apmod_extra_msg=" (disabled)" else - as_fn_error $? "mod_usertrack has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + as_fn_error $? "mod_proxy_fdpass has been requested but can not be built due to prerequisite failures" "$LINENO" 5 fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_usertrack$_apmod_extra_msg" >&5 -$as_echo "$enable_usertrack$_apmod_extra_msg" >&6; } - if test "$enable_usertrack" != "no"; then - case "$enable_usertrack" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_fdpass$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_fdpass$_apmod_extra_msg" >&6; } + if test "$enable_proxy_fdpass" != "no"; then + case "$enable_proxy_fdpass" in static*) - MODLIST="$MODLIST usertrack" - if test "usertrack" = "so"; then + MODLIST="$MODLIST proxy_fdpass" + if test "proxy_fdpass" = "so"; then sharedobjs=yes fi shared="";; *) - enable_usertrack=`echo $enable_usertrack|sed 's/shared,*//'` + enable_proxy_fdpass=`echo $enable_proxy_fdpass|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES usertrack" + DSO_MODULES="$DSO_MODULES proxy_fdpass" if test "" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},usertrack" + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fdpass" fi ;; esac - if test -z ""; then - objects="mod_usertrack.lo" + if test -z "$proxy_fdpass_objs"; then + objects="mod_proxy_fdpass.lo" else - objects="" + objects="$proxy_fdpass_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_usertrack.la" + libname="libmod_proxy_fdpass.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_unique_id... " >&6; } - # Check whether --enable-unique-id was given. -if test "${enable_unique_id+set}" = set; then : - enableval=$enable_unique_id; force_unique_id=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_wstunnel" >&5 +$as_echo_n "checking whether to enable mod_proxy_wstunnel... " >&6; } + # Check whether --enable-proxy-wstunnel was given. +if test "${enable_proxy_wstunnel+set}" = set; then : + enableval=$enable_proxy_wstunnel; force_proxy_wstunnel=$enableval else - enable_unique_id=most + enable_proxy_wstunnel=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_unique_id" in + case "$enable_proxy_wstunnel" in yes|static|shared) _apmod_required="yes" ;; @@ -21801,80 +22710,101 @@ fi ;; esac esac - if test "$enable_unique_id" = "static"; then - enable_unique_id=static - elif test "$enable_unique_id" = "yes"; then - enable_unique_id=$module_default - elif test "$enable_unique_id" = "most"; then + if test "$enable_proxy_wstunnel" = "static"; then + enable_proxy_wstunnel=static + elif test "$enable_proxy_wstunnel" = "yes"; then + enable_proxy_wstunnel=$module_default + elif test "$enable_proxy_wstunnel" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_unique_id=$module_default + enable_proxy_wstunnel=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_unique_id=no + enable_proxy_wstunnel=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_unique_id" = "maybe-all"; then + elif test "$enable_proxy_wstunnel" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_unique_id=$module_default + enable_proxy_wstunnel=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_unique_id=no + enable_proxy_wstunnel=no fi - elif test "$enable_unique_id" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_unique_id" != "no" ; then - enable_unique_id=$module_default + elif test "$enable_proxy_wstunnel" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_wstunnel" != "no" ; then + enable_proxy_wstunnel=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_unique_id" != "no"; then + if test "$enable_proxy_wstunnel" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_wstunnel=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_wstunnel\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_wstunnel\"" >&2;} + elif test "$enable_proxy_wstunnel" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_wstunnel=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_wstunnel statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_wstunnel statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_wstunnel" >&5 +$as_echo_n "checking whether to enable mod_proxy_wstunnel... " >&6; } + if test "$enable_proxy_wstunnel" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_wstunnel has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_unique_id$_apmod_extra_msg" >&5 -$as_echo "$enable_unique_id$_apmod_extra_msg" >&6; } - if test "$enable_unique_id" != "no"; then - case "$enable_unique_id" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_wstunnel$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_wstunnel$_apmod_extra_msg" >&6; } + if test "$enable_proxy_wstunnel" != "no"; then + case "$enable_proxy_wstunnel" in static*) - MODLIST="$MODLIST unique_id" - if test "unique_id" = "so"; then + MODLIST="$MODLIST proxy_wstunnel" + if test "proxy_wstunnel" = "so"; then sharedobjs=yes fi shared="";; *) - enable_unique_id=`echo $enable_unique_id|sed 's/shared,*//'` + enable_proxy_wstunnel=`echo $enable_proxy_wstunnel|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES unique_id" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},unique_id" + DSO_MODULES="$DSO_MODULES proxy_wstunnel" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_wstunnel" fi ;; esac - if test -z ""; then - objects="mod_unique_id.lo" + if test -z "$proxy_wstunnel_objs"; then + objects="mod_proxy_wstunnel.lo" else - objects="" + objects="$proxy_wstunnel_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_unique_id.la" + libname="libmod_proxy_wstunnel.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_setenvif... " >&6; } - # Check whether --enable-setenvif was given. -if test "${enable_setenvif+set}" = set; then : - enableval=$enable_setenvif; force_setenvif=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ajp" >&5 +$as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; } + # Check whether --enable-proxy-ajp was given. +if test "${enable_proxy_ajp+set}" = set; then : + enableval=$enable_proxy_ajp; force_proxy_ajp=$enableval else - enable_setenvif=yes + enable_proxy_ajp=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_setenvif" in + case "$enable_proxy_ajp" in yes|static|shared) _apmod_required="yes" ;; @@ -21933,82 +22863,103 @@ fi *) _apmod_required="yes" ;; - esac - esac - if test "$enable_setenvif" = "static"; then - enable_setenvif=static - elif test "$enable_setenvif" = "yes"; then - enable_setenvif=$module_default - elif test "$enable_setenvif" = "most"; then + esac + esac + if test "$enable_proxy_ajp" = "static"; then + enable_proxy_ajp=static + elif test "$enable_proxy_ajp" = "yes"; then + enable_proxy_ajp=$module_default + elif test "$enable_proxy_ajp" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_setenvif=$module_default + enable_proxy_ajp=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_setenvif=no + enable_proxy_ajp=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_setenvif" = "maybe-all"; then + elif test "$enable_proxy_ajp" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_setenvif=$module_default + enable_proxy_ajp=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_setenvif=no + enable_proxy_ajp=no fi - elif test "$enable_setenvif" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_setenvif" != "no" ; then - enable_setenvif=$module_default + elif test "$enable_proxy_ajp" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_ajp" != "no" ; then + enable_proxy_ajp=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_setenvif" != "no"; then + if test "$enable_proxy_ajp" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_ajp=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_ajp\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_ajp\"" >&2;} + elif test "$enable_proxy_ajp" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_ajp=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_ajp statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_ajp statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ajp" >&5 +$as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; } + if test "$enable_proxy_ajp" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_ajp has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_setenvif$_apmod_extra_msg" >&5 -$as_echo "$enable_setenvif$_apmod_extra_msg" >&6; } - if test "$enable_setenvif" != "no"; then - case "$enable_setenvif" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_ajp$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_ajp$_apmod_extra_msg" >&6; } + if test "$enable_proxy_ajp" != "no"; then + case "$enable_proxy_ajp" in static*) - MODLIST="$MODLIST setenvif" - if test "setenvif" = "so"; then + MODLIST="$MODLIST proxy_ajp" + if test "proxy_ajp" = "so"; then sharedobjs=yes fi shared="";; *) - enable_setenvif=`echo $enable_setenvif|sed 's/shared,*//'` + enable_proxy_ajp=`echo $enable_proxy_ajp|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES setenvif" - if test "yes" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},setenvif" + DSO_MODULES="$DSO_MODULES proxy_ajp" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ajp" fi ;; esac - if test -z ""; then - objects="mod_setenvif.lo" + if test -z "$proxy_ajp_objs"; then + objects="mod_proxy_ajp.lo" else - objects="" + objects="$proxy_ajp_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_setenvif.la" + libname="libmod_proxy_ajp.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_version... " >&6; } - # Check whether --enable-version was given. -if test "${enable_version+set}" = set; then : - enableval=$enable_version; force_version=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_balancer" >&5 +$as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; } + # Check whether --enable-proxy-balancer was given. +if test "${enable_proxy_balancer+set}" = set; then : + enableval=$enable_proxy_balancer; force_proxy_balancer=$enableval else - enable_version=yes + enable_proxy_balancer=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_version" in + case "$enable_proxy_balancer" in yes|static|shared) _apmod_required="yes" ;; @@ -22069,80 +23020,101 @@ fi ;; esac esac - if test "$enable_version" = "static"; then - enable_version=static - elif test "$enable_version" = "yes"; then - enable_version=$module_default - elif test "$enable_version" = "most"; then + if test "$enable_proxy_balancer" = "static"; then + enable_proxy_balancer=static + elif test "$enable_proxy_balancer" = "yes"; then + enable_proxy_balancer=$module_default + elif test "$enable_proxy_balancer" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_version=$module_default + enable_proxy_balancer=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_version=no + enable_proxy_balancer=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_version" = "maybe-all"; then + elif test "$enable_proxy_balancer" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_version=$module_default + enable_proxy_balancer=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_version=no + enable_proxy_balancer=no fi - elif test "$enable_version" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_version" != "no" ; then - enable_version=$module_default + elif test "$enable_proxy_balancer" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_balancer" != "no" ; then + enable_proxy_balancer=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_version" != "no"; then + if test "$enable_proxy_balancer" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_balancer=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_balancer\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_balancer\"" >&2;} + elif test "$enable_proxy_balancer" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_balancer=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_balancer statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_balancer statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_balancer" >&5 +$as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; } + if test "$enable_proxy_balancer" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_balancer has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_version$_apmod_extra_msg" >&5 -$as_echo "$enable_version$_apmod_extra_msg" >&6; } - if test "$enable_version" != "no"; then - case "$enable_version" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_balancer$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_balancer$_apmod_extra_msg" >&6; } + if test "$enable_proxy_balancer" != "no"; then + case "$enable_proxy_balancer" in static*) - MODLIST="$MODLIST version" - if test "version" = "so"; then + MODLIST="$MODLIST proxy_balancer" + if test "proxy_balancer" = "so"; then sharedobjs=yes fi shared="";; *) - enable_version=`echo $enable_version|sed 's/shared,*//'` + enable_proxy_balancer=`echo $enable_proxy_balancer|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES version" - if test "yes" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},version" + DSO_MODULES="$DSO_MODULES proxy_balancer" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_balancer" fi ;; esac - if test -z ""; then - objects="mod_version.lo" + if test -z "$proxy_balancer_objs"; then + objects="mod_proxy_balancer.lo" else - objects="" + objects="$proxy_balancer_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_version.la" + libname="libmod_proxy_balancer.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_remoteip... " >&6; } - # Check whether --enable-remoteip was given. -if test "${enable_remoteip+set}" = set; then : - enableval=$enable_remoteip; force_remoteip=$enableval + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_express" >&5 +$as_echo_n "checking whether to enable mod_proxy_express... " >&6; } + # Check whether --enable-proxy-express was given. +if test "${enable_proxy_express+set}" = set; then : + enableval=$enable_proxy_express; force_proxy_express=$enableval else - enable_remoteip=most + enable_proxy_express=$proxy_mods_enable fi _apmod_extra_msg="" - case "$enable_remoteip" in + case "$enable_proxy_express" in yes|static|shared) _apmod_required="yes" ;; @@ -22203,59 +23176,80 @@ fi ;; esac esac - if test "$enable_remoteip" = "static"; then - enable_remoteip=static - elif test "$enable_remoteip" = "yes"; then - enable_remoteip=$module_default - elif test "$enable_remoteip" = "most"; then + if test "$enable_proxy_express" = "static"; then + enable_proxy_express=static + elif test "$enable_proxy_express" = "yes"; then + enable_proxy_express=$module_default + elif test "$enable_proxy_express" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_remoteip=$module_default + enable_proxy_express=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_remoteip=no + enable_proxy_express=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_remoteip" = "maybe-all"; then + elif test "$enable_proxy_express" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_remoteip=$module_default + enable_proxy_express=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_remoteip=no + enable_proxy_express=no fi - elif test "$enable_remoteip" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_remoteip" != "no" ; then - enable_remoteip=$module_default + elif test "$enable_proxy_express" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_proxy_express" != "no" ; then + enable_proxy_express=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_remoteip" != "no"; then + if test "$enable_proxy_express" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } + if test "$enable_proxy" = "no" ; then + enable_proxy_express=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_express\"" >&5 +$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_express\"" >&2;} + elif test "$enable_proxy_express" = "static" && test "$enable_proxy" != "static" ; then + enable_proxy_express=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_express statically if mod_proxy is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_proxy_express statically if mod_proxy is built shared\"" >&2;} + else : + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_express" >&5 +$as_echo_n "checking whether to enable mod_proxy_express... " >&6; } + if test "$enable_proxy_express" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_proxy_express has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_remoteip$_apmod_extra_msg" >&5 -$as_echo "$enable_remoteip$_apmod_extra_msg" >&6; } - if test "$enable_remoteip" != "no"; then - case "$enable_remoteip" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_express$_apmod_extra_msg" >&5 +$as_echo "$enable_proxy_express$_apmod_extra_msg" >&6; } + if test "$enable_proxy_express" != "no"; then + case "$enable_proxy_express" in static*) - MODLIST="$MODLIST remoteip" - if test "remoteip" = "so"; then + MODLIST="$MODLIST proxy_express" + if test "proxy_express" = "so"; then sharedobjs=yes fi shared="";; *) - enable_remoteip=`echo $enable_remoteip|sed 's/shared,*//'` + enable_proxy_express=`echo $enable_proxy_express|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES remoteip" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},remoteip" + DSO_MODULES="$DSO_MODULES proxy_express" + if test "$proxy_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_express" fi ;; esac if test -z ""; then - objects="mod_remoteip.lo" + objects="mod_proxy_express.lo" else objects="" fi @@ -22263,20 +23257,20 @@ $as_echo "$enable_remoteip$_apmod_extra_msg" >&6; } if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_remoteip.la" + libname="libmod_proxy_express.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk< $modpath_current/modules.mk -if test "$enable_proxy" = "shared"; then - proxy_mods_enable=shared -elif test "$enable_proxy" = "yes"; then - proxy_mods_enable=yes -else - proxy_mods_enable=most -fi +session_cookie_objects='mod_session_cookie.lo' +session_crypto_objects='mod_session_crypto.lo' +session_dbd_objects='mod_session_dbd.lo' -proxy_objs="mod_proxy.lo proxy_util.lo" +case "$host" in + *os2*) + # OS/2 DLLs must resolve all symbols at build time + # and we need some from main session module + session_cookie_objects="$session_cookie_objects mod_session.la" + session_crypto_objects="$session_crypto_objects mod_session.la" + session_dbd_objects="$session_dbd_objects mod_session.la" + ;; +esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy" >&5 -$as_echo_n "checking whether to enable mod_proxy... " >&6; } - # Check whether --enable-proxy was given. -if test "${enable_proxy+set}" = set; then : - enableval=$enable_proxy; force_proxy=$enableval + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session" >&5 +$as_echo_n "checking whether to enable mod_session... " >&6; } + # Check whether --enable-session was given. +if test "${enable_session+set}" = set; then : + enableval=$enable_session; force_session=$enableval else - enable_proxy=$proxy_mods_enable + enable_session=most fi _apmod_extra_msg="" - case "$enable_proxy" in + case "$enable_session" in yes|static|shared) _apmod_required="yes" ;; @@ -22379,80 +23409,80 @@ fi ;; esac esac - if test "$enable_proxy" = "static"; then - enable_proxy=static - elif test "$enable_proxy" = "yes"; then - enable_proxy=$module_default - elif test "$enable_proxy" = "most"; then + if test "$enable_session" = "static"; then + enable_session=static + elif test "$enable_session" = "yes"; then + enable_session=$module_default + elif test "$enable_session" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy=$module_default + enable_session=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy=no + enable_session=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy" = "maybe-all"; then + elif test "$enable_session" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy=$module_default + enable_session=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy=no + enable_session=no fi - elif test "$enable_proxy" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy" != "no" ; then - enable_proxy=$module_default + elif test "$enable_session" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_session" != "no" ; then + enable_session=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy" != "no"; then + if test "$enable_session" != "no"; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy$_apmod_extra_msg" >&6; } - if test "$enable_proxy" != "no"; then - case "$enable_proxy" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session$_apmod_extra_msg" >&5 +$as_echo "$enable_session$_apmod_extra_msg" >&6; } + if test "$enable_session" != "no"; then + case "$enable_session" in static*) - MODLIST="$MODLIST proxy" - if test "proxy" = "so"; then + MODLIST="$MODLIST session" + if test "session" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy=`echo $enable_proxy|sed 's/shared,*//'` + enable_session=`echo $enable_session|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy" + DSO_MODULES="$DSO_MODULES session" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session" fi ;; esac - if test -z "$proxy_objs"; then - objects="mod_proxy.lo" + if test -z ""; then + objects="mod_session.lo" else - objects="$proxy_objs" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy.la" + libname="libmod_session.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_connect... " >&6; } - # Check whether --enable-proxy-connect was given. -if test "${enable_proxy_connect+set}" = set; then : - enableval=$enable_proxy_connect; force_proxy_connect=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_cookie" >&5 +$as_echo_n "checking whether to enable mod_session_cookie... " >&6; } + # Check whether --enable-session-cookie was given. +if test "${enable_session_cookie+set}" = set; then : + enableval=$enable_session_cookie; force_session_cookie=$enableval else - enable_proxy_connect=$proxy_mods_enable + enable_session_cookie=$session_mods_enable fi _apmod_extra_msg="" - case "$enable_proxy_connect" in + case "$enable_session_cookie" in yes|static|shared) _apmod_required="yes" ;; @@ -22540,101 +23543,101 @@ fi ;; esac esac - if test "$enable_proxy_connect" = "static"; then - enable_proxy_connect=static - elif test "$enable_proxy_connect" = "yes"; then - enable_proxy_connect=$module_default - elif test "$enable_proxy_connect" = "most"; then + if test "$enable_session_cookie" = "static"; then + enable_session_cookie=static + elif test "$enable_session_cookie" = "yes"; then + enable_session_cookie=$module_default + elif test "$enable_session_cookie" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy_connect=$module_default + enable_session_cookie=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_connect=no + enable_session_cookie=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_connect" = "maybe-all"; then + elif test "$enable_session_cookie" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy_connect=$module_default + enable_session_cookie=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy_connect=no + enable_session_cookie=no fi - elif test "$enable_proxy_connect" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_connect" != "no" ; then - enable_proxy_connect=$module_default + elif test "$enable_session_cookie" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_session_cookie" != "no" ; then + enable_session_cookie=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy_connect" != "no"; then + if test "$enable_session_cookie" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 $as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_connect=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_connect\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_connect\"" >&2;} - elif test "$enable_proxy_connect" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_connect=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_connect statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_connect statically if mod_proxy is built shared\"" >&2;} + if test "$enable_session" = "no" ; then + enable_session_cookie=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_cookie\"" >&5 +$as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_cookie\"" >&2;} + elif test "$enable_session_cookie" = "static" && test "$enable_session" != "static" ; then + enable_session_cookie=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_cookie statically if mod_session is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_session_cookie statically if mod_session is built shared\"" >&2;} else : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_connect" >&5 -$as_echo_n "checking whether to enable mod_proxy_connect... " >&6; } - if test "$enable_proxy_connect" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_cookie" >&5 +$as_echo_n "checking whether to enable mod_session_cookie... " >&6; } + if test "$enable_session_cookie" = "no"; then if test "$_apmod_required" = "no"; then _apmod_extra_msg=" (disabled)" else - as_fn_error $? "mod_proxy_connect has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + as_fn_error $? "mod_session_cookie has been requested but can not be built due to prerequisite failures" "$LINENO" 5 fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_connect$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_connect$_apmod_extra_msg" >&6; } - if test "$enable_proxy_connect" != "no"; then - case "$enable_proxy_connect" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_cookie$_apmod_extra_msg" >&5 +$as_echo "$enable_session_cookie$_apmod_extra_msg" >&6; } + if test "$enable_session_cookie" != "no"; then + case "$enable_session_cookie" in static*) - MODLIST="$MODLIST proxy_connect" - if test "proxy_connect" = "so"; then + MODLIST="$MODLIST session_cookie" + if test "session_cookie" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy_connect=`echo $enable_proxy_connect|sed 's/shared,*//'` + enable_session_cookie=`echo $enable_session_cookie|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy_connect" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_connect" + DSO_MODULES="$DSO_MODULES session_cookie" + if test "$session_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_cookie" fi ;; esac - if test -z "$proxy_connect_objs"; then - objects="mod_proxy_connect.lo" + if test -z "$session_cookie_objects"; then + objects="mod_session_cookie.lo" else - objects="$proxy_connect_objs" + objects="$session_cookie_objects" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_connect.la" + libname="libmod_session_cookie.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; } - # Check whether --enable-proxy-ftp was given. -if test "${enable_proxy_ftp+set}" = set; then : - enableval=$enable_proxy_ftp; force_proxy_ftp=$enableval +if test "$enable_session_crypto" != ""; then + session_mods_enable_crypto=$enable_session_crypto else - enable_proxy_ftp=$proxy_mods_enable + session_mods_enable_crypto=$session_mods_enable +fi +if test "$session_mods_enable_crypto" != "no"; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $APR_INCLUDES $APU_INCLUDES" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ + +#if APU_HAVE_CRYPTO == 0 +#error no crypto support +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ap_HAVE_APR_CRYPTO="yes" +else + ap_HAVE_APR_CRYPTO="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS="$saved_CPPFLAGS" + if test $ap_HAVE_APR_CRYPTO = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your APR does not include SSL/EVP support. To enable it: configure --with-crypto" >&5 +$as_echo "$as_me: WARNING: Your APR does not include SSL/EVP support. To enable it: configure --with-crypto" >&2;} + if test "$enable_session_crypto" != "" -a "$enable_session_crypto" != "no"; then + as_fn_error $? "mod_session_crypto cannot be enabled" "$LINENO" 5 + fi + session_mods_enable_crypto="no" + fi +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_crypto" >&5 +$as_echo_n "checking whether to enable mod_session_crypto... " >&6; } + # Check whether --enable-session-crypto was given. +if test "${enable_session_crypto+set}" = set; then : + enableval=$enable_session_crypto; force_session_crypto=$enableval +else + enable_session_crypto=$session_mods_enable_crypto fi _apmod_extra_msg="" - case "$enable_proxy_ftp" in + case "$enable_session_crypto" in yes|static|shared) _apmod_required="yes" ;; @@ -22695,101 +23738,105 @@ fi ;; esac esac - if test "$enable_proxy_ftp" = "static"; then - enable_proxy_ftp=static - elif test "$enable_proxy_ftp" = "yes"; then - enable_proxy_ftp=$module_default - elif test "$enable_proxy_ftp" = "most"; then + if test "$enable_session_crypto" = "static"; then + enable_session_crypto=static + elif test "$enable_session_crypto" = "yes"; then + enable_session_crypto=$module_default + elif test "$enable_session_crypto" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy_ftp=$module_default + enable_session_crypto=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_ftp=no + enable_session_crypto=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_ftp" = "maybe-all"; then + elif test "$enable_session_crypto" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy_ftp=$module_default + enable_session_crypto=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy_ftp=no + enable_session_crypto=no fi - elif test "$enable_proxy_ftp" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_ftp" != "no" ; then - enable_proxy_ftp=$module_default + elif test "$enable_session_crypto" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_session_crypto" != "no" ; then + enable_session_crypto=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy_ftp" != "no"; then + if test "$enable_session_crypto" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 $as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_ftp=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_ftp\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_ftp\"" >&2;} - elif test "$enable_proxy_ftp" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_ftp=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_ftp statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_ftp statically if mod_proxy is built shared\"" >&2;} + if test "$enable_session" = "no" ; then + enable_session_crypto=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_crypto\"" >&5 +$as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_crypto\"" >&2;} + elif test "$enable_session_crypto" = "static" && test "$enable_session" != "static" ; then + enable_session_crypto=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_crypto statically if mod_session is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_session_crypto statically if mod_session is built shared\"" >&2;} else - : + +if test "$session_mods_enable_crypto" = "no" ; then + enable_session_crypto=no +fi + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ftp" >&5 -$as_echo_n "checking whether to enable mod_proxy_ftp... " >&6; } - if test "$enable_proxy_ftp" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_crypto" >&5 +$as_echo_n "checking whether to enable mod_session_crypto... " >&6; } + if test "$enable_session_crypto" = "no"; then if test "$_apmod_required" = "no"; then _apmod_extra_msg=" (disabled)" else - as_fn_error $? "mod_proxy_ftp has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + as_fn_error $? "mod_session_crypto has been requested but can not be built due to prerequisite failures" "$LINENO" 5 fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_ftp$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_ftp$_apmod_extra_msg" >&6; } - if test "$enable_proxy_ftp" != "no"; then - case "$enable_proxy_ftp" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_crypto$_apmod_extra_msg" >&5 +$as_echo "$enable_session_crypto$_apmod_extra_msg" >&6; } + if test "$enable_session_crypto" != "no"; then + case "$enable_session_crypto" in static*) - MODLIST="$MODLIST proxy_ftp" - if test "proxy_ftp" = "so"; then + MODLIST="$MODLIST session_crypto" + if test "session_crypto" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy_ftp=`echo $enable_proxy_ftp|sed 's/shared,*//'` + enable_session_crypto=`echo $enable_session_crypto|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy_ftp" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ftp" + DSO_MODULES="$DSO_MODULES session_crypto" + if test "$session_mods_enable_crypto" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_crypto" fi ;; esac - if test -z "$proxy_ftp_objs"; then - objects="mod_proxy_ftp.lo" + if test -z "$session_crypto_objects"; then + objects="mod_session_crypto.lo" else - objects="$proxy_ftp_objs" + objects="$session_crypto_objects" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_ftp.la" + libname="libmod_session_crypto.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_http... " >&6; } - # Check whether --enable-proxy-http was given. -if test "${enable_proxy_http+set}" = set; then : - enableval=$enable_proxy_http; force_proxy_http=$enableval + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_dbd" >&5 +$as_echo_n "checking whether to enable mod_session_dbd... " >&6; } + # Check whether --enable-session-dbd was given. +if test "${enable_session_dbd+set}" = set; then : + enableval=$enable_session_dbd; force_session_dbd=$enableval else - enable_proxy_http=$proxy_mods_enable + enable_session_dbd=$session_mods_enable fi _apmod_extra_msg="" - case "$enable_proxy_http" in + case "$enable_session_dbd" in yes|static|shared) _apmod_required="yes" ;; @@ -22850,101 +23898,101 @@ fi ;; esac esac - if test "$enable_proxy_http" = "static"; then - enable_proxy_http=static - elif test "$enable_proxy_http" = "yes"; then - enable_proxy_http=$module_default - elif test "$enable_proxy_http" = "most"; then + if test "$enable_session_dbd" = "static"; then + enable_session_dbd=static + elif test "$enable_session_dbd" = "yes"; then + enable_session_dbd=$module_default + elif test "$enable_session_dbd" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy_http=$module_default + enable_session_dbd=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_http=no + enable_session_dbd=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_http" = "maybe-all"; then + elif test "$enable_session_dbd" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy_http=$module_default + enable_session_dbd=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy_http=no + enable_session_dbd=no fi - elif test "$enable_proxy_http" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_http" != "no" ; then - enable_proxy_http=$module_default + elif test "$enable_session_dbd" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_session_dbd" != "no" ; then + enable_session_dbd=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy_http" != "no"; then + if test "$enable_session_dbd" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 $as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_http=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_http\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_http\"" >&2;} - elif test "$enable_proxy_http" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_http=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_http statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_http statically if mod_proxy is built shared\"" >&2;} + if test "$enable_session" = "no" ; then + enable_session_dbd=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_dbd\"" >&5 +$as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_dbd\"" >&2;} + elif test "$enable_session_dbd" = "static" && test "$enable_session" != "static" ; then + enable_session_dbd=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_dbd statically if mod_session is built shared\"" >&5 +$as_echo "$as_me: WARNING: \"cannot build mod_session_dbd statically if mod_session is built shared\"" >&2;} else : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_http" >&5 -$as_echo_n "checking whether to enable mod_proxy_http... " >&6; } - if test "$enable_proxy_http" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_dbd" >&5 +$as_echo_n "checking whether to enable mod_session_dbd... " >&6; } + if test "$enable_session_dbd" = "no"; then if test "$_apmod_required" = "no"; then _apmod_extra_msg=" (disabled)" else - as_fn_error $? "mod_proxy_http has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + as_fn_error $? "mod_session_dbd has been requested but can not be built due to prerequisite failures" "$LINENO" 5 fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_http$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_http$_apmod_extra_msg" >&6; } - if test "$enable_proxy_http" != "no"; then - case "$enable_proxy_http" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_dbd$_apmod_extra_msg" >&5 +$as_echo "$enable_session_dbd$_apmod_extra_msg" >&6; } + if test "$enable_session_dbd" != "no"; then + case "$enable_session_dbd" in static*) - MODLIST="$MODLIST proxy_http" - if test "proxy_http" = "so"; then + MODLIST="$MODLIST session_dbd" + if test "session_dbd" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy_http=`echo $enable_proxy_http|sed 's/shared,*//'` + enable_session_dbd=`echo $enable_session_dbd|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy_http" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_http" + DSO_MODULES="$DSO_MODULES session_dbd" + if test "$session_mods_enable" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_dbd" fi ;; esac - if test -z "$proxy_http_objs"; then - objects="mod_proxy_http.lo" + if test -z "$session_dbd_objects"; then + objects="mod_session_dbd.lo" else - objects="$proxy_http_objs" + objects="$session_dbd_objects" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_http.la" + libname="libmod_session_dbd.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_fcgi... " >&6; } - # Check whether --enable-proxy-fcgi was given. -if test "${enable_proxy_fcgi+set}" = set; then : - enableval=$enable_proxy_fcgi; force_proxy_fcgi=$enableval + + if test "x$INCLUDES" = "x"; then + test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\"" + INCLUDES="-I\$(top_srcdir)/$modpath_current" + else + apr_addto_bugger="-I\$(top_srcdir)/$modpath_current" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $INCLUDES; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES" + INCLUDES="$INCLUDES $i" + fi + done + fi + + + + echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done + if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then + MODULE_DIRS="$MODULE_DIRS $current_dir" + else + MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + fi + + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" + + + + + + + + current_dir=slotmem + modpath_current=modules/slotmem + modpath_static= + modpath_shared= + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + eval MOD_$var= + done + test -d slotmem || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_slotmem_shm" >&5 +$as_echo_n "checking whether to enable mod_slotmem_shm... " >&6; } + # Check whether --enable-slotmem-shm was given. +if test "${enable_slotmem_shm+set}" = set; then : + enableval=$enable_slotmem_shm; force_slotmem_shm=$enableval else - enable_proxy_fcgi=$proxy_mods_enable + enable_slotmem_shm=most fi _apmod_extra_msg="" - case "$enable_proxy_fcgi" in + case "$enable_slotmem_shm" in yes|static|shared) _apmod_required="yes" ;; @@ -23005,101 +24110,80 @@ fi ;; esac esac - if test "$enable_proxy_fcgi" = "static"; then - enable_proxy_fcgi=static - elif test "$enable_proxy_fcgi" = "yes"; then - enable_proxy_fcgi=$module_default - elif test "$enable_proxy_fcgi" = "most"; then + if test "$enable_slotmem_shm" = "static"; then + enable_slotmem_shm=static + elif test "$enable_slotmem_shm" = "yes"; then + enable_slotmem_shm=$module_default + elif test "$enable_slotmem_shm" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy_fcgi=$module_default + enable_slotmem_shm=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_fcgi=no + enable_slotmem_shm=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_fcgi" = "maybe-all"; then + elif test "$enable_slotmem_shm" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy_fcgi=$module_default + enable_slotmem_shm=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy_fcgi=no + enable_slotmem_shm=no fi - elif test "$enable_proxy_fcgi" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_fcgi" != "no" ; then - enable_proxy_fcgi=$module_default + elif test "$enable_slotmem_shm" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_slotmem_shm" != "no" ; then + enable_slotmem_shm=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy_fcgi" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_fcgi=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_fcgi\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_fcgi\"" >&2;} - elif test "$enable_proxy_fcgi" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_fcgi=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_fcgi statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_fcgi statically if mod_proxy is built shared\"" >&2;} - else + if test "$enable_slotmem_shm" != "no"; then : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fcgi" >&5 -$as_echo_n "checking whether to enable mod_proxy_fcgi... " >&6; } - if test "$enable_proxy_fcgi" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_proxy_fcgi has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_fcgi$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_fcgi$_apmod_extra_msg" >&6; } - if test "$enable_proxy_fcgi" != "no"; then - case "$enable_proxy_fcgi" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_slotmem_shm$_apmod_extra_msg" >&5 +$as_echo "$enable_slotmem_shm$_apmod_extra_msg" >&6; } + if test "$enable_slotmem_shm" != "no"; then + case "$enable_slotmem_shm" in static*) - MODLIST="$MODLIST proxy_fcgi" - if test "proxy_fcgi" = "so"; then + MODLIST="$MODLIST slotmem_shm" + if test "slotmem_shm" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy_fcgi=`echo $enable_proxy_fcgi|sed 's/shared,*//'` + enable_slotmem_shm=`echo $enable_slotmem_shm|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy_fcgi" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fcgi" + DSO_MODULES="$DSO_MODULES slotmem_shm" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_shm" fi ;; esac - if test -z "$proxy_fcgi_objs"; then - objects="mod_proxy_fcgi.lo" + if test -z ""; then + objects="mod_slotmem_shm.lo" else - objects="$proxy_fcgi_objs" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_fcgi.la" + libname="libmod_slotmem_shm.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; } - # Check whether --enable-proxy-scgi was given. -if test "${enable_proxy_scgi+set}" = set; then : - enableval=$enable_proxy_scgi; force_proxy_scgi=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_slotmem_plain" >&5 +$as_echo_n "checking whether to enable mod_slotmem_plain... " >&6; } + # Check whether --enable-slotmem-plain was given. +if test "${enable_slotmem_plain+set}" = set; then : + enableval=$enable_slotmem_plain; force_slotmem_plain=$enableval else - enable_proxy_scgi=$proxy_mods_enable + enable_slotmem_plain=maybe-all fi _apmod_extra_msg="" - case "$enable_proxy_scgi" in + case "$enable_slotmem_plain" in yes|static|shared) _apmod_required="yes" ;; @@ -23160,101 +24244,80 @@ fi ;; esac esac - if test "$enable_proxy_scgi" = "static"; then - enable_proxy_scgi=static - elif test "$enable_proxy_scgi" = "yes"; then - enable_proxy_scgi=$module_default - elif test "$enable_proxy_scgi" = "most"; then + if test "$enable_slotmem_plain" = "static"; then + enable_slotmem_plain=static + elif test "$enable_slotmem_plain" = "yes"; then + enable_slotmem_plain=$module_default + elif test "$enable_slotmem_plain" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy_scgi=$module_default + enable_slotmem_plain=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_scgi=no + enable_slotmem_plain=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_scgi" = "maybe-all"; then + elif test "$enable_slotmem_plain" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy_scgi=$module_default + enable_slotmem_plain=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy_scgi=no + enable_slotmem_plain=no fi - elif test "$enable_proxy_scgi" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_scgi" != "no" ; then - enable_proxy_scgi=$module_default + elif test "$enable_slotmem_plain" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_slotmem_plain" != "no" ; then + enable_slotmem_plain=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy_scgi" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_scgi=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_scgi\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_scgi\"" >&2;} - elif test "$enable_proxy_scgi" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_scgi=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_scgi statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_scgi statically if mod_proxy is built shared\"" >&2;} - else + if test "$enable_slotmem_plain" != "no"; then : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_scgi" >&5 -$as_echo_n "checking whether to enable mod_proxy_scgi... " >&6; } - if test "$enable_proxy_scgi" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_proxy_scgi has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_scgi$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_scgi$_apmod_extra_msg" >&6; } - if test "$enable_proxy_scgi" != "no"; then - case "$enable_proxy_scgi" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_slotmem_plain$_apmod_extra_msg" >&5 +$as_echo "$enable_slotmem_plain$_apmod_extra_msg" >&6; } + if test "$enable_slotmem_plain" != "no"; then + case "$enable_slotmem_plain" in static*) - MODLIST="$MODLIST proxy_scgi" - if test "proxy_scgi" = "so"; then + MODLIST="$MODLIST slotmem_plain" + if test "slotmem_plain" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy_scgi=`echo $enable_proxy_scgi|sed 's/shared,*//'` + enable_slotmem_plain=`echo $enable_slotmem_plain|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy_scgi" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_scgi" + DSO_MODULES="$DSO_MODULES slotmem_plain" + if test "" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_plain" fi ;; esac - if test -z "$proxy_scgi_objs"; then - objects="mod_proxy_scgi.lo" + if test -z ""; then + objects="mod_slotmem_plain.lo" else - objects="$proxy_scgi_objs" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_scgi.la" + libname="libmod_slotmem_plain.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_fdpass... " >&6; } - # Check whether --enable-proxy-fdpass was given. -if test "${enable_proxy_fdpass+set}" = set; then : - enableval=$enable_proxy_fdpass; force_proxy_fdpass=$enableval + + echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done + if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then + MODULE_DIRS="$MODULE_DIRS $current_dir" + else + MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + fi + + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" + + + + + + current_dir=ssl + modpath_current=modules/ssl + modpath_static= + modpath_shared= + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + eval MOD_$var= + done + test -d ssl || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk + + +ssl_objs="mod_ssl.lo ssl_engine_config.lo ssl_engine_init.lo ssl_engine_io.lo ssl_engine_kernel.lo ssl_engine_log.lo ssl_engine_mutex.lo ssl_engine_pphrase.lo ssl_engine_rand.lo ssl_engine_vars.lo ssl_scache.lo ssl_util_stapling.lo ssl_util.lo ssl_util_ssl.lo ssl_engine_ocsp.lo ssl_util_ocsp.lo " + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5 +$as_echo_n "checking whether to enable mod_ssl... " >&6; } + # Check whether --enable-ssl was given. +if test "${enable_ssl+set}" = set; then : + enableval=$enable_ssl; force_ssl=$enableval else - enable_proxy_fdpass=maybe-all + enable_ssl=most fi _apmod_extra_msg="" - case "$enable_proxy_fdpass" in + case "$enable_ssl" in yes|static|shared) _apmod_required="yes" ;; @@ -23315,581 +24412,678 @@ fi ;; esac esac - if test "$enable_proxy_fdpass" = "static"; then - enable_proxy_fdpass=static - elif test "$enable_proxy_fdpass" = "yes"; then - enable_proxy_fdpass=$module_default - elif test "$enable_proxy_fdpass" = "most"; then + if test "$enable_ssl" = "static"; then + enable_ssl=static + elif test "$enable_ssl" = "yes"; then + enable_ssl=$module_default + elif test "$enable_ssl" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy_fdpass=$module_default + enable_ssl=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_fdpass=no + enable_ssl=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_fdpass" = "maybe-all"; then + elif test "$enable_ssl" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy_fdpass=$module_default + enable_ssl=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy_fdpass=no + enable_ssl=no fi - elif test "$enable_proxy_fdpass" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_fdpass" != "no" ; then - enable_proxy_fdpass=$module_default + elif test "$enable_ssl" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_ssl" != "no" ; then + enable_ssl=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy_fdpass" != "no"; then + if test "$enable_ssl" != "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 $as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_fdpass=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_fdpass\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_fdpass\"" >&2;} - elif test "$enable_proxy_fdpass" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_fdpass=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_fdpass statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_fdpass statically if mod_proxy is built shared\"" >&2;} - else + : - ac_fn_c_check_decl "$LINENO" "CMSG_DATA" "ac_cv_have_decl_CMSG_DATA" " - #include - #include -" -if test "x$ac_cv_have_decl_CMSG_DATA" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5 +$as_echo_n "checking for OpenSSL... " >&6; } +if ${ac_cv_openssl+:} false; then : + $as_echo_n "(cached) " >&6 +else -fi + ac_cv_openssl=no + ap_openssl_found="" + ap_openssl_base="" + ap_openssl_libs="" + ap_openssl_mod_cflags="" + ap_openssl_mod_ldflags="" - if test $ac_cv_have_decl_CMSG_DATA = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your system does not support CMSG_DATA." >&5 -$as_echo "$as_me: WARNING: Your system does not support CMSG_DATA." >&2;} - enable_proxy_fdpass=no - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided OpenSSL base directory" >&5 +$as_echo_n "checking for user-provided OpenSSL base directory... " >&6; } - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_fdpass" >&5 -$as_echo_n "checking whether to enable mod_proxy_fdpass... " >&6; } - if test "$enable_proxy_fdpass" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_proxy_fdpass has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_fdpass$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_fdpass$_apmod_extra_msg" >&6; } - if test "$enable_proxy_fdpass" != "no"; then - case "$enable_proxy_fdpass" in - static*) - MODLIST="$MODLIST proxy_fdpass" - if test "proxy_fdpass" = "so"; then - sharedobjs=yes +# Check whether --with-ssl was given. +if test "${with_ssl+set}" = set; then : + withval=$with_ssl; + if test "x$withval" != "xyes" -a "x$withval" != "x"; then + ap_openssl_base="`cd $withval ; pwd`" fi - shared="";; - *) - enable_proxy_fdpass=`echo $enable_proxy_fdpass|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES proxy_fdpass" - if test "" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_fdpass" + +fi + + if test "x$ap_openssl_base" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_openssl_base" >&5 +$as_echo "$ap_openssl_base" >&6; } + fi + + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + + if test -n "$PKGCONFIG"; then + saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" + if test "x$ap_openssl_base" != "x" -a \ + -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then + PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH fi - ;; - esac + # Check whether --enable-ssl-staticlib-deps was given. +if test "${enable_ssl_staticlib_deps+set}" = set; then : + enableval=$enable_ssl_staticlib_deps; + if test "$enableval" = "yes"; then + PKGCONFIG_LIBOPTS="--static" + fi +fi - if test -z "$proxy_fdpass_objs"; then - objects="mod_proxy_fdpass.lo" + ap_openssl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors openssl`" + if test $? -eq 0; then + ap_openssl_found="yes" + pkglookup="`$PKGCONFIG --cflags-only-I openssl`" + + if test "x$CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"$pkglookup\"" + CPPFLAGS="$pkglookup" else - objects="$proxy_fdpass_objs" + apr_addto_bugger="$pkglookup" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" + CPPFLAGS="$CPPFLAGS $i" + fi + done fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_fdpass.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_wstunnel... " >&6; } - # Check whether --enable-proxy-wstunnel was given. -if test "${enable_proxy_wstunnel+set}" = set; then : - enableval=$enable_proxy_wstunnel; force_proxy_wstunnel=$enableval -else - enable_proxy_wstunnel=$proxy_mods_enable -fi - - _apmod_extra_msg="" - case "$enable_proxy_wstunnel" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_proxy_wstunnel" = "static"; then - enable_proxy_wstunnel=static - elif test "$enable_proxy_wstunnel" = "yes"; then - enable_proxy_wstunnel=$module_default - elif test "$enable_proxy_wstunnel" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_proxy_wstunnel=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_wstunnel=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_wstunnel" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_proxy_wstunnel=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_proxy_wstunnel=no - fi - elif test "$enable_proxy_wstunnel" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_wstunnel" != "no" ; then - enable_proxy_wstunnel=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_proxy_wstunnel" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_wstunnel=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_wstunnel\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_wstunnel\"" >&2;} - elif test "$enable_proxy_wstunnel" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_wstunnel=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_wstunnel statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_wstunnel statically if mod_proxy is built shared\"" >&2;} - else - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_wstunnel" >&5 -$as_echo_n "checking whether to enable mod_proxy_wstunnel... " >&6; } - if test "$enable_proxy_wstunnel" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_proxy_wstunnel has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$pkglookup\"" + LDFLAGS="$pkglookup" + else + apr_addto_bugger="$pkglookup" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" + fi + done fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_wstunnel$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_wstunnel$_apmod_extra_msg" >&6; } - if test "$enable_proxy_wstunnel" != "no"; then - case "$enable_proxy_wstunnel" in - static*) - MODLIST="$MODLIST proxy_wstunnel" - if test "proxy_wstunnel" = "so"; then - sharedobjs=yes + + + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$pkglookup\"" + MOD_LDFLAGS="$pkglookup" + else + apr_addto_bugger="$pkglookup" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi - shared="";; - *) - enable_proxy_wstunnel=`echo $enable_proxy_wstunnel|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES proxy_wstunnel" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_wstunnel" + done + fi + fi - ;; - esac + PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" + fi + if test "x$ap_openssl_base" != "x" -a "x$ap_openssl_found" = "x"; then - if test -z "$proxy_wstunnel_objs"; then - objects="mod_proxy_wstunnel.lo" + if test "x$CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$ap_openssl_base/include\"" + CPPFLAGS="-I$ap_openssl_base/include" else - objects="$proxy_wstunnel_objs" + apr_addto_bugger="-I$ap_openssl_base/include" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" + CPPFLAGS="$CPPFLAGS $i" + fi + done fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_wstunnel.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; } - # Check whether --enable-proxy-ajp was given. -if test "${enable_proxy_ajp+set}" = set; then : - enableval=$enable_proxy_ajp; force_proxy_ajp=$enableval -else - enable_proxy_ajp=$proxy_mods_enable -fi - - _apmod_extra_msg="" - case "$enable_proxy_ajp" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_proxy_ajp" = "static"; then - enable_proxy_ajp=static - elif test "$enable_proxy_ajp" = "yes"; then - enable_proxy_ajp=$module_default - elif test "$enable_proxy_ajp" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_proxy_ajp=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_ajp=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_ajp" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_proxy_ajp=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_proxy_ajp=no - fi - elif test "$enable_proxy_ajp" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_ajp" != "no" ; then - enable_proxy_ajp=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_proxy_ajp" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_ajp=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_ajp\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_ajp\"" >&2;} - elif test "$enable_proxy_ajp" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_ajp=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_ajp statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_ajp statically if mod_proxy is built shared\"" >&2;} - else - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_ajp" >&5 -$as_echo_n "checking whether to enable mod_proxy_ajp... " >&6; } - if test "$enable_proxy_ajp" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_proxy_ajp has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\"" + LDFLAGS="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" + fi + done fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_ajp$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_ajp$_apmod_extra_msg" >&6; } - if test "$enable_proxy_ajp" != "no"; then - case "$enable_proxy_ajp" in - static*) - MODLIST="$MODLIST proxy_ajp" - if test "proxy_ajp" = "so"; then - sharedobjs=yes + + + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\"" + MOD_LDFLAGS="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi - shared="";; - *) - enable_proxy_ajp=`echo $enable_proxy_ajp|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES proxy_ajp" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_ajp" + done + fi + fi - ;; - esac + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version >= 0.9.8a" >&5 +$as_echo_n "checking for OpenSSL version >= 0.9.8a... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ + +#if !defined(OPENSSL_VERSION_NUMBER) +#error "Missing OpenSSL version" +#endif +#if OPENSSL_VERSION_NUMBER < 0x0090801f +#error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT +#endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } + ac_cv_openssl=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5 +$as_echo "FAILED" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "x$ac_cv_openssl" = "xyes"; then + ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`" - if test -z "$proxy_ajp_objs"; then - objects="mod_proxy_ajp.lo" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_openssl_libs\"" + MOD_LDFLAGS="$ap_openssl_libs" else - objects="$proxy_ajp_objs" + apr_addto_bugger="$ap_openssl_libs" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" + fi + done fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_ajp.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; } - # Check whether --enable-proxy-balancer was given. -if test "${enable_proxy_balancer+set}" = set; then : - enableval=$enable_proxy_balancer; force_proxy_balancer=$enableval + + liberrors="" + for ac_header in openssl/engine.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "openssl/engine.h" "ac_cv_header_openssl_engine_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_engine_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_OPENSSL_ENGINE_H 1 +_ACEOF + +fi + +done + + for ac_func in SSLeay_version SSL_CTX_new +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + else - enable_proxy_balancer=$proxy_mods_enable + liberrors="yes" fi +done - _apmod_extra_msg="" - case "$enable_proxy_balancer" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_proxy_balancer" = "static"; then - enable_proxy_balancer=static - elif test "$enable_proxy_balancer" = "yes"; then - enable_proxy_balancer=$module_default - elif test "$enable_proxy_balancer" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_proxy_balancer=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_balancer=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_balancer" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_proxy_balancer=$module_default - _apmod_extra_msg=" ($module_selection)" + for ac_func in ENGINE_init ENGINE_load_builtin_engines RAND_egd +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + if test "x$liberrors" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL libraries are unusable" >&5 +$as_echo "$as_me: WARNING: OpenSSL libraries are unusable" >&2;} + fi else - enable_proxy_balancer=no + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL version is too old" >&5 +$as_echo "$as_me: WARNING: OpenSSL version is too old" >&2;} fi - elif test "$enable_proxy_balancer" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_balancer" != "no" ; then - enable_proxy_balancer=$module_default - _apmod_extra_msg=" ($module_selection)" + + CPPFLAGS="$saved_CPPFLAGS" + LIBS="$saved_LIBS" + LDFLAGS="$saved_LDFLAGS" + + ap_openssl_mod_cflags=$MOD_CFLAGS + ap_openssl_mod_ldflags=$MOD_LDFLAGS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_openssl" >&5 +$as_echo "$ac_cv_openssl" >&6; } + if test "x$ac_cv_openssl" = "xyes"; then + +$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h + + + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_openssl_mod_ldflags\"" + MOD_LDFLAGS="$ap_openssl_mod_ldflags" + else + apr_addto_bugger="$ap_openssl_mod_ldflags" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" + fi + done fi - if test "$enable_proxy_balancer" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_balancer=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_balancer\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_balancer\"" >&2;} - elif test "$enable_proxy_balancer" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_balancer=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_balancer statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_balancer statically if mod_proxy is built shared\"" >&2;} - else + + + if test "x$MOD_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"$ap_openssl_mod_cflags\"" + MOD_CFLAGS="$ap_openssl_mod_cflags" + else + apr_addto_bugger="$ap_openssl_mod_cflags" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_CFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" + MOD_CFLAGS="$MOD_CFLAGS $i" + fi + done + fi + + fi + + if test "$ac_cv_openssl" = "yes" ; then + if test "x$enable_ssl" = "xshared"; then + # The only symbol which needs to be exported is the module + # structure, so ask libtool to hide everything else: + + if test "x$MOD_SSL_LDADD" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_SSL_LDADD to \"-export-symbols-regex ssl_module\"" + MOD_SSL_LDADD="-export-symbols-regex ssl_module" + else + apr_addto_bugger="-export-symbols-regex ssl_module" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_SSL_LDADD; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_SSL_LDADD" + MOD_SSL_LDADD="$MOD_SSL_LDADD $i" + fi + done + fi + + fi + else + enable_ssl=no + fi + : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_balancer" >&5 -$as_echo_n "checking whether to enable mod_proxy_balancer... " >&6; } - if test "$enable_proxy_balancer" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5 +$as_echo_n "checking whether to enable mod_ssl... " >&6; } + if test "$enable_ssl" = "no"; then if test "$_apmod_required" = "no"; then _apmod_extra_msg=" (disabled)" else - as_fn_error $? "mod_proxy_balancer has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + as_fn_error $? "mod_ssl has been requested but can not be built due to prerequisite failures" "$LINENO" 5 fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_balancer$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_balancer$_apmod_extra_msg" >&6; } - if test "$enable_proxy_balancer" != "no"; then - case "$enable_proxy_balancer" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ssl$_apmod_extra_msg" >&5 +$as_echo "$enable_ssl$_apmod_extra_msg" >&6; } + if test "$enable_ssl" != "no"; then + case "$enable_ssl" in static*) - MODLIST="$MODLIST proxy_balancer" - if test "proxy_balancer" = "so"; then + MODLIST="$MODLIST ssl" + if test "ssl" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy_balancer=`echo $enable_proxy_balancer|sed 's/shared,*//'` + enable_ssl=`echo $enable_ssl|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy_balancer" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_balancer" + DSO_MODULES="$DSO_MODULES ssl" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ssl" fi ;; esac - if test -z "$proxy_balancer_objs"; then - objects="mod_proxy_balancer.lo" + if test -z "$ssl_objs"; then + objects="mod_ssl.lo" else - objects="$proxy_balancer_objs" + objects="$ssl_objs" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_balancer.la" + libname="libmod_ssl.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_proxy_express... " >&6; } - # Check whether --enable-proxy-express was given. -if test "${enable_proxy_express+set}" = set; then : - enableval=$enable_proxy_express; force_proxy_express=$enableval + if test "x$INCLUDES" = "x"; then + test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/$modpath_current\"" + INCLUDES="-I\$(top_srcdir)/$modpath_current" + else + apr_addto_bugger="-I\$(top_srcdir)/$modpath_current" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $INCLUDES; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES" + INCLUDES="$INCLUDES $i" + fi + done + fi + + + + echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done + if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then + MODULE_DIRS="$MODULE_DIRS $current_dir" + else + MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + fi + + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" + + + + + + + current_dir=test + modpath_current=modules/test + modpath_static= + modpath_shared= + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + eval MOD_$var= + done + test -d test || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_hook_export" >&5 +$as_echo_n "checking whether to enable mod_optional_hook_export... " >&6; } + # Check whether --enable-optional-hook-export was given. +if test "${enable_optional_hook_export+set}" = set; then : + enableval=$enable_optional_hook_export; force_optional_hook_export=$enableval else - enable_proxy_express=$proxy_mods_enable + enable_optional_hook_export=no fi _apmod_extra_msg="" - case "$enable_proxy_express" in + case "$enable_optional_hook_export" in yes|static|shared) _apmod_required="yes" ;; @@ -23951,80 +25201,59 @@ fi ;; esac esac - if test "$enable_proxy_express" = "static"; then - enable_proxy_express=static - elif test "$enable_proxy_express" = "yes"; then - enable_proxy_express=$module_default - elif test "$enable_proxy_express" = "most"; then + if test "$enable_optional_hook_export" = "static"; then + enable_optional_hook_export=static + elif test "$enable_optional_hook_export" = "yes"; then + enable_optional_hook_export=$module_default + elif test "$enable_optional_hook_export" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_proxy_express=$module_default + enable_optional_hook_export=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_proxy_express=no + enable_optional_hook_export=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_proxy_express" = "maybe-all"; then + elif test "$enable_optional_hook_export" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_proxy_express=$module_default + enable_optional_hook_export=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_proxy_express=no + enable_optional_hook_export=no fi - elif test "$enable_proxy_express" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_proxy_express" != "no" ; then - enable_proxy_express=$module_default + elif test "$enable_optional_hook_export" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_optional_hook_export" != "no" ; then + enable_optional_hook_export=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_proxy_express" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_proxy" = "no" ; then - enable_proxy_express=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_proxy is disabled but required for mod_proxy_express\"" >&5 -$as_echo "$as_me: WARNING: \"mod_proxy is disabled but required for mod_proxy_express\"" >&2;} - elif test "$enable_proxy_express" = "static" && test "$enable_proxy" != "static" ; then - enable_proxy_express=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_proxy_express statically if mod_proxy is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_proxy_express statically if mod_proxy is built shared\"" >&2;} - else + if test "$enable_optional_hook_export" != "no"; then : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_proxy_express" >&5 -$as_echo_n "checking whether to enable mod_proxy_express... " >&6; } - if test "$enable_proxy_express" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_proxy_express has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_proxy_express$_apmod_extra_msg" >&5 -$as_echo "$enable_proxy_express$_apmod_extra_msg" >&6; } - if test "$enable_proxy_express" != "no"; then - case "$enable_proxy_express" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_hook_export$_apmod_extra_msg" >&5 +$as_echo "$enable_optional_hook_export$_apmod_extra_msg" >&6; } + if test "$enable_optional_hook_export" != "no"; then + case "$enable_optional_hook_export" in static*) - MODLIST="$MODLIST proxy_express" - if test "proxy_express" = "so"; then + MODLIST="$MODLIST optional_hook_export" + if test "optional_hook_export" = "so"; then sharedobjs=yes fi shared="";; *) - enable_proxy_express=`echo $enable_proxy_express|sed 's/shared,*//'` + enable_optional_hook_export=`echo $enable_optional_hook_export|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES proxy_express" - if test "$proxy_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},proxy_express" + DSO_MODULES="$DSO_MODULES optional_hook_export" + if test "no" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_hook_export" fi ;; esac if test -z ""; then - objects="mod_proxy_express.lo" + objects="mod_optional_hook_export.lo" else objects="" fi @@ -24032,145 +25261,67 @@ $as_echo "$enable_proxy_express$_apmod_extra_msg" >&6; } if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_proxy_express.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - if eval val=\"\$MOD_$var\"; test -n "$val"; then - echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + else + apache_need_shared=yes + libname="mod_optional_hook_export.la" + shobjects=`echo $objects | sed 's/\.lo/.slo/g'` + modpath_shared="$modpath_shared $libname" + cat >>$modpath_current/modules.mk< $modpath_current/modules.mk - - -session_cookie_objects='mod_session_cookie.lo' -session_crypto_objects='mod_session_crypto.lo' -session_dbd_objects='mod_session_dbd.lo' -case "$host" in - *os2*) - # OS/2 DLLs must resolve all symbols at build time - # and we need some from main session module - session_cookie_objects="$session_cookie_objects mod_session.la" - session_crypto_objects="$session_crypto_objects mod_session.la" - session_dbd_objects="$session_dbd_objects mod_session.la" - ;; -esac + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session" >&5 -$as_echo_n "checking whether to enable mod_session... " >&6; } - # Check whether --enable-session was given. -if test "${enable_session+set}" = set; then : - enableval=$enable_session; force_session=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_hook_import" >&5 +$as_echo_n "checking whether to enable mod_optional_hook_import... " >&6; } + # Check whether --enable-optional-hook-import was given. +if test "${enable_optional_hook_import+set}" = set; then : + enableval=$enable_optional_hook_import; force_optional_hook_import=$enableval else - enable_session=most + enable_optional_hook_import=no fi _apmod_extra_msg="" - case "$enable_session" in + case "$enable_optional_hook_import" in yes|static|shared) _apmod_required="yes" ;; @@ -24184,59 +25335,59 @@ fi ;; esac esac - if test "$enable_session" = "static"; then - enable_session=static - elif test "$enable_session" = "yes"; then - enable_session=$module_default - elif test "$enable_session" = "most"; then + if test "$enable_optional_hook_import" = "static"; then + enable_optional_hook_import=static + elif test "$enable_optional_hook_import" = "yes"; then + enable_optional_hook_import=$module_default + elif test "$enable_optional_hook_import" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_session=$module_default + enable_optional_hook_import=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_session=no + enable_optional_hook_import=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_session" = "maybe-all"; then + elif test "$enable_optional_hook_import" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_session=$module_default + enable_optional_hook_import=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_session=no + enable_optional_hook_import=no fi - elif test "$enable_session" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_session" != "no" ; then - enable_session=$module_default + elif test "$enable_optional_hook_import" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_optional_hook_import" != "no" ; then + enable_optional_hook_import=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_session" != "no"; then + if test "$enable_optional_hook_import" != "no"; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session$_apmod_extra_msg" >&5 -$as_echo "$enable_session$_apmod_extra_msg" >&6; } - if test "$enable_session" != "no"; then - case "$enable_session" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_hook_import$_apmod_extra_msg" >&5 +$as_echo "$enable_optional_hook_import$_apmod_extra_msg" >&6; } + if test "$enable_optional_hook_import" != "no"; then + case "$enable_optional_hook_import" in static*) - MODLIST="$MODLIST session" - if test "session" = "so"; then + MODLIST="$MODLIST optional_hook_import" + if test "optional_hook_import" = "so"; then sharedobjs=yes fi shared="";; *) - enable_session=`echo $enable_session|sed 's/shared,*//'` + enable_optional_hook_import=`echo $enable_optional_hook_import|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES session" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session" + DSO_MODULES="$DSO_MODULES optional_hook_import" + if test "no" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_hook_import" fi ;; esac if test -z ""; then - objects="mod_session.lo" + objects="mod_optional_hook_import.lo" else objects="" fi @@ -24244,20 +25395,20 @@ $as_echo "$enable_session$_apmod_extra_msg" >&6; } if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_session.la" + libname="libmod_optional_hook_import.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_session_cookie... " >&6; } - # Check whether --enable-session-cookie was given. -if test "${enable_session_cookie+set}" = set; then : - enableval=$enable_session_cookie; force_session_cookie=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_fn_import" >&5 +$as_echo_n "checking whether to enable mod_optional_fn_import... " >&6; } + # Check whether --enable-optional-fn-import was given. +if test "${enable_optional_fn_import+set}" = set; then : + enableval=$enable_optional_fn_import; force_optional_fn_import=$enableval else - enable_session_cookie=$session_mods_enable + enable_optional_fn_import=no fi _apmod_extra_msg="" - case "$enable_session_cookie" in + case "$enable_optional_fn_import" in yes|static|shared) _apmod_required="yes" ;; @@ -24318,101 +25469,80 @@ fi ;; esac esac - if test "$enable_session_cookie" = "static"; then - enable_session_cookie=static - elif test "$enable_session_cookie" = "yes"; then - enable_session_cookie=$module_default - elif test "$enable_session_cookie" = "most"; then + if test "$enable_optional_fn_import" = "static"; then + enable_optional_fn_import=static + elif test "$enable_optional_fn_import" = "yes"; then + enable_optional_fn_import=$module_default + elif test "$enable_optional_fn_import" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_session_cookie=$module_default + enable_optional_fn_import=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_session_cookie=no + enable_optional_fn_import=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_session_cookie" = "maybe-all"; then + elif test "$enable_optional_fn_import" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_session_cookie=$module_default + enable_optional_fn_import=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_session_cookie=no + enable_optional_fn_import=no fi - elif test "$enable_session_cookie" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_session_cookie" != "no" ; then - enable_session_cookie=$module_default + elif test "$enable_optional_fn_import" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_optional_fn_import" != "no" ; then + enable_optional_fn_import=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_session_cookie" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_session" = "no" ; then - enable_session_cookie=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_cookie\"" >&5 -$as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_cookie\"" >&2;} - elif test "$enable_session_cookie" = "static" && test "$enable_session" != "static" ; then - enable_session_cookie=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_cookie statically if mod_session is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_session_cookie statically if mod_session is built shared\"" >&2;} - else + if test "$enable_optional_fn_import" != "no"; then : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_cookie" >&5 -$as_echo_n "checking whether to enable mod_session_cookie... " >&6; } - if test "$enable_session_cookie" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_session_cookie has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_cookie$_apmod_extra_msg" >&5 -$as_echo "$enable_session_cookie$_apmod_extra_msg" >&6; } - if test "$enable_session_cookie" != "no"; then - case "$enable_session_cookie" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_fn_import$_apmod_extra_msg" >&5 +$as_echo "$enable_optional_fn_import$_apmod_extra_msg" >&6; } + if test "$enable_optional_fn_import" != "no"; then + case "$enable_optional_fn_import" in static*) - MODLIST="$MODLIST session_cookie" - if test "session_cookie" = "so"; then + MODLIST="$MODLIST optional_fn_import" + if test "optional_fn_import" = "so"; then sharedobjs=yes fi shared="";; *) - enable_session_cookie=`echo $enable_session_cookie|sed 's/shared,*//'` + enable_optional_fn_import=`echo $enable_optional_fn_import|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES session_cookie" - if test "$session_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_cookie" + DSO_MODULES="$DSO_MODULES optional_fn_import" + if test "no" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_fn_import" fi ;; esac - if test -z "$session_cookie_objects"; then - objects="mod_session_cookie.lo" + if test -z ""; then + objects="mod_optional_fn_import.lo" else - objects="$session_cookie_objects" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_session_cookie.la" + libname="libmod_optional_fn_import.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ - -#if APU_HAVE_CRYPTO == 0 -#error no crypto support -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ap_HAVE_APR_CRYPTO="yes" -else - ap_HAVE_APR_CRYPTO="no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CPPFLAGS="$saved_CPPFLAGS" - if test $ap_HAVE_APR_CRYPTO = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your APR does not include SSL/EVP support. To enable it: configure --with-crypto" >&5 -$as_echo "$as_me: WARNING: Your APR does not include SSL/EVP support. To enable it: configure --with-crypto" >&2;} - if test "$enable_session_crypto" != "" -a "$enable_session_crypto" != "no"; then - as_fn_error $? "mod_session_crypto cannot be enabled" "$LINENO" 5 - fi - session_mods_enable_crypto="no" - fi -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_crypto" >&5 -$as_echo_n "checking whether to enable mod_session_crypto... " >&6; } - # Check whether --enable-session-crypto was given. -if test "${enable_session_crypto+set}" = set; then : - enableval=$enable_session_crypto; force_session_crypto=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_fn_export" >&5 +$as_echo_n "checking whether to enable mod_optional_fn_export... " >&6; } + # Check whether --enable-optional-fn-export was given. +if test "${enable_optional_fn_export+set}" = set; then : + enableval=$enable_optional_fn_export; force_optional_fn_export=$enableval else - enable_session_crypto=$session_mods_enable_crypto + enable_optional_fn_export=no fi _apmod_extra_msg="" - case "$enable_session_crypto" in + case "$enable_optional_fn_export" in yes|static|shared) _apmod_required="yes" ;; @@ -24513,105 +25603,80 @@ fi ;; esac esac - if test "$enable_session_crypto" = "static"; then - enable_session_crypto=static - elif test "$enable_session_crypto" = "yes"; then - enable_session_crypto=$module_default - elif test "$enable_session_crypto" = "most"; then + if test "$enable_optional_fn_export" = "static"; then + enable_optional_fn_export=static + elif test "$enable_optional_fn_export" = "yes"; then + enable_optional_fn_export=$module_default + elif test "$enable_optional_fn_export" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_session_crypto=$module_default + enable_optional_fn_export=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_session_crypto=no + enable_optional_fn_export=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_session_crypto" = "maybe-all"; then + elif test "$enable_optional_fn_export" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_session_crypto=$module_default + enable_optional_fn_export=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_session_crypto=no + enable_optional_fn_export=no fi - elif test "$enable_session_crypto" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_session_crypto" != "no" ; then - enable_session_crypto=$module_default + elif test "$enable_optional_fn_export" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_optional_fn_export" != "no" ; then + enable_optional_fn_export=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_session_crypto" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_session" = "no" ; then - enable_session_crypto=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_crypto\"" >&5 -$as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_crypto\"" >&2;} - elif test "$enable_session_crypto" = "static" && test "$enable_session" != "static" ; then - enable_session_crypto=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_crypto statically if mod_session is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_session_crypto statically if mod_session is built shared\"" >&2;} - else - -if test "$session_mods_enable_crypto" = "no" ; then - enable_session_crypto=no -fi - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_crypto" >&5 -$as_echo_n "checking whether to enable mod_session_crypto... " >&6; } - if test "$enable_session_crypto" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_session_crypto has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi + if test "$enable_optional_fn_export" != "no"; then + : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_crypto$_apmod_extra_msg" >&5 -$as_echo "$enable_session_crypto$_apmod_extra_msg" >&6; } - if test "$enable_session_crypto" != "no"; then - case "$enable_session_crypto" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_fn_export$_apmod_extra_msg" >&5 +$as_echo "$enable_optional_fn_export$_apmod_extra_msg" >&6; } + if test "$enable_optional_fn_export" != "no"; then + case "$enable_optional_fn_export" in static*) - MODLIST="$MODLIST session_crypto" - if test "session_crypto" = "so"; then + MODLIST="$MODLIST optional_fn_export" + if test "optional_fn_export" = "so"; then sharedobjs=yes fi shared="";; *) - enable_session_crypto=`echo $enable_session_crypto|sed 's/shared,*//'` + enable_optional_fn_export=`echo $enable_optional_fn_export|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES session_crypto" - if test "$session_mods_enable_crypto" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_crypto" + DSO_MODULES="$DSO_MODULES optional_fn_export" + if test "no" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_fn_export" fi ;; esac - if test -z "$session_crypto_objects"; then - objects="mod_session_crypto.lo" + if test -z ""; then + objects="mod_optional_fn_export.lo" else - objects="$session_crypto_objects" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_session_crypto.la" + libname="libmod_optional_fn_export.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_session_dbd... " >&6; } - # Check whether --enable-session-dbd was given. -if test "${enable_session_dbd+set}" = set; then : - enableval=$enable_session_dbd; force_session_dbd=$enableval + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_dialup" >&5 +$as_echo_n "checking whether to enable mod_dialup... " >&6; } + # Check whether --enable-dialup was given. +if test "${enable_dialup+set}" = set; then : + enableval=$enable_dialup; force_dialup=$enableval else - enable_session_dbd=$session_mods_enable + enable_dialup=maybe-all fi _apmod_extra_msg="" - case "$enable_session_dbd" in + case "$enable_dialup" in yes|static|shared) _apmod_required="yes" ;; @@ -24673,101 +25738,80 @@ fi ;; esac esac - if test "$enable_session_dbd" = "static"; then - enable_session_dbd=static - elif test "$enable_session_dbd" = "yes"; then - enable_session_dbd=$module_default - elif test "$enable_session_dbd" = "most"; then + if test "$enable_dialup" = "static"; then + enable_dialup=static + elif test "$enable_dialup" = "yes"; then + enable_dialup=$module_default + elif test "$enable_dialup" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_session_dbd=$module_default + enable_dialup=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_session_dbd=no + enable_dialup=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_session_dbd" = "maybe-all"; then + elif test "$enable_dialup" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_session_dbd=$module_default + enable_dialup=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_session_dbd=no + enable_dialup=no fi - elif test "$enable_session_dbd" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_session_dbd" != "no" ; then - enable_session_dbd=$module_default + elif test "$enable_dialup" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_dialup" != "no" ; then + enable_dialup=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_session_dbd" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - if test "$enable_session" = "no" ; then - enable_session_dbd=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"mod_session is disabled but required for mod_session_dbd\"" >&5 -$as_echo "$as_me: WARNING: \"mod_session is disabled but required for mod_session_dbd\"" >&2;} - elif test "$enable_session_dbd" = "static" && test "$enable_session" != "static" ; then - enable_session_dbd=no - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cannot build mod_session_dbd statically if mod_session is built shared\"" >&5 -$as_echo "$as_me: WARNING: \"cannot build mod_session_dbd statically if mod_session is built shared\"" >&2;} - else + if test "$enable_dialup" != "no"; then : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_session_dbd" >&5 -$as_echo_n "checking whether to enable mod_session_dbd... " >&6; } - if test "$enable_session_dbd" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_session_dbd has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_session_dbd$_apmod_extra_msg" >&5 -$as_echo "$enable_session_dbd$_apmod_extra_msg" >&6; } - if test "$enable_session_dbd" != "no"; then - case "$enable_session_dbd" in + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dialup$_apmod_extra_msg" >&5 +$as_echo "$enable_dialup$_apmod_extra_msg" >&6; } + if test "$enable_dialup" != "no"; then + case "$enable_dialup" in static*) - MODLIST="$MODLIST session_dbd" - if test "session_dbd" = "so"; then + MODLIST="$MODLIST dialup" + if test "dialup" = "so"; then sharedobjs=yes fi shared="";; *) - enable_session_dbd=`echo $enable_session_dbd|sed 's/shared,*//'` + enable_dialup=`echo $enable_dialup|sed 's/shared,*//'` sharedobjs=yes shared=yes - DSO_MODULES="$DSO_MODULES session_dbd" - if test "$session_mods_enable" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},session_dbd" + DSO_MODULES="$DSO_MODULES dialup" + if test "" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dialup" fi ;; esac - if test -z "$session_dbd_objects"; then - objects="mod_session_dbd.lo" + if test -z ""; then + objects="mod_dialup.lo" else - objects="$session_dbd_objects" + objects="" fi if test -z "$module_standalone"; then if test -z "$shared"; then # The filename of a convenience library must have a "lib" prefix: - libname="libmod_session_dbd.la" + libname="libmod_dialup.la" BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" modpath_static="$modpath_static $libname" cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 +$as_echo_n "checking for target platform... " >&6; } +case $host in +*pc-os2-emx*) + OS="os2" + OS_DIR=$OS + ;; +bs2000*) + OS="unix" + OS_DIR=$OS + ;; +*cygwin*) + OS="cygwin" + OS_DIR="unix" + ;; +*mingw32*) + OS="win32" + OS_DIR=$OS + ;; +*) + OS="unix" + OS_DIR=$OS;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OS" >&5 +$as_echo "$OS" >&6; } + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES os/${OS_DIR}/Makefile" - current_dir=slotmem - modpath_current=modules/slotmem - modpath_static= - modpath_shared= - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - eval MOD_$var= - done - test -d slotmem || $srcdir/build/mkdir.sh $modpath_current - > $modpath_current/modules.mk - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_slotmem_shm" >&5 -$as_echo_n "checking whether to enable mod_slotmem_shm... " >&6; } - # Check whether --enable-slotmem-shm was given. -if test "${enable_slotmem_shm+set}" = set; then : - enableval=$enable_slotmem_shm; force_slotmem_shm=$enableval -else - enable_slotmem_shm=most -fi - - _apmod_extra_msg="" - case "$enable_slotmem_shm" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_slotmem_shm" = "static"; then - enable_slotmem_shm=static - elif test "$enable_slotmem_shm" = "yes"; then - enable_slotmem_shm=$module_default - elif test "$enable_slotmem_shm" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_slotmem_shm=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_slotmem_shm=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_slotmem_shm" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_slotmem_shm=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_slotmem_shm=no - fi - elif test "$enable_slotmem_shm" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_slotmem_shm" != "no" ; then - enable_slotmem_shm=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_slotmem_shm" != "no"; then - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_slotmem_shm$_apmod_extra_msg" >&5 -$as_echo "$enable_slotmem_shm$_apmod_extra_msg" >&6; } - if test "$enable_slotmem_shm" != "no"; then - case "$enable_slotmem_shm" in - static*) - MODLIST="$MODLIST slotmem_shm" - if test "slotmem_shm" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_slotmem_shm=`echo $enable_slotmem_shm|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES slotmem_shm" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_shm" - fi - ;; - esac - - - if test -z ""; then - objects="mod_slotmem_shm.lo" - else - objects="" - fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_slotmem_shm.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 +$as_echo_n "checking for rlim_t... " >&6; } +if ${ac_cv_type_rlim_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main () +{ +rlim_t spoon; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + + ac_cv_type_rlim_t=yes + +else + ac_cv_type_rlim_t=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_rlim_t" >&5 +$as_echo "$ac_cv_type_rlim_t" >&6; } + if test "$ac_cv_type_rlim_t" = "no" ; then + +$as_echo "#define rlim_t int" >>confdefs.h + fi - APACHE_VAR_SUBST="$APACHE_VAR_SUBST MOD_SLOTMEM_SHM_LDADD" + for ac_header in sys/time.h sys/resource.h sys/sem.h sys/ipc.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + for ac_func in setsid killpg +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +fi + + + +for ac_header in bstring.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done - fi +for ac_func in syslog +do : + ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog" +if test "x$ac_cv_func_syslog" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYSLOG 1 +_ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_slotmem_plain" >&5 -$as_echo_n "checking whether to enable mod_slotmem_plain... " >&6; } - # Check whether --enable-slotmem-plain was given. -if test "${enable_slotmem_plain+set}" = set; then : - enableval=$enable_slotmem_plain; force_slotmem_plain=$enableval -else - enable_slotmem_plain=maybe-all fi +done - _apmod_extra_msg="" - case "$enable_slotmem_plain" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_slotmem_plain" = "static"; then - enable_slotmem_plain=static - elif test "$enable_slotmem_plain" = "yes"; then - enable_slotmem_plain=$module_default - elif test "$enable_slotmem_plain" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_slotmem_plain=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_slotmem_plain=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_slotmem_plain" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_slotmem_plain=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_slotmem_plain=no - fi - elif test "$enable_slotmem_plain" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_slotmem_plain" != "no" ; then - enable_slotmem_plain=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_slotmem_plain" != "no"; then - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_slotmem_plain$_apmod_extra_msg" >&5 -$as_echo "$enable_slotmem_plain$_apmod_extra_msg" >&6; } - if test "$enable_slotmem_plain" != "no"; then - case "$enable_slotmem_plain" in - static*) - MODLIST="$MODLIST slotmem_plain" - if test "slotmem_plain" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_slotmem_plain=`echo $enable_slotmem_plain|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES slotmem_plain" - if test "" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},slotmem_plain" - fi - ;; - esac + for ac_header in sys/times.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_times_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_TIMES_H 1 +_ACEOF - if test -z ""; then - objects="mod_slotmem_plain.lo" - else - objects="" - fi +fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_slotmem_plain.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>confdefs.h <<_ACEOF +#define HAVE_TIMES 1 +_ACEOF + +fi +done + + +# util_expr needs header files in server source dir + + if test "x$INCLUDES" = "x"; then + test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/server\"" + INCLUDES="-I\$(top_srcdir)/server" else - apr_addto_bugger="\$(MOD_SLOTMEM_PLAIN_LDADD)" + apr_addto_bugger="-I\$(top_srcdir)/server" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $AP_LIBS; do + for j in $INCLUDES; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to AP_LIBS" - AP_LIBS="$AP_LIBS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES" + INCLUDES="$INCLUDES $i" fi done fi - fi - else - apache_need_shared=yes - libname="mod_slotmem_plain.la" - shobjects=`echo $objects | sed 's/\.lo/.slo/g'` - modpath_shared="$modpath_shared $libname" - cat >>$modpath_current/modules.mk<conftest.$ac_ext +/* end confdefs.h. */ - fi +#include +#if APR_HAS_THREADS +YES_IS_DEFINED +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then : + ac_cv_define_APR_HAS_THREADS=yes +else + ac_cv_define_APR_HAS_THREADS=no +fi +rm -f conftest* +CPPFLAGS=$apr_old_cppflags - echo "DISTCLEAN_TARGETS = modules.mk" >> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - if eval val=\"\$MOD_$var\"; test -n "$val"; then - echo "MOD_$var = $val" >> $modpath_current/modules.mk - fi - done - if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then - MODULE_DIRS="$MODULE_DIRS $current_dir" - else - MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" - fi - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" +have_threaded_sig_graceful=yes +case $host in + *-linux-*) + case `uname -r` in + 2.0* ) + have_threaded_sig_graceful=no + ;; + esac + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether APR supports thread-safe pollsets" >&5 +$as_echo_n "checking whether APR supports thread-safe pollsets... " >&6; } +if ${ac_cv_have_threadsafe_pollset+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-apple-darwin[1-9].*) + if test -z "$ac_cv_func_kqueue"; then + test "x$silent" != "xyes" && echo " setting ac_cv_func_kqueue to \"no\"" + ac_cv_func_kqueue="no" + fi - current_dir=ssl - modpath_current=modules/ssl - modpath_static= - modpath_shared= - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - eval MOD_$var= - done - test -d ssl || $srcdir/build/mkdir.sh $modpath_current - > $modpath_current/modules.mk + ;; + esac + for ac_func in kqueue port_create epoll_create +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF +fi +done -ssl_objs="mod_ssl.lo ssl_engine_config.lo ssl_engine_init.lo ssl_engine_io.lo ssl_engine_kernel.lo ssl_engine_log.lo ssl_engine_mutex.lo ssl_engine_pphrase.lo ssl_engine_rand.lo ssl_engine_vars.lo ssl_scache.lo ssl_util_stapling.lo ssl_util.lo ssl_util_ssl.lo ssl_engine_ocsp.lo ssl_util_ocsp.lo " + if test "$ac_cv_func_kqueue$ac_cv_func_port_create$ac_cv_func_epoll_create" != "nonono"; then + ac_cv_have_threadsafe_pollset=yes + else + ac_cv_have_threadsafe_pollset=no + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5 -$as_echo_n "checking whether to enable mod_ssl... " >&6; } - # Check whether --enable-ssl was given. -if test "${enable_ssl+set}" = set; then : - enableval=$enable_ssl; force_ssl=$enableval -else - enable_ssl=most fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_threadsafe_pollset" >&5 +$as_echo "$ac_cv_have_threadsafe_pollset" >&6; } - _apmod_extra_msg="" - case "$enable_ssl" in - yes|static|shared) - _apmod_required="yes" - ;; +case $APR_VERSION in + 1.4*) + apr_has_skiplist=no + ;; *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" + apr_has_skiplist=yes +esac + +case $host in + *mingw32* | *os2-emx*) + forking_mpms_supported=no ;; - *) - _apmod_required="yes" + *) + forking_mpms_supported=yes ;; - esac - esac - if test "$enable_ssl" = "static"; then - enable_ssl=static - elif test "$enable_ssl" = "yes"; then - enable_ssl=$module_default - elif test "$enable_ssl" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_ssl=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_ssl=no +esac + + + +ap_mpm_is_supported () +{ + eval "tmp=\$ap_supported_mpm_$1" + if test -z "$tmp"; then + return 1 + else + return 0 fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_ssl" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_ssl=$module_default - _apmod_extra_msg=" ($module_selection)" +} + +ap_mpm_supports_shared () +{ + eval "tmp=\$ap_supported_mpm_$1" + if test "$tmp" = "shared"; then + return 0 else - enable_ssl=no + return 1 fi - elif test "$enable_ssl" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_ssl" != "no" ; then - enable_ssl=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_ssl" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 -$as_echo "checking dependencies" >&6; } - : +} +ap_mpm_is_threaded () +{ + if test "$mpm_build" = "shared" -a ac_cv_define_APR_HAS_THREADS = "yes"; then + return 0 + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5 -$as_echo_n "checking for OpenSSL... " >&6; } -if ${ac_cv_openssl+:} false; then : - $as_echo_n "(cached) " >&6 -else + for mpm in $ap_enabled_mpms; do + eval "tmp=\$ap_threaded_mpm_$mpm" + if test "$tmp" = "yes"; then + return 0 + fi + done + return 1 +} - ac_cv_openssl=no - ap_openssl_found="" - ap_openssl_base="" - ap_openssl_libs="" +ap_mpm_is_enabled () +{ + eval "tmp=\$ap_enabled_mpm_$1" + if test "$tmp" = "yes"; then + return 0 + else + return 1 + fi +} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided OpenSSL base directory" >&5 -$as_echo_n "checking for user-provided OpenSSL base directory... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if event MPM supports this platform" >&5 +$as_echo_n "checking if event MPM supports this platform... " >&6; } +if test $forking_mpms_supported != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5 +$as_echo "no - This is not a forking platform" >&6; } +elif test $ac_cv_define_APR_HAS_THREADS != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR does not support threads" >&5 +$as_echo "no - APR does not support threads" >&6; } +elif test $have_threaded_sig_graceful != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - SIG_GRACEFUL cannot be used with a threaded MPM" >&5 +$as_echo "no - SIG_GRACEFUL cannot be used with a threaded MPM" >&6; } +elif test $ac_cv_have_threadsafe_pollset != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR_POLLSET_THREADSAFE is not supported" >&5 +$as_echo "no - APR_POLLSET_THREADSAFE is not supported" >&6; } +elif test $apr_has_skiplist != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR skiplist is not available" >&5 +$as_echo "no - APR skiplist is not available" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -# Check whether --with-ssl was given. -if test "${with_ssl+set}" = set; then : - withval=$with_ssl; - if test "x$withval" != "xyes" -a "x$withval" != "x"; then - ap_openssl_base="`cd $withval ; pwd`" - fi + if test "yes" = "yes"; then + eval "ap_supported_mpm_event=shared" + ap_supported_shared_mpms="$ap_supported_shared_mpms event " + else + eval "ap_supported_mpm_event=static" + fi + if test "yes" = "yes"; then + eval "ap_threaded_mpm_event=yes" + fi fi - if test "x$ap_openssl_base" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mpmt_os2 MPM supports this platform" >&5 +$as_echo_n "checking if mpmt_os2 MPM supports this platform... " >&6; } +case $host in + *os2-emx*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + if test "no" = "yes"; then + eval "ap_supported_mpm_mpmt_os2=shared" + ap_supported_shared_mpms="$ap_supported_shared_mpms mpmt_os2 " else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_openssl_base" >&5 -$as_echo "$ap_openssl_base" >&6; } + eval "ap_supported_mpm_mpmt_os2=static" + fi + if test "yes" = "yes"; then + eval "ap_threaded_mpm_mpmt_os2=yes" fi - saved_CPPFLAGS="$CPPFLAGS" - saved_LIBS="$LIBS" - saved_LDFLAGS="$LDFLAGS" + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; +esac - if test -n "$PKGCONFIG"; then - saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" - if test "x$ap_openssl_base" != "x" -a \ - -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then - PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" - export PKG_CONFIG_PATH - fi - # Check whether --enable-ssl-staticlib-deps was given. -if test "${enable_ssl_staticlib_deps+set}" = set; then : - enableval=$enable_ssl_staticlib_deps; - if test "$enableval" = "yes"; then - PKGCONFIG_LIBOPTS="--static" - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if prefork MPM supports this platform" >&5 +$as_echo_n "checking if prefork MPM supports this platform... " >&6; } +if test $forking_mpms_supported != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5 +$as_echo "no - This is not a forking platform" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -fi + if test "yes" = "yes"; then + eval "ap_supported_mpm_prefork=shared" + ap_supported_shared_mpms="$ap_supported_shared_mpms prefork " + else + eval "ap_supported_mpm_prefork=static" + fi + if test "no" = "yes"; then + eval "ap_threaded_mpm_prefork=yes" + fi - ap_openssl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors openssl`" - if test $? -eq 0; then - ap_openssl_found="yes" - pkglookup="`$PKGCONFIG --cflags-only-I openssl`" +fi - if test "x$CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"$pkglookup\"" - CPPFLAGS="$pkglookup" - else - apr_addto_bugger="$pkglookup" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $CPPFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" - CPPFLAGS="$CPPFLAGS $i" - fi - done - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if WinNT MPM supports this platform" >&5 +$as_echo_n "checking if WinNT MPM supports this platform... " >&6; } +case $host in + *mingw32*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + if test "no" = "yes"; then + eval "ap_supported_mpm_winnt=shared" + ap_supported_shared_mpms="$ap_supported_shared_mpms winnt " + else + eval "ap_supported_mpm_winnt=static" + fi + if test "yes" = "yes"; then + eval "ap_threaded_mpm_winnt=yes" + fi - if test "x$MOD_CFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"$pkglookup\"" - MOD_CFLAGS="$pkglookup" - else - apr_addto_bugger="$pkglookup" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $MOD_CFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" - MOD_CFLAGS="$MOD_CFLAGS $i" - fi - done - fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if worker MPM supports this platform" >&5 +$as_echo_n "checking if worker MPM supports this platform... " >&6; } +if test $forking_mpms_supported != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5 +$as_echo "no - This is not a forking platform" >&6; } +elif test $ac_cv_define_APR_HAS_THREADS != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR does not support threads" >&5 +$as_echo "no - APR does not support threads" >&6; } +elif test $have_threaded_sig_graceful != yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - SIG_GRACEFUL cannot be used with a threaded MPM" >&5 +$as_echo "no - SIG_GRACEFUL cannot be used with a threaded MPM" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - if test "x$ab_CFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting ab_CFLAGS to \"$pkglookup\"" - ab_CFLAGS="$pkglookup" - else - apr_addto_bugger="$pkglookup" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $ab_CFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to ab_CFLAGS" - ab_CFLAGS="$ab_CFLAGS $i" - fi - done - fi + if test "yes" = "yes"; then + eval "ap_supported_mpm_worker=shared" + ap_supported_shared_mpms="$ap_supported_shared_mpms worker " + else + eval "ap_supported_mpm_worker=static" + fi + if test "yes" = "yes"; then + eval "ap_threaded_mpm_worker=yes" + fi - pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L openssl`" +fi - if test "x$LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$pkglookup\"" - LDFLAGS="$pkglookup" - else - apr_addto_bugger="$pkglookup" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $LDFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" - LDFLAGS="$LDFLAGS $i" - fi - done - fi +htpasswd_LTFLAGS="" +htdigest_LTFLAGS="" +rotatelogs_LTFLAGS="" +logresolve_LTFLAGS="" +htdbm_LTFLAGS="" +ab_LTFLAGS="" +checkgid_LTFLAGS="" +htcacheclean_LTFLAGS="" +httxt2dbm_LTFLAGS="" +fcgistarter_LTFLAGS="" +# Check whether --enable-static-support was given. +if test "${enable_static_support+set}" = set; then : + enableval=$enable_static_support; +if test "$enableval" = "yes" ; then - if test "x$MOD_LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$pkglookup\"" - MOD_LDFLAGS="$pkglookup" + if test "x$htpasswd_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting htpasswd_LTFLAGS to \"-static\"" + htpasswd_LTFLAGS="-static" else - apr_addto_bugger="$pkglookup" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $MOD_LDFLAGS; do + for j in $htpasswd_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" - MOD_LDFLAGS="$MOD_LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to htpasswd_LTFLAGS" + htpasswd_LTFLAGS="$htpasswd_LTFLAGS $i" fi done fi - pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other openssl`" - if test "x$LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$pkglookup\"" - LDFLAGS="$pkglookup" + if test "x$htdigest_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting htdigest_LTFLAGS to \"-static\"" + htdigest_LTFLAGS="-static" else - apr_addto_bugger="$pkglookup" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $LDFLAGS; do + for j in $htdigest_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" - LDFLAGS="$LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to htdigest_LTFLAGS" + htdigest_LTFLAGS="$htdigest_LTFLAGS $i" fi done fi - if test "x$MOD_LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$pkglookup\"" - MOD_LDFLAGS="$pkglookup" + if test "x$rotatelogs_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting rotatelogs_LTFLAGS to \"-static\"" + rotatelogs_LTFLAGS="-static" else - apr_addto_bugger="$pkglookup" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $MOD_LDFLAGS; do + for j in $rotatelogs_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" - MOD_LDFLAGS="$MOD_LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to rotatelogs_LTFLAGS" + rotatelogs_LTFLAGS="$rotatelogs_LTFLAGS $i" fi done fi - fi - PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" - fi - - if test "x$ap_openssl_base" != "x" -a "x$ap_openssl_found" = "x"; then - if test "x$CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$ap_openssl_base/include\"" - CPPFLAGS="-I$ap_openssl_base/include" + if test "x$logresolve_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting logresolve_LTFLAGS to \"-static\"" + logresolve_LTFLAGS="-static" else - apr_addto_bugger="-I$ap_openssl_base/include" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $CPPFLAGS; do + for j in $logresolve_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" - CPPFLAGS="$CPPFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to logresolve_LTFLAGS" + logresolve_LTFLAGS="$logresolve_LTFLAGS $i" fi done fi - if test "x$MOD_CFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"-I$ap_openssl_base/include\"" - MOD_CFLAGS="-I$ap_openssl_base/include" + if test "x$htdbm_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting htdbm_LTFLAGS to \"-static\"" + htdbm_LTFLAGS="-static" else - apr_addto_bugger="-I$ap_openssl_base/include" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $MOD_CFLAGS; do + for j in $htdbm_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" - MOD_CFLAGS="$MOD_CFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to htdbm_LTFLAGS" + htdbm_LTFLAGS="$htdbm_LTFLAGS $i" fi done fi - if test "x$ab_CFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting ab_CFLAGS to \"-I$ap_openssl_base/include\"" - ab_CFLAGS="-I$ap_openssl_base/include" + if test "x$ab_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting ab_LTFLAGS to \"-static\"" + ab_LTFLAGS="-static" else - apr_addto_bugger="-I$ap_openssl_base/include" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $ab_CFLAGS; do + for j in $ab_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to ab_CFLAGS" - ab_CFLAGS="$ab_CFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to ab_LTFLAGS" + ab_LTFLAGS="$ab_LTFLAGS $i" fi done fi - if test "x$LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting LDFLAGS to \"-L$ap_openssl_base/lib\"" - LDFLAGS="-L$ap_openssl_base/lib" + if test "x$checkgid_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting checkgid_LTFLAGS to \"-static\"" + checkgid_LTFLAGS="-static" else - apr_addto_bugger="-L$ap_openssl_base/lib" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $LDFLAGS; do + for j in $checkgid_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" - LDFLAGS="$LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to checkgid_LTFLAGS" + checkgid_LTFLAGS="$checkgid_LTFLAGS $i" fi done fi - if test "x$MOD_LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"-L$ap_openssl_base/lib\"" - MOD_LDFLAGS="-L$ap_openssl_base/lib" + if test "x$htcacheclean_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting htcacheclean_LTFLAGS to \"-static\"" + htcacheclean_LTFLAGS="-static" else - apr_addto_bugger="-L$ap_openssl_base/lib" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $MOD_LDFLAGS; do + for j in $htcacheclean_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" - MOD_LDFLAGS="$MOD_LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to htcacheclean_LTFLAGS" + htcacheclean_LTFLAGS="$htcacheclean_LTFLAGS $i" fi done fi - if test "x$ap_platform_runtime_link_flag" != "x"; then - if test "x$LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\"" - LDFLAGS="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + if test "x$httxt2dbm_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting httxt2dbm_LTFLAGS to \"-static\"" + httxt2dbm_LTFLAGS="-static" else - apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $LDFLAGS; do + for j in $httxt2dbm_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" - LDFLAGS="$LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to httxt2dbm_LTFLAGS" + httxt2dbm_LTFLAGS="$httxt2dbm_LTFLAGS $i" fi done fi - if test "x$MOD_LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\"" - MOD_LDFLAGS="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + if test "x$fcgistarter_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting fcgistarter_LTFLAGS to \"-static\"" + fcgistarter_LTFLAGS="-static" else - apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $MOD_LDFLAGS; do + for j in $fcgistarter_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" - MOD_LDFLAGS="$MOD_LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to fcgistarter_LTFLAGS" + fcgistarter_LTFLAGS="$fcgistarter_LTFLAGS $i" fi done fi - fi - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version >= 0.9.8a" >&5 -$as_echo_n "checking for OpenSSL version >= 0.9.8a... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ +fi -#if !defined(OPENSSL_VERSION_NUMBER) -#error "Missing OpenSSL version" -#endif -#if OPENSSL_VERSION_NUMBER < 0x0090801f -#error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT -#endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } - ac_cv_openssl=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5 -$as_echo "FAILED" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "x$ac_cv_openssl" = "xyes"; then - ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`" - if test "x$MOD_LDFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_openssl_libs\"" - MOD_LDFLAGS="$ap_openssl_libs" +# Check whether --enable-static-htpasswd was given. +if test "${enable_static_htpasswd+set}" = set; then : + enableval=$enable_static_htpasswd; +if test "$enableval" = "yes" ; then + + if test "x$htpasswd_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting htpasswd_LTFLAGS to \"-static\"" + htpasswd_LTFLAGS="-static" else - apr_addto_bugger="$ap_openssl_libs" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $MOD_LDFLAGS; do + for j in $htpasswd_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" - MOD_LDFLAGS="$MOD_LDFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to htpasswd_LTFLAGS" + htpasswd_LTFLAGS="$htpasswd_LTFLAGS $i" fi done fi +else - if test "x$LIBS" = "x"; then - test "x$silent" != "xyes" && echo " setting LIBS to \"$ap_openssl_libs\"" - LIBS="$ap_openssl_libs" + if test "x$htpasswd_LTFLAGS" = "x-static"; then + test "x$silent" != "xyes" && echo " nulling htpasswd_LTFLAGS" + htpasswd_LTFLAGS="" else - apr_addto_bugger="$ap_openssl_libs" + apr_new_bugger="" + apr_removed=0 + for i in $htpasswd_LTFLAGS; do + if test "x$i" != "x-static"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 + fi + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-static\" from htpasswd_LTFLAGS" + htpasswd_LTFLAGS=$apr_new_bugger + fi + fi + +fi + +fi + + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST htpasswd_LTFLAGS" + + + +# Check whether --enable-static-htdigest was given. +if test "${enable_static_htdigest+set}" = set; then : + enableval=$enable_static_htdigest; +if test "$enableval" = "yes" ; then + + if test "x$htdigest_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting htdigest_LTFLAGS to \"-static\"" + htdigest_LTFLAGS="-static" + else + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $LIBS; do + for j in $htdigest_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to LIBS" - LIBS="$LIBS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to htdigest_LTFLAGS" + htdigest_LTFLAGS="$htdigest_LTFLAGS $i" fi done fi +else - test "x$silent" != "xyes" && echo " forcing ab_LDFLAGS to \"$MOD_LDFLAGS\"" - ab_LDFLAGS="$MOD_LDFLAGS" - - - APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_CFLAGS" - + if test "x$htdigest_LTFLAGS" = "x-static"; then + test "x$silent" != "xyes" && echo " nulling htdigest_LTFLAGS" + htdigest_LTFLAGS="" + else + apr_new_bugger="" + apr_removed=0 + for i in $htdigest_LTFLAGS; do + if test "x$i" != "x-static"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 + fi + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-static\" from htdigest_LTFLAGS" + htdigest_LTFLAGS=$apr_new_bugger + fi + fi +fi - APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_LDFLAGS" +fi + APACHE_VAR_SUBST="$APACHE_VAR_SUBST htdigest_LTFLAGS" - liberrors="" - for ac_header in openssl/engine.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "openssl/engine.h" "ac_cv_header_openssl_engine_h" "$ac_includes_default" -if test "x$ac_cv_header_openssl_engine_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_OPENSSL_ENGINE_H 1 -_ACEOF -fi -done +# Check whether --enable-static-rotatelogs was given. +if test "${enable_static_rotatelogs+set}" = set; then : + enableval=$enable_static_rotatelogs; +if test "$enableval" = "yes" ; then - for ac_func in SSLeay_version SSL_CTX_new -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + if test "x$rotatelogs_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting rotatelogs_LTFLAGS to \"-static\"" + rotatelogs_LTFLAGS="-static" + else + apr_addto_bugger="-static" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $rotatelogs_LTFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to rotatelogs_LTFLAGS" + rotatelogs_LTFLAGS="$rotatelogs_LTFLAGS $i" + fi + done + fi else - liberrors="yes" -fi -done - - for ac_func in ENGINE_init ENGINE_load_builtin_engines RAND_egd -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - if test "x$liberrors" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL libraries are unusable" >&5 -$as_echo "$as_me: WARNING: OpenSSL libraries are unusable" >&2;} + if test "x$rotatelogs_LTFLAGS" = "x-static"; then + test "x$silent" != "xyes" && echo " nulling rotatelogs_LTFLAGS" + rotatelogs_LTFLAGS="" + else + apr_new_bugger="" + apr_removed=0 + for i in $rotatelogs_LTFLAGS; do + if test "x$i" != "x-static"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL version is too old" >&5 -$as_echo "$as_me: WARNING: OpenSSL version is too old" >&2;} + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-static\" from rotatelogs_LTFLAGS" + rotatelogs_LTFLAGS=$apr_new_bugger fi + fi - CPPFLAGS="$saved_CPPFLAGS" - LIBS="$saved_LIBS" - LDFLAGS="$saved_LDFLAGS" +fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_openssl" >&5 -$as_echo "$ac_cv_openssl" >&6; } - if test "x$ac_cv_openssl" = "xyes"; then -$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h - fi + APACHE_VAR_SUBST="$APACHE_VAR_SUBST rotatelogs_LTFLAGS" - if test "$ac_cv_openssl" = "yes" ; then - if test "x$enable_ssl" = "xshared"; then - # The only symbol which needs to be exported is the module - # structure, so ask libtool to hide everything else: - if test "x$MOD_SSL_LDADD" = "x"; then - test "x$silent" != "xyes" && echo " setting MOD_SSL_LDADD to \"-export-symbols-regex ssl_module\"" - MOD_SSL_LDADD="-export-symbols-regex ssl_module" + +# Check whether --enable-static-logresolve was given. +if test "${enable_static_logresolve+set}" = set; then : + enableval=$enable_static_logresolve; +if test "$enableval" = "yes" ; then + + if test "x$logresolve_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting logresolve_LTFLAGS to \"-static\"" + logresolve_LTFLAGS="-static" else - apr_addto_bugger="-export-symbols-regex ssl_module" + apr_addto_bugger="-static" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $MOD_SSL_LDADD; do + for j in $logresolve_LTFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_SSL_LDADD" - MOD_SSL_LDADD="$MOD_SSL_LDADD $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to logresolve_LTFLAGS" + logresolve_LTFLAGS="$logresolve_LTFLAGS $i" fi done fi - fi - else - enable_ssl=no - fi +else - : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_ssl" >&5 -$as_echo_n "checking whether to enable mod_ssl... " >&6; } - if test "$enable_ssl" = "no"; then - if test "$_apmod_required" = "no"; then - _apmod_extra_msg=" (disabled)" - else - as_fn_error $? "mod_ssl has been requested but can not be built due to prerequisite failures" "$LINENO" 5 - fi - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ssl$_apmod_extra_msg" >&5 -$as_echo "$enable_ssl$_apmod_extra_msg" >&6; } - if test "$enable_ssl" != "no"; then - case "$enable_ssl" in - static*) - MODLIST="$MODLIST ssl" - if test "ssl" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_ssl=`echo $enable_ssl|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES ssl" - if test "most" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},ssl" + if test "x$logresolve_LTFLAGS" = "x-static"; then + test "x$silent" != "xyes" && echo " nulling logresolve_LTFLAGS" + logresolve_LTFLAGS="" + else + apr_new_bugger="" + apr_removed=0 + for i in $logresolve_LTFLAGS; do + if test "x$i" != "x-static"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 fi - ;; - esac + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-static\" from logresolve_LTFLAGS" + logresolve_LTFLAGS=$apr_new_bugger + fi + fi + +fi + +fi + + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST logresolve_LTFLAGS" - if test -z "$ssl_objs"; then - objects="mod_ssl.lo" - else - objects="$ssl_objs" - fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_ssl.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - if eval val=\"\$MOD_$var\"; test -n "$val"; then - echo "MOD_$var = $val" >> $modpath_current/modules.mk - fi - done - if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then - MODULE_DIRS="$MODULE_DIRS $current_dir" + if test "x$ab_LTFLAGS" = "x-static"; then + test "x$silent" != "xyes" && echo " nulling ab_LTFLAGS" + ab_LTFLAGS="" else - MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + apr_new_bugger="" + apr_removed=0 + for i in $ab_LTFLAGS; do + if test "x$i" != "x-static"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 + fi + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-static\" from ab_LTFLAGS" + ab_LTFLAGS=$apr_new_bugger + fi fi - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" - +fi +fi + APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_LTFLAGS" - current_dir=test - modpath_current=modules/test - modpath_static= - modpath_shared= - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - eval MOD_$var= - done - test -d test || $srcdir/build/mkdir.sh $modpath_current - > $modpath_current/modules.mk +# Check whether --enable-static-checkgid was given. +if test "${enable_static_checkgid+set}" = set; then : + enableval=$enable_static_checkgid; +if test "$enableval" = "yes" ; then + if test "x$checkgid_LTFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting checkgid_LTFLAGS to \"-static\"" + checkgid_LTFLAGS="-static" + else + apr_addto_bugger="-static" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $checkgid_LTFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to checkgid_LTFLAGS" + checkgid_LTFLAGS="$checkgid_LTFLAGS $i" + fi + done + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_optional_hook_export" >&5 -$as_echo_n "checking whether to enable mod_optional_hook_export... " >&6; } - # Check whether --enable-optional-hook-export was given. -if test "${enable_optional_hook_export+set}" = set; then : - enableval=$enable_optional_hook_export; force_optional_hook_export=$enableval else - enable_optional_hook_export=no -fi - _apmod_extra_msg="" - case "$enable_optional_hook_export" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_optional_hook_export" = "static"; then - enable_optional_hook_export=static - elif test "$enable_optional_hook_export" = "yes"; then - enable_optional_hook_export=$module_default - elif test "$enable_optional_hook_export" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_optional_hook_export=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_optional_hook_export=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_optional_hook_export" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_optional_hook_export=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_optional_hook_export=no + if test "x$checkgid_LTFLAGS" = "x-static"; then + test "x$silent" != "xyes" && echo " nulling checkgid_LTFLAGS" + checkgid_LTFLAGS="" + else + apr_new_bugger="" + apr_removed=0 + for i in $checkgid_LTFLAGS; do + if test "x$i" != "x-static"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 + fi + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-static\" from checkgid_LTFLAGS" + checkgid_LTFLAGS=$apr_new_bugger fi - elif test "$enable_optional_hook_export" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_optional_hook_export" != "no" ; then - enable_optional_hook_export=$module_default - _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_optional_hook_export" != "no"; then - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_hook_export$_apmod_extra_msg" >&5 -$as_echo "$enable_optional_hook_export$_apmod_extra_msg" >&6; } - if test "$enable_optional_hook_export" != "no"; then - case "$enable_optional_hook_export" in - static*) - MODLIST="$MODLIST optional_hook_export" - if test "optional_hook_export" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_optional_hook_export=`echo $enable_optional_hook_export|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES optional_hook_export" - if test "no" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_hook_export" - fi - ;; - esac +fi - if test -z ""; then - objects="mod_optional_hook_export.lo" - else - objects="" - fi +fi + + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST checkgid_LTFLAGS" - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_optional_hook_export.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_optional_hook_import... " >&6; } - # Check whether --enable-optional-hook-import was given. -if test "${enable_optional_hook_import+set}" = set; then : - enableval=$enable_optional_hook_import; force_optional_hook_import=$enableval -else - enable_optional_hook_import=no fi - _apmod_extra_msg="" - case "$enable_optional_hook_import" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_optional_hook_import" = "static"; then - enable_optional_hook_import=static - elif test "$enable_optional_hook_import" = "yes"; then - enable_optional_hook_import=$module_default - elif test "$enable_optional_hook_import" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_optional_hook_import=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_optional_hook_import=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_optional_hook_import" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_optional_hook_import=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_optional_hook_import=no - fi - elif test "$enable_optional_hook_import" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_optional_hook_import" != "no" ; then - enable_optional_hook_import=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_optional_hook_import" != "no"; then - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_hook_import$_apmod_extra_msg" >&5 -$as_echo "$enable_optional_hook_import$_apmod_extra_msg" >&6; } - if test "$enable_optional_hook_import" != "no"; then - case "$enable_optional_hook_import" in - static*) - MODLIST="$MODLIST optional_hook_import" - if test "optional_hook_import" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_optional_hook_import=`echo $enable_optional_hook_import|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES optional_hook_import" - if test "no" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_hook_import" - fi - ;; - esac + APACHE_VAR_SUBST="$APACHE_VAR_SUBST htcacheclean_LTFLAGS" - if test -z ""; then - objects="mod_optional_hook_import.lo" - else - objects="" - fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_optional_hook_import.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_optional_fn_import... " >&6; } - # Check whether --enable-optional-fn-import was given. -if test "${enable_optional_fn_import+set}" = set; then : - enableval=$enable_optional_fn_import; force_optional_fn_import=$enableval else - enable_optional_fn_import=no -fi - _apmod_extra_msg="" - case "$enable_optional_fn_import" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_optional_fn_import" = "static"; then - enable_optional_fn_import=static - elif test "$enable_optional_fn_import" = "yes"; then - enable_optional_fn_import=$module_default - elif test "$enable_optional_fn_import" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_optional_fn_import=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_optional_fn_import=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_optional_fn_import" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_optional_fn_import=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_optional_fn_import=no - fi - elif test "$enable_optional_fn_import" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_optional_fn_import" != "no" ; then - enable_optional_fn_import=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_optional_fn_import" != "no"; then - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_fn_import$_apmod_extra_msg" >&5 -$as_echo "$enable_optional_fn_import$_apmod_extra_msg" >&6; } - if test "$enable_optional_fn_import" != "no"; then - case "$enable_optional_fn_import" in - static*) - MODLIST="$MODLIST optional_fn_import" - if test "optional_fn_import" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_optional_fn_import=`echo $enable_optional_fn_import|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES optional_fn_import" - if test "no" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_fn_import" + if test "x$httxt2dbm" = "x-static"; then + test "x$silent" != "xyes" && echo " nulling httxt2dbm" + httxt2dbm="" + else + apr_new_bugger="" + apr_removed=0 + for i in $httxt2dbm; do + if test "x$i" != "x-static"; then + apr_new_bugger="$apr_new_bugger $i" + else + apr_removed=1 fi - ;; - esac + done + if test $apr_removed = "1"; then + test "x$silent" != "xyes" && echo " removed \"-static\" from httxt2dbm" + httxt2dbm=$apr_new_bugger + fi + fi +fi - if test -z ""; then - objects="mod_optional_fn_import.lo" - else - objects="" - fi +fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_optional_fn_import.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_optional_fn_export... " >&6; } - # Check whether --enable-optional-fn-export was given. -if test "${enable_optional_fn_export+set}" = set; then : - enableval=$enable_optional_fn_export; force_optional_fn_export=$enableval +# Configure or check which of the non-portable support programs can be enabled. + +NONPORTABLE_SUPPORT="" +case $host in + *mingw*) + ;; + *) + NONPORTABLE_SUPPORT="checkgid fcgistarter" + ;; +esac + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST NONPORTABLE_SUPPORT" + + + +# Configure the ulimit -n command used by apachectl. + +case $host in + *aix*) + # this works in any locale, unlike the default command below, which + # fails in a non-English locale if the hard limit is unlimited + # since the display of the limit will translate "unlimited", but + # ulimit only accepts English "unlimited" on input + APACHECTL_ULIMIT="ulimit -S -n unlimited" + ;; + *alpha*-dec-osf*) + # Tru64: -H is for setting, not retrieving + APACHECTL_ULIMIT="ulimit -S -n \`ulimit -h -n\`" + ;; + *) + if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT >/dev/null 2>&1; then + APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`" + else + APACHECTL_ULIMIT="" + fi + ;; +esac + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST APACHECTL_ULIMIT" + + + + + + current_dir=http2 + modpath_current=modules/http2 + modpath_static= + modpath_shared= + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + eval MOD_$var= + done + test -d http2 || $srcdir/build/mkdir.sh $modpath_current + > $modpath_current/modules.mk + + +http2_objs="mod_http2.lo h2_alt_svc.lo h2_bucket_eoc.lo h2_bucket_eos.lo h2_config.lo h2_conn.lo h2_conn_io.lo h2_ctx.lo h2_filter.lo h2_from_h1.lo h2_h2.lo h2_int_queue.lo h2_io.lo h2_io_set.lo h2_mplx.lo h2_ngn_shed.lo h2_push.lo h2_request.lo h2_response.lo h2_session.lo h2_stream.lo h2_switch.lo h2_task.lo h2_task_input.lo h2_task_output.lo h2_util.lo h2_worker.lo h2_workers.lo " + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_http2" >&5 +$as_echo_n "checking whether to enable mod_http2... " >&6; } + # Check whether --enable-http2 was given. +if test "${enable_http2+set}" = set; then : + enableval=$enable_http2; force_http2=$enableval else - enable_optional_fn_export=no + enable_http2=most fi _apmod_extra_msg="" - case "$enable_optional_fn_export" in + case "$enable_http2" in yes|static|shared) _apmod_required="yes" ;; @@ -26331,1581 +27224,1306 @@ fi ;; esac esac - if test "$enable_optional_fn_export" = "static"; then - enable_optional_fn_export=static - elif test "$enable_optional_fn_export" = "yes"; then - enable_optional_fn_export=$module_default - elif test "$enable_optional_fn_export" = "most"; then + if test "$enable_http2" = "static"; then + enable_http2=static + elif test "$enable_http2" = "yes"; then + enable_http2=$module_default + elif test "$enable_http2" = "most"; then if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ "$module_selection" = "reallyall" then - enable_optional_fn_export=$module_default + enable_http2=$module_default elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_optional_fn_export=no + enable_http2=no fi _apmod_extra_msg=" ($module_selection)" - elif test "$enable_optional_fn_export" = "maybe-all"; then + elif test "$enable_http2" = "maybe-all"; then if test "$module_selection" = "all" -o "$module_selection" = "reallyall" then - enable_optional_fn_export=$module_default + enable_http2=$module_default _apmod_extra_msg=" ($module_selection)" else - enable_optional_fn_export=no + enable_http2=no fi - elif test "$enable_optional_fn_export" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_optional_fn_export" != "no" ; then - enable_optional_fn_export=$module_default + elif test "$enable_http2" = "no" -a "$module_selection" = "reallyall" -a \ + "$force_http2" != "no" ; then + enable_http2=$module_default _apmod_extra_msg=" ($module_selection)" fi - if test "$enable_optional_fn_export" != "no"; then + if test "$enable_http2" != "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking dependencies" >&5 +$as_echo "checking dependencies" >&6; } : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_optional_fn_export$_apmod_extra_msg" >&5 -$as_echo "$enable_optional_fn_export$_apmod_extra_msg" >&6; } - if test "$enable_optional_fn_export" != "no"; then - case "$enable_optional_fn_export" in - static*) - MODLIST="$MODLIST optional_fn_export" - if test "optional_fn_export" = "so"; then - sharedobjs=yes + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5 +$as_echo_n "checking for OpenSSL... " >&6; } +if ${ac_cv_openssl+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_cv_openssl=no + ap_openssl_found="" + ap_openssl_base="" + ap_openssl_libs="" + ap_openssl_mod_cflags="" + ap_openssl_mod_ldflags="" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided OpenSSL base directory" >&5 +$as_echo_n "checking for user-provided OpenSSL base directory... " >&6; } + +# Check whether --with-ssl was given. +if test "${with_ssl+set}" = set; then : + withval=$with_ssl; + if test "x$withval" != "xyes" -a "x$withval" != "x"; then + ap_openssl_base="`cd $withval ; pwd`" fi - shared="";; - *) - enable_optional_fn_export=`echo $enable_optional_fn_export|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES optional_fn_export" - if test "no" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},optional_fn_export" + +fi + + if test "x$ap_openssl_base" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_openssl_base" >&5 +$as_echo "$ap_openssl_base" >&6; } + fi + + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + + if test -n "$PKGCONFIG"; then + saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" + if test "x$ap_openssl_base" != "x" -a \ + -f "${ap_openssl_base}/lib/pkgconfig/openssl.pc"; then + PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH fi - ;; - esac + # Check whether --enable-ssl-staticlib-deps was given. +if test "${enable_ssl_staticlib_deps+set}" = set; then : + enableval=$enable_ssl_staticlib_deps; + if test "$enableval" = "yes"; then + PKGCONFIG_LIBOPTS="--static" + fi +fi - if test -z ""; then - objects="mod_optional_fn_export.lo" + ap_openssl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors openssl`" + if test $? -eq 0; then + ap_openssl_found="yes" + pkglookup="`$PKGCONFIG --cflags-only-I openssl`" + + if test "x$CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"$pkglookup\"" + CPPFLAGS="$pkglookup" else - objects="" + apr_addto_bugger="$pkglookup" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $CPPFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" + CPPFLAGS="$CPPFLAGS $i" + fi + done fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_optional_fn_export.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<&5 -$as_echo_n "checking whether to enable mod_dialup... " >&6; } - # Check whether --enable-dialup was given. -if test "${enable_dialup+set}" = set; then : - enableval=$enable_dialup; force_dialup=$enableval -else - enable_dialup=maybe-all -fi + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other openssl`" - _apmod_extra_msg="" - case "$enable_dialup" in - yes|static|shared) - _apmod_required="yes" - ;; - *) - case "$module_selection" in - reallyall|all|most) - _apmod_required="no" - ;; - *) - _apmod_required="yes" - ;; - esac - esac - if test "$enable_dialup" = "static"; then - enable_dialup=static - elif test "$enable_dialup" = "yes"; then - enable_dialup=$module_default - elif test "$enable_dialup" = "most"; then - if test "$module_selection" = "most" -o "$module_selection" = "all" -o \ - "$module_selection" = "reallyall" - then - enable_dialup=$module_default - elif test "$module_selection" = "few" -o "$module_selection" = "none"; then - enable_dialup=no - fi - _apmod_extra_msg=" ($module_selection)" - elif test "$enable_dialup" = "maybe-all"; then - if test "$module_selection" = "all" -o "$module_selection" = "reallyall" - then - enable_dialup=$module_default - _apmod_extra_msg=" ($module_selection)" - else - enable_dialup=no - fi - elif test "$enable_dialup" = "no" -a "$module_selection" = "reallyall" -a \ - "$force_dialup" != "no" ; then - enable_dialup=$module_default - _apmod_extra_msg=" ($module_selection)" - fi - if test "$enable_dialup" != "no"; then - : - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dialup$_apmod_extra_msg" >&5 -$as_echo "$enable_dialup$_apmod_extra_msg" >&6; } - if test "$enable_dialup" != "no"; then - case "$enable_dialup" in - static*) - MODLIST="$MODLIST dialup" - if test "dialup" = "so"; then - sharedobjs=yes - fi - shared="";; - *) - enable_dialup=`echo $enable_dialup|sed 's/shared,*//'` - sharedobjs=yes - shared=yes - DSO_MODULES="$DSO_MODULES dialup" - if test "" = "yes" ; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},dialup" + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$pkglookup\"" + LDFLAGS="$pkglookup" + else + apr_addto_bugger="$pkglookup" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" fi - ;; - esac + done + fi - if test -z ""; then - objects="mod_dialup.lo" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$pkglookup\"" + MOD_LDFLAGS="$pkglookup" else - objects="" + apr_addto_bugger="$pkglookup" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" + fi + done fi - if test -z "$module_standalone"; then - if test -z "$shared"; then - # The filename of a convenience library must have a "lib" prefix: - libname="libmod_dialup.la" - BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" - modpath_static="$modpath_static $libname" - cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk - echo "static = $modpath_static" >> $modpath_current/modules.mk - echo "shared = $modpath_shared" >> $modpath_current/modules.mk - for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do - if eval val=\"\$MOD_$var\"; test -n "$val"; then - echo "MOD_$var = $val" >> $modpath_current/modules.mk - fi - done - if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then - MODULE_DIRS="$MODULE_DIRS $current_dir" + if test "x$ab_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting ab_CFLAGS to \"-I$ap_openssl_base/include\"" + ab_CFLAGS="-I$ap_openssl_base/include" else - MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + apr_addto_bugger="-I$ap_openssl_base/include" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $ab_CFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to ab_CFLAGS" + ab_CFLAGS="$ab_CFLAGS $i" + fi + done fi - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for target platform" >&5 -$as_echo_n "checking for target platform... " >&6; } - -case $host in -*pc-os2-emx*) - OS="os2" - OS_DIR=$OS - ;; -bs2000*) - OS="unix" - OS_DIR=$OS - ;; -*cygwin*) - OS="cygwin" - OS_DIR="unix" - ;; -*mingw32*) - OS="win32" - OS_DIR=$OS - ;; -*) - OS="unix" - OS_DIR=$OS;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OS" >&5 -$as_echo "$OS" >&6; } - - APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES os/${OS_DIR}/Makefile" - - -if test "$OS" = "os2" ; then - if test "x$CFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting CFLAGS to \"-DOS2 -O2\"" - CFLAGS="-DOS2 -O2" + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"-L$ap_openssl_base/lib\"" + LDFLAGS="-L$ap_openssl_base/lib" else - apr_addto_bugger="-DOS2 -O2" + apr_addto_bugger="-L$ap_openssl_base/lib" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $CFLAGS; do + for j in $LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to CFLAGS" - CFLAGS="$CFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" fi done fi -fi - -if test "$OS" = "unix" ; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5 -$as_echo_n "checking for rlim_t... " >&6; } -if ${ac_cv_type_rlim_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include - -int -main () -{ -rlim_t spoon; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - ac_cv_type_rlim_t=yes - -else - ac_cv_type_rlim_t=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_rlim_t" >&5 -$as_echo "$ac_cv_type_rlim_t" >&6; } - if test "$ac_cv_type_rlim_t" = "no" ; then - -$as_echo "#define rlim_t int" >>confdefs.h - - fi - - - for ac_header in sys/time.h sys/resource.h sys/sem.h sys/ipc.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - for ac_func in setsid killpg -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -fi - - - -for ac_header in bstring.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - -for ac_func in syslog -do : - ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog" -if test "x$ac_cv_func_syslog" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYSLOG 1 -_ACEOF - -fi -done - - - for ac_header in sys/times.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/times.h" "ac_cv_header_sys_times_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_times_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TIMES_H 1 -_ACEOF - -fi - -done - - for ac_func in times -do : - ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times" -if test "x$ac_cv_func_times" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_TIMES 1 -_ACEOF - -fi -done + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"-L$ap_openssl_base/lib\"" + MOD_LDFLAGS="-L$ap_openssl_base/lib" + else + apr_addto_bugger="-L$ap_openssl_base/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" + fi + done + fi -# util_expr needs header files in server source dir + if test "x$ap_platform_runtime_link_flag" != "x"; then - if test "x$INCLUDES" = "x"; then - test "x$silent" != "xyes" && echo " setting INCLUDES to \"-I\$(top_srcdir)/server\"" - INCLUDES="-I\$(top_srcdir)/server" + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\"" + LDFLAGS="$ap_platform_runtime_link_flag$ap_openssl_base/lib" else - apr_addto_bugger="-I\$(top_srcdir)/server" + apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $INCLUDES; do + for j in $LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to INCLUDES" - INCLUDES="$INCLUDES $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" fi done fi + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_platform_runtime_link_flag$ap_openssl_base/lib\"" + MOD_LDFLAGS="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + else + apr_addto_bugger="$ap_platform_runtime_link_flag$ap_openssl_base/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" + fi + done + fi + fi + fi -apr_old_cppflags=$CPPFLAGS -CPPFLAGS="$CPPFLAGS $INCLUDES" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL version >= 0.9.8a" >&5 +$as_echo_n "checking for OpenSSL version >= 0.9.8a... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +int +main () +{ -#include -#if APR_HAS_THREADS -YES_IS_DEFINED +#if !defined(OPENSSL_VERSION_NUMBER) +#error "Missing OpenSSL version" #endif - +#if OPENSSL_VERSION_NUMBER < 0x0090801f +#error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT +#endif + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "YES_IS_DEFINED" >/dev/null 2>&1; then : - ac_cv_define_APR_HAS_THREADS=yes +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } + ac_cv_openssl=yes else - ac_cv_define_APR_HAS_THREADS=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5 +$as_echo "FAILED" >&6; } fi -rm -f conftest* - -CPPFLAGS=$apr_old_cppflags - - -have_threaded_sig_graceful=yes -case $host in - *-linux-*) - case `uname -r` in - 2.0* ) - have_threaded_sig_graceful=no - ;; - esac - ;; -esac - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether APR supports thread-safe pollsets" >&5 -$as_echo_n "checking whether APR supports thread-safe pollsets... " >&6; } -if ${ac_cv_have_threadsafe_pollset+:} false; then : - $as_echo_n "(cached) " >&6 -else +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - case $host in - *-apple-darwin[1-9].*) + if test "x$ac_cv_openssl" = "xyes"; then + ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`" - if test -z "$ac_cv_func_kqueue"; then - test "x$silent" != "xyes" && echo " setting ac_cv_func_kqueue to \"no\"" - ac_cv_func_kqueue="no" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_openssl_libs\"" + MOD_LDFLAGS="$ap_openssl_libs" + else + apr_addto_bugger="$ap_openssl_libs" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" + fi + done fi - ;; - esac - for ac_func in kqueue port_create epoll_create -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - if test "$ac_cv_func_kqueue$ac_cv_func_port_create$ac_cv_func_epoll_create" != "nonono"; then - ac_cv_have_threadsafe_pollset=yes - else - ac_cv_have_threadsafe_pollset=no - fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_threadsafe_pollset" >&5 -$as_echo "$ac_cv_have_threadsafe_pollset" >&6; } - -case $APR_VERSION in - 1.4*) - apr_has_skiplist=no - ;; - *) - apr_has_skiplist=yes -esac - -case $host in - *mingw32* | *os2-emx*) - forking_mpms_supported=no - ;; - *) - forking_mpms_supported=yes - ;; -esac + if test "x$LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LIBS to \"$ap_openssl_libs\"" + LIBS="$ap_openssl_libs" + else + apr_addto_bugger="$ap_openssl_libs" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LIBS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LIBS" + LIBS="$LIBS $i" + fi + done + fi -ap_mpm_is_supported () -{ - eval "tmp=\$ap_supported_mpm_$1" - if test -z "$tmp"; then - return 1 - else - return 0 - fi -} + test "x$silent" != "xyes" && echo " forcing ab_LDFLAGS to \"$MOD_LDFLAGS\"" + ab_LDFLAGS="$MOD_LDFLAGS" -ap_mpm_supports_shared () -{ - eval "tmp=\$ap_supported_mpm_$1" - if test "$tmp" = "shared"; then - return 0 - else - return 1 - fi -} -ap_mpm_is_threaded () -{ - if test "$mpm_build" = "shared" -a ac_cv_define_APR_HAS_THREADS = "yes"; then - return 0 - fi + APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_CFLAGS" - for mpm in $ap_enabled_mpms; do - eval "tmp=\$ap_threaded_mpm_$mpm" - if test "$tmp" = "yes"; then - return 0 - fi - done - return 1 -} -ap_mpm_is_enabled () -{ - eval "tmp=\$ap_enabled_mpm_$1" - if test "$tmp" = "yes"; then - return 0 - else - return 1 - fi -} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if event MPM supports this platform" >&5 -$as_echo_n "checking if event MPM supports this platform... " >&6; } -if test $forking_mpms_supported != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5 -$as_echo "no - This is not a forking platform" >&6; } -elif test $ac_cv_define_APR_HAS_THREADS != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR does not support threads" >&5 -$as_echo "no - APR does not support threads" >&6; } -elif test $have_threaded_sig_graceful != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - SIG_GRACEFUL cannot be used with a threaded MPM" >&5 -$as_echo "no - SIG_GRACEFUL cannot be used with a threaded MPM" >&6; } -elif test $ac_cv_have_threadsafe_pollset != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR_POLLSET_THREADSAFE is not supported" >&5 -$as_echo "no - APR_POLLSET_THREADSAFE is not supported" >&6; } -elif test $apr_has_skiplist != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR skiplist is not available" >&5 -$as_echo "no - APR skiplist is not available" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_LDFLAGS" - if test "yes" = "yes"; then - eval "ap_supported_mpm_event=shared" - ap_supported_shared_mpms="$ap_supported_shared_mpms event " - else - eval "ap_supported_mpm_event=static" - fi - if test "yes" = "yes"; then - eval "ap_threaded_mpm_event=yes" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if mpmt_os2 MPM supports this platform" >&5 -$as_echo_n "checking if mpmt_os2 MPM supports this platform... " >&6; } -case $host in - *os2-emx*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + liberrors="" + for ac_header in openssl/engine.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "openssl/engine.h" "ac_cv_header_openssl_engine_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_engine_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_OPENSSL_ENGINE_H 1 +_ACEOF - if test "no" = "yes"; then - eval "ap_supported_mpm_mpmt_os2=shared" - ap_supported_shared_mpms="$ap_supported_shared_mpms mpmt_os2 " - else - eval "ap_supported_mpm_mpmt_os2=static" - fi - if test "yes" = "yes"; then - eval "ap_threaded_mpm_mpmt_os2=yes" - fi +fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; -esac +done + + for ac_func in SSLeay_version SSL_CTX_new +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if prefork MPM supports this platform" >&5 -$as_echo_n "checking if prefork MPM supports this platform... " >&6; } -if test $forking_mpms_supported != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5 -$as_echo "no - This is not a forking platform" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + liberrors="yes" +fi +done - if test "yes" = "yes"; then - eval "ap_supported_mpm_prefork=shared" - ap_supported_shared_mpms="$ap_supported_shared_mpms prefork " - else - eval "ap_supported_mpm_prefork=static" - fi - if test "no" = "yes"; then - eval "ap_threaded_mpm_prefork=yes" - fi + for ac_func in ENGINE_init ENGINE_load_builtin_engines RAND_egd +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if WinNT MPM supports this platform" >&5 -$as_echo_n "checking if WinNT MPM supports this platform... " >&6; } -case $host in - *mingw32*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - if test "no" = "yes"; then - eval "ap_supported_mpm_winnt=shared" - ap_supported_shared_mpms="$ap_supported_shared_mpms winnt " + if test "x$liberrors" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL libraries are unusable" >&5 +$as_echo "$as_me: WARNING: OpenSSL libraries are unusable" >&2;} + fi else - eval "ap_supported_mpm_winnt=static" - fi - if test "yes" = "yes"; then - eval "ap_threaded_mpm_winnt=yes" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenSSL version is too old" >&5 +$as_echo "$as_me: WARNING: OpenSSL version is too old" >&2;} fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; -esac - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if worker MPM supports this platform" >&5 -$as_echo_n "checking if worker MPM supports this platform... " >&6; } -if test $forking_mpms_supported != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - This is not a forking platform" >&5 -$as_echo "no - This is not a forking platform" >&6; } -elif test $ac_cv_define_APR_HAS_THREADS != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - APR does not support threads" >&5 -$as_echo "no - APR does not support threads" >&6; } -elif test $have_threaded_sig_graceful != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - SIG_GRACEFUL cannot be used with a threaded MPM" >&5 -$as_echo "no - SIG_GRACEFUL cannot be used with a threaded MPM" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + CPPFLAGS="$saved_CPPFLAGS" + LIBS="$saved_LIBS" + LDFLAGS="$saved_LDFLAGS" - if test "yes" = "yes"; then - eval "ap_supported_mpm_worker=shared" - ap_supported_shared_mpms="$ap_supported_shared_mpms worker " - else - eval "ap_supported_mpm_worker=static" - fi - if test "yes" = "yes"; then - eval "ap_threaded_mpm_worker=yes" - fi + ap_openssl_mod_cflags=$MOD_CFLAGS + ap_openssl_mod_ldflags=$MOD_LDFLAGS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_openssl" >&5 +$as_echo "$ac_cv_openssl" >&6; } + if test "x$ac_cv_openssl" = "xyes"; then -htpasswd_LTFLAGS="" -htdigest_LTFLAGS="" -rotatelogs_LTFLAGS="" -logresolve_LTFLAGS="" -htdbm_LTFLAGS="" -ab_LTFLAGS="" -checkgid_LTFLAGS="" -htcacheclean_LTFLAGS="" -httxt2dbm_LTFLAGS="" -fcgistarter_LTFLAGS="" +$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h -# Check whether --enable-static-support was given. -if test "${enable_static_support+set}" = set; then : - enableval=$enable_static_support; -if test "$enableval" = "yes" ; then - if test "x$htpasswd_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htpasswd_LTFLAGS to \"-static\"" - htpasswd_LTFLAGS="-static" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_openssl_mod_ldflags\"" + MOD_LDFLAGS="$ap_openssl_mod_ldflags" else - apr_addto_bugger="-static" + apr_addto_bugger="$ap_openssl_mod_ldflags" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htpasswd_LTFLAGS; do + for j in $MOD_LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htpasswd_LTFLAGS" - htpasswd_LTFLAGS="$htpasswd_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi done fi - if test "x$htdigest_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htdigest_LTFLAGS to \"-static\"" - htdigest_LTFLAGS="-static" + if test "x$MOD_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"$ap_openssl_mod_cflags\"" + MOD_CFLAGS="$ap_openssl_mod_cflags" else - apr_addto_bugger="-static" + apr_addto_bugger="$ap_openssl_mod_cflags" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htdigest_LTFLAGS; do + for j in $MOD_CFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htdigest_LTFLAGS" - htdigest_LTFLAGS="$htdigest_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" + MOD_CFLAGS="$MOD_CFLAGS $i" fi done fi + fi - if test "x$rotatelogs_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting rotatelogs_LTFLAGS to \"-static\"" - rotatelogs_LTFLAGS="-static" + if test "$ac_cv_openssl" = "yes" ; then + + if test "x$MOD_CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_CPPFLAGS to \""-DH2_OPENSSL"\"" + MOD_CPPFLAGS=""-DH2_OPENSSL"" else - apr_addto_bugger="-static" + apr_addto_bugger=""-DH2_OPENSSL"" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $rotatelogs_LTFLAGS; do + for j in $MOD_CPPFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to rotatelogs_LTFLAGS" - rotatelogs_LTFLAGS="$rotatelogs_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CPPFLAGS" + MOD_CPPFLAGS="$MOD_CPPFLAGS $i" fi done fi + fi - if test "x$logresolve_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting logresolve_LTFLAGS to \"-static\"" - logresolve_LTFLAGS="-static" - else - apr_addto_bugger="-static" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $logresolve_LTFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to logresolve_LTFLAGS" - logresolve_LTFLAGS="$logresolve_LTFLAGS $i" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nghttp2" >&5 +$as_echo_n "checking for nghttp2... " >&6; } +if ${ac_cv_nghttp2+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_cv_nghttp2=no + ap_nghttp2_found="" + ap_nghttp2_base="" + ap_nghttp2_libs="" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for user-provided nghttp2 base directory" >&5 +$as_echo_n "checking for user-provided nghttp2 base directory... " >&6; } + +# Check whether --with-nghttp2 was given. +if test "${with_nghttp2+set}" = set; then : + withval=$with_nghttp2; + if test "x$withval" != "xyes" -a "x$withval" != "x"; then + ap_nghttp2_base="`cd $withval ; pwd`" fi - done - fi +fi - if test "x$htdbm_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htdbm_LTFLAGS to \"-static\"" - htdbm_LTFLAGS="-static" + if test "x$ap_nghttp2_base" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ap_nghttp2_base" >&5 +$as_echo "$ap_nghttp2_base" >&6; } + fi + + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" + saved_LDFLAGS="$LDFLAGS" + + if test -n "$PKGCONFIG"; then + saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config along $PKG_CONFIG_PATH" >&5 +$as_echo_n "checking for pkg-config along $PKG_CONFIG_PATH... " >&6; } + if test "x$ap_nghttp2_base" != "x" -a \ + -f "${ap_nghttp2_base}/lib/pkgconfig/libnghttp2.pc"; then + PKG_CONFIG_PATH="${ap_nghttp2_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH + fi + # Check whether --enable-nghttp2-staticlib-deps was given. +if test "${enable_nghttp2_staticlib_deps+set}" = set; then : + enableval=$enable_nghttp2_staticlib_deps; + if test "$enableval" = "yes"; then + PKGCONFIG_LIBOPTS="--static" + fi + +fi + + ap_nghttp2_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors libnghttp2`" + if test $? -eq 0; then + ap_nghttp2_found="yes" + pkglookup="`$PKGCONFIG --cflags-only-I libnghttp2`" + + if test "x$CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"$pkglookup\"" + CPPFLAGS="$pkglookup" else - apr_addto_bugger="-static" + apr_addto_bugger="$pkglookup" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htdbm_LTFLAGS; do + for j in $CPPFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htdbm_LTFLAGS" - htdbm_LTFLAGS="$htdbm_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" + CPPFLAGS="$CPPFLAGS $i" fi done fi - if test "x$ab_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting ab_LTFLAGS to \"-static\"" - ab_LTFLAGS="-static" + if test "x$MOD_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"$pkglookup\"" + MOD_CFLAGS="$pkglookup" else - apr_addto_bugger="-static" + apr_addto_bugger="$pkglookup" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $ab_LTFLAGS; do + for j in $MOD_CFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to ab_LTFLAGS" - ab_LTFLAGS="$ab_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" + MOD_CFLAGS="$MOD_CFLAGS $i" fi done fi - if test "x$checkgid_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting checkgid_LTFLAGS to \"-static\"" - checkgid_LTFLAGS="-static" + if test "x$ab_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting ab_CFLAGS to \"$pkglookup\"" + ab_CFLAGS="$pkglookup" else - apr_addto_bugger="-static" + apr_addto_bugger="$pkglookup" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $checkgid_LTFLAGS; do + for j in $ab_CFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to checkgid_LTFLAGS" - checkgid_LTFLAGS="$checkgid_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to ab_CFLAGS" + ab_CFLAGS="$ab_CFLAGS $i" fi done fi + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L libnghttp2`" - if test "x$htcacheclean_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htcacheclean_LTFLAGS to \"-static\"" - htcacheclean_LTFLAGS="-static" + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$pkglookup\"" + LDFLAGS="$pkglookup" else - apr_addto_bugger="-static" + apr_addto_bugger="$pkglookup" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htcacheclean_LTFLAGS; do + for j in $LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htcacheclean_LTFLAGS" - htcacheclean_LTFLAGS="$htcacheclean_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" fi done fi - if test "x$httxt2dbm_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting httxt2dbm_LTFLAGS to \"-static\"" - httxt2dbm_LTFLAGS="-static" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$pkglookup\"" + MOD_LDFLAGS="$pkglookup" else - apr_addto_bugger="-static" + apr_addto_bugger="$pkglookup" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $httxt2dbm_LTFLAGS; do + for j in $MOD_LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to httxt2dbm_LTFLAGS" - httxt2dbm_LTFLAGS="$httxt2dbm_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi done fi + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other libnghttp2`" - if test "x$fcgistarter_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting fcgistarter_LTFLAGS to \"-static\"" - fcgistarter_LTFLAGS="-static" + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$pkglookup\"" + LDFLAGS="$pkglookup" else - apr_addto_bugger="-static" + apr_addto_bugger="$pkglookup" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $fcgistarter_LTFLAGS; do + for j in $LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to fcgistarter_LTFLAGS" - fcgistarter_LTFLAGS="$fcgistarter_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" fi done fi -fi - -fi - - -# Check whether --enable-static-htpasswd was given. -if test "${enable_static_htpasswd+set}" = set; then : - enableval=$enable_static_htpasswd; -if test "$enableval" = "yes" ; then - if test "x$htpasswd_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htpasswd_LTFLAGS to \"-static\"" - htpasswd_LTFLAGS="-static" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$pkglookup\"" + MOD_LDFLAGS="$pkglookup" else - apr_addto_bugger="-static" + apr_addto_bugger="$pkglookup" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htpasswd_LTFLAGS; do + for j in $MOD_LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htpasswd_LTFLAGS" - htpasswd_LTFLAGS="$htpasswd_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi done fi -else - - if test "x$htpasswd_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling htpasswd_LTFLAGS" - htpasswd_LTFLAGS="" - else - apr_new_bugger="" - apr_removed=0 - for i in $htpasswd_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 fi - done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from htpasswd_LTFLAGS" - htpasswd_LTFLAGS=$apr_new_bugger + PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH" fi - fi - -fi - -fi - - APACHE_VAR_SUBST="$APACHE_VAR_SUBST htpasswd_LTFLAGS" - - - -# Check whether --enable-static-htdigest was given. -if test "${enable_static_htdigest+set}" = set; then : - enableval=$enable_static_htdigest; -if test "$enableval" = "yes" ; then + if test "x$ap_nghttp2_base" != "x" -a "x$ap_nghttp2_found" = "x"; then - if test "x$htdigest_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htdigest_LTFLAGS to \"-static\"" - htdigest_LTFLAGS="-static" + if test "x$CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting CPPFLAGS to \"-I$ap_nghttp2_base/include\"" + CPPFLAGS="-I$ap_nghttp2_base/include" else - apr_addto_bugger="-static" + apr_addto_bugger="-I$ap_nghttp2_base/include" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htdigest_LTFLAGS; do + for j in $CPPFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htdigest_LTFLAGS" - htdigest_LTFLAGS="$htdigest_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" + CPPFLAGS="$CPPFLAGS $i" fi done fi -else - if test "x$htdigest_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling htdigest_LTFLAGS" - htdigest_LTFLAGS="" + if test "x$MOD_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_CFLAGS to \"-I$ap_nghttp2_base/include\"" + MOD_CFLAGS="-I$ap_nghttp2_base/include" else - apr_new_bugger="" - apr_removed=0 - for i in $htdigest_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 + apr_addto_bugger="-I$ap_nghttp2_base/include" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $MOD_CFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CFLAGS" + MOD_CFLAGS="$MOD_CFLAGS $i" fi done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from htdigest_LTFLAGS" - htdigest_LTFLAGS=$apr_new_bugger - fi fi -fi - -fi - - - APACHE_VAR_SUBST="$APACHE_VAR_SUBST htdigest_LTFLAGS" - - - -# Check whether --enable-static-rotatelogs was given. -if test "${enable_static_rotatelogs+set}" = set; then : - enableval=$enable_static_rotatelogs; -if test "$enableval" = "yes" ; then - if test "x$rotatelogs_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting rotatelogs_LTFLAGS to \"-static\"" - rotatelogs_LTFLAGS="-static" + if test "x$ab_CFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting ab_CFLAGS to \"-I$ap_nghttp2_base/include\"" + ab_CFLAGS="-I$ap_nghttp2_base/include" else - apr_addto_bugger="-static" + apr_addto_bugger="-I$ap_nghttp2_base/include" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $rotatelogs_LTFLAGS; do + for j in $ab_CFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to rotatelogs_LTFLAGS" - rotatelogs_LTFLAGS="$rotatelogs_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to ab_CFLAGS" + ab_CFLAGS="$ab_CFLAGS $i" fi done fi -else - if test "x$rotatelogs_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling rotatelogs_LTFLAGS" - rotatelogs_LTFLAGS="" + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"-L$ap_nghttp2_base/lib\"" + LDFLAGS="-L$ap_nghttp2_base/lib" else - apr_new_bugger="" - apr_removed=0 - for i in $rotatelogs_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 + apr_addto_bugger="-L$ap_nghttp2_base/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" fi done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from rotatelogs_LTFLAGS" - rotatelogs_LTFLAGS=$apr_new_bugger - fi fi - -fi - -fi - - - APACHE_VAR_SUBST="$APACHE_VAR_SUBST rotatelogs_LTFLAGS" - - - -# Check whether --enable-static-logresolve was given. -if test "${enable_static_logresolve+set}" = set; then : - enableval=$enable_static_logresolve; -if test "$enableval" = "yes" ; then - - if test "x$logresolve_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting logresolve_LTFLAGS to \"-static\"" - logresolve_LTFLAGS="-static" + + + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"-L$ap_nghttp2_base/lib\"" + MOD_LDFLAGS="-L$ap_nghttp2_base/lib" else - apr_addto_bugger="-static" + apr_addto_bugger="-L$ap_nghttp2_base/lib" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $logresolve_LTFLAGS; do + for j in $MOD_LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to logresolve_LTFLAGS" - logresolve_LTFLAGS="$logresolve_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi done fi -else + if test "x$ap_platform_runtime_link_flag" != "x"; then - if test "x$logresolve_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling logresolve_LTFLAGS" - logresolve_LTFLAGS="" + if test "x$LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting LDFLAGS to \"$ap_platform_runtime_link_flag$ap_nghttp2_base/lib\"" + LDFLAGS="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib" else - apr_new_bugger="" - apr_removed=0 - for i in $logresolve_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 + apr_addto_bugger="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib" + for i in $apr_addto_bugger; do + apr_addto_duplicate="0" + for j in $LDFLAGS; do + if test "x$i" = "x$j"; then + apr_addto_duplicate="1" + break + fi + done + if test $apr_addto_duplicate = "0"; then + test "x$silent" != "xyes" && echo " adding \"$i\" to LDFLAGS" + LDFLAGS="$LDFLAGS $i" fi done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from logresolve_LTFLAGS" - logresolve_LTFLAGS=$apr_new_bugger - fi fi -fi - -fi - - APACHE_VAR_SUBST="$APACHE_VAR_SUBST logresolve_LTFLAGS" - - - -# Check whether --enable-static-htdbm was given. -if test "${enable_static_htdbm+set}" = set; then : - enableval=$enable_static_htdbm; -if test "$enableval" = "yes" ; then - - if test "x$htdbm_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htdbm_LTFLAGS to \"-static\"" - htdbm_LTFLAGS="-static" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_platform_runtime_link_flag$ap_nghttp2_base/lib\"" + MOD_LDFLAGS="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib" else - apr_addto_bugger="-static" + apr_addto_bugger="$ap_platform_runtime_link_flag$ap_nghttp2_base/lib" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htdbm_LTFLAGS; do + for j in $MOD_LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htdbm_LTFLAGS" - htdbm_LTFLAGS="$htdbm_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi done fi -else - - if test "x$htdbm_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling htdbm_LTFLAGS" - htdbm_LTFLAGS="" - else - apr_new_bugger="" - apr_removed=0 - for i in $htdbm_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 fi - done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from htdbm_LTFLAGS" - htdbm_LTFLAGS=$apr_new_bugger fi - fi -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nghttp2 version >= 1.2.1" >&5 +$as_echo_n "checking for nghttp2 version >= 1.2.1... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +#if !defined(NGHTTP2_VERSION_NUM) +#error "Missing nghttp2 version" +#endif +#if NGHTTP2_VERSION_NUM < 0x010201 +#error "Unsupported nghttp2 version " NGHTTP2_VERSION_TEXT +#endif + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +$as_echo "OK" >&6; } + ac_cv_nghttp2=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED" >&5 +$as_echo "FAILED" >&6; } fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "x$ac_cv_nghttp2" = "xyes"; then + ap_nghttp2_libs="${ap_nghttp2_libs:--lnghttp2} `$apr_config --libs`" - APACHE_VAR_SUBST="$APACHE_VAR_SUBST htdbm_LTFLAGS" - - - -# Check whether --enable-static-ab was given. -if test "${enable_static_ab+set}" = set; then : - enableval=$enable_static_ab; -if test "$enableval" = "yes" ; then - - if test "x$ab_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting ab_LTFLAGS to \"-static\"" - ab_LTFLAGS="-static" + if test "x$MOD_LDFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_LDFLAGS to \"$ap_nghttp2_libs\"" + MOD_LDFLAGS="$ap_nghttp2_libs" else - apr_addto_bugger="-static" + apr_addto_bugger="$ap_nghttp2_libs" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $ab_LTFLAGS; do + for j in $MOD_LDFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to ab_LTFLAGS" - ab_LTFLAGS="$ab_LTFLAGS $i" - fi - done - fi - -else - - if test "x$ab_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling ab_LTFLAGS" - ab_LTFLAGS="" - else - apr_new_bugger="" - apr_removed=0 - for i in $ab_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_LDFLAGS" + MOD_LDFLAGS="$MOD_LDFLAGS $i" fi done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from ab_LTFLAGS" - ab_LTFLAGS=$apr_new_bugger - fi fi -fi - -fi - - - APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_LTFLAGS" - - - -# Check whether --enable-static-checkgid was given. -if test "${enable_static_checkgid+set}" = set; then : - enableval=$enable_static_checkgid; -if test "$enableval" = "yes" ; then - if test "x$checkgid_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting checkgid_LTFLAGS to \"-static\"" - checkgid_LTFLAGS="-static" + if test "x$LIBS" = "x"; then + test "x$silent" != "xyes" && echo " setting LIBS to \"$ap_nghttp2_libs\"" + LIBS="$ap_nghttp2_libs" else - apr_addto_bugger="-static" + apr_addto_bugger="$ap_nghttp2_libs" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $checkgid_LTFLAGS; do + for j in $LIBS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to checkgid_LTFLAGS" - checkgid_LTFLAGS="$checkgid_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to LIBS" + LIBS="$LIBS $i" fi done fi -else - if test "x$checkgid_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling checkgid_LTFLAGS" - checkgid_LTFLAGS="" - else - apr_new_bugger="" - apr_removed=0 - for i in $checkgid_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 - fi - done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from checkgid_LTFLAGS" - checkgid_LTFLAGS=$apr_new_bugger - fi - fi + test "x$silent" != "xyes" && echo " forcing ab_LDFLAGS to \"$MOD_LDFLAGS\"" + ab_LDFLAGS="$MOD_LDFLAGS" -fi + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_CFLAGS" + + + + APACHE_VAR_SUBST="$APACHE_VAR_SUBST ab_LDFLAGS" + + + + liberrors="" + for ac_header in nghttp2/nghttp2.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "nghttp2/nghttp2.h" "ac_cv_header_nghttp2_nghttp2_h" "$ac_includes_default" +if test "x$ac_cv_header_nghttp2_nghttp2_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NGHTTP2_NGHTTP2_H 1 +_ACEOF fi +done - APACHE_VAR_SUBST="$APACHE_VAR_SUBST checkgid_LTFLAGS" + for ac_func in nghttp2_session_server_new2 +do : + ac_fn_c_check_func "$LINENO" "nghttp2_session_server_new2" "ac_cv_func_nghttp2_session_server_new2" +if test "x$ac_cv_func_nghttp2_session_server_new2" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NGHTTP2_SESSION_SERVER_NEW2 1 +_ACEOF + +else + liberrors="yes" +fi +done + if test "x$liberrors" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 library is unusable" >&5 +$as_echo "$as_me: WARNING: nghttp2 library is unusable" >&2;} + fi + for ac_func in nghttp2_stream_get_weight +do : + ac_fn_c_check_func "$LINENO" "nghttp2_stream_get_weight" "ac_cv_func_nghttp2_stream_get_weight" +if test "x$ac_cv_func_nghttp2_stream_get_weight" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NGHTTP2_STREAM_GET_WEIGHT 1 +_ACEOF +else + liberrors="yes" +fi +done -# Check whether --enable-static-htcacheclean was given. -if test "${enable_static_htcacheclean+set}" = set; then : - enableval=$enable_static_htcacheclean; -if test "$enableval" = "yes" ; then + if test "x$liberrors" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 version >= 1.3.0 is required" >&5 +$as_echo "$as_me: WARNING: nghttp2 version >= 1.3.0 is required" >&2;} + fi + for ac_func in nghttp2_session_change_stream_priority +do : + ac_fn_c_check_func "$LINENO" "nghttp2_session_change_stream_priority" "ac_cv_func_nghttp2_session_change_stream_priority" +if test "x$ac_cv_func_nghttp2_session_change_stream_priority" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NGHTTP2_SESSION_CHANGE_STREAM_PRIORITY 1 +_ACEOF - if test "x$htcacheclean_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting htcacheclean_LTFLAGS to \"-static\"" - htcacheclean_LTFLAGS="-static" + if test "x$MOD_CPPFLAGS" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_CPPFLAGS to \""-DH2_NG2_CHANGE_PRIO"\"" + MOD_CPPFLAGS=""-DH2_NG2_CHANGE_PRIO"" else - apr_addto_bugger="-static" + apr_addto_bugger=""-DH2_NG2_CHANGE_PRIO"" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $htcacheclean_LTFLAGS; do + for j in $MOD_CPPFLAGS; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to htcacheclean_LTFLAGS" - htcacheclean_LTFLAGS="$htcacheclean_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_CPPFLAGS" + MOD_CPPFLAGS="$MOD_CPPFLAGS $i" fi done fi -else +fi +done - if test "x$htcacheclean_LTFLAGS" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling htcacheclean_LTFLAGS" - htcacheclean_LTFLAGS="" - else - apr_new_bugger="" - apr_removed=0 - for i in $htcacheclean_LTFLAGS; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 - fi - done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from htcacheclean_LTFLAGS" - htcacheclean_LTFLAGS=$apr_new_bugger + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: nghttp2 version is too old" >&5 +$as_echo "$as_me: WARNING: nghttp2 version is too old" >&2;} fi - fi -fi + CPPFLAGS="$saved_CPPFLAGS" + LIBS="$saved_LIBS" + LDFLAGS="$saved_LDFLAGS" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_nghttp2" >&5 +$as_echo "$ac_cv_nghttp2" >&6; } + if test "x$ac_cv_nghttp2" = "xyes"; then +$as_echo "#define HAVE_NGHTTP2 1" >>confdefs.h - APACHE_VAR_SUBST="$APACHE_VAR_SUBST htcacheclean_LTFLAGS" - - + fi -# Check whether --enable-static-httxt2dbm was given. -if test "${enable_static_httxt2dbm+set}" = set; then : - enableval=$enable_static_httxt2dbm; -if test "$enableval" = "yes" ; then + if test "$ac_cv_nghttp2" = "yes" ; then + if test "x$enable_http2" = "xshared"; then + # The only symbol which needs to be exported is the module + # structure, so ask libtool to hide everything else: - if test "x$httxt2dbm_LTFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting httxt2dbm_LTFLAGS to \"-static\"" - httxt2dbm_LTFLAGS="-static" + if test "x$MOD_HTTP2_LDADD" = "x"; then + test "x$silent" != "xyes" && echo " setting MOD_HTTP2_LDADD to \"-export-symbols-regex http2_module\"" + MOD_HTTP2_LDADD="-export-symbols-regex http2_module" else - apr_addto_bugger="-static" + apr_addto_bugger="-export-symbols-regex http2_module" for i in $apr_addto_bugger; do apr_addto_duplicate="0" - for j in $httxt2dbm_LTFLAGS; do + for j in $MOD_HTTP2_LDADD; do if test "x$i" = "x$j"; then apr_addto_duplicate="1" break fi done if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to httxt2dbm_LTFLAGS" - httxt2dbm_LTFLAGS="$httxt2dbm_LTFLAGS $i" + test "x$silent" != "xyes" && echo " adding \"$i\" to MOD_HTTP2_LDADD" + MOD_HTTP2_LDADD="$MOD_HTTP2_LDADD $i" fi done fi -else - - if test "x$httxt2dbm" = "x-static"; then - test "x$silent" != "xyes" && echo " nulling httxt2dbm" - httxt2dbm="" - else - apr_new_bugger="" - apr_removed=0 - for i in $httxt2dbm; do - if test "x$i" != "x-static"; then - apr_new_bugger="$apr_new_bugger $i" - else - apr_removed=1 - fi - done - if test $apr_removed = "1"; then - test "x$silent" != "xyes" && echo " removed \"-static\" from httxt2dbm" - httxt2dbm=$apr_new_bugger + fi + else + enable_http2=no fi - fi - -fi - -fi - - APACHE_VAR_SUBST="$APACHE_VAR_SUBST httxt2dbm_LTFLAGS" + : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable mod_http2" >&5 +$as_echo_n "checking whether to enable mod_http2... " >&6; } + if test "$enable_http2" = "no"; then + if test "$_apmod_required" = "no"; then + _apmod_extra_msg=" (disabled)" + else + as_fn_error $? "mod_http2 has been requested but can not be built due to prerequisite failures" "$LINENO" 5 + fi + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_http2$_apmod_extra_msg" >&5 +$as_echo "$enable_http2$_apmod_extra_msg" >&6; } + if test "$enable_http2" != "no"; then + case "$enable_http2" in + static*) + MODLIST="$MODLIST http2" + if test "http2" = "so"; then + sharedobjs=yes + fi + shared="";; + *) + enable_http2=`echo $enable_http2|sed 's/shared,*//'` + sharedobjs=yes + shared=yes + DSO_MODULES="$DSO_MODULES http2" + if test "most" = "yes" ; then + ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},http2" + fi + ;; + esac + if test -z "$http2_objs"; then + objects="mod_http2.lo" + else + objects="$http2_objs" + fi -# Check whether --enable-static-fcgistarter was given. -if test "${enable_static_fcgistarter+set}" = set; then : - enableval=$enable_static_fcgistarter; -if test "$enableval" = "yes" ; then + if test -z "$module_standalone"; then + if test -z "$shared"; then + # The filename of a convenience library must have a "lib" prefix: + libname="libmod_http2.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<>$modpath_current/modules.mk<> $modpath_current/modules.mk + echo "static = $modpath_static" >> $modpath_current/modules.mk + echo "shared = $modpath_shared" >> $modpath_current/modules.mk + for var in CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS INCLUDES; do + if eval val=\"\$MOD_$var\"; test -n "$val"; then + echo "MOD_$var = $val" >> $modpath_current/modules.mk + fi + done + if test ! -z "$modpath_static" -o ! -z "$modpath_shared"; then + MODULE_DIRS="$MODULE_DIRS $current_dir" + else + MODULE_CLEANDIRS="$MODULE_CLEANDIRS $current_dir" + fi -case $host in - *aix*) - # this works in any locale, unlike the default command below, which - # fails in a non-English locale if the hard limit is unlimited - # since the display of the limit will translate "unlimited", but - # ulimit only accepts English "unlimited" on input - APACHECTL_ULIMIT="ulimit -S -n unlimited" - ;; - *alpha*-dec-osf*) - # Tru64: -H is for setting, not retrieving - APACHECTL_ULIMIT="ulimit -S -n \`ulimit -h -n\`" - ;; - *) - if TMP_ULIMIT=`ulimit -H -n` && ulimit -S -n $TMP_ULIMIT >/dev/null 2>&1; then - APACHECTL_ULIMIT="ulimit -S -n \`ulimit -H -n\`" - else - APACHECTL_ULIMIT="" - fi - ;; -esac + APACHE_FAST_OUTPUT_FILES="$APACHE_FAST_OUTPUT_FILES $modpath_current/Makefile" - APACHE_VAR_SUBST="$APACHE_VAR_SUBST APACHECTL_ULIMIT" diff --git a/docs/conf/mime.types b/docs/conf/mime.types index b90b1658..51752426 100644 --- a/docs/conf/mime.types +++ b/docs/conf/mime.types @@ -1212,7 +1212,7 @@ audio/basic au snd # audio/lpc audio/midi mid midi kar rmi # audio/mobile-xmf -audio/mp4 mp4a +audio/mp4 m4a mp4a # audio/mp4a-latm # audio/mpa # audio/mpa-robust diff --git a/docs/manual/bind.html.de b/docs/manual/bind.html.de index 02af1105..ae257f24 100644 --- a/docs/manual/bind.html.de +++ b/docs/manual/bind.html.de @@ -18,7 +18,7 @@

Module | Direktiven | FAQ | Glossar | Seitenindex

Apache HTTP Server Version 2.4

-
+
<-

An Adressen und Ports binden

@@ -217,7 +217,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/bind.html'; } })(window, document); //-->
+ + +
+

Modules | Directives | FAQ | Glossary | Sitemap

+

Apache HTTP Server Version 2.4

+
+
<-
+

Reverse Proxy Guide

+
+

Available Languages:  en  | + fr  | + ja  | + ko  | + tr 

+
+ +

In addition to being a "basic" web server, and providing static and + dynamic content to end-users, Apache httpd (as well as most other web + servers) can also act as a reverse proxy server, also-known-as a + "gateway" server.

+ +

In such scenarios, httpd itself does not generate or host the data, + but rather the content is obtained by one or several backend servers, + which normally have no direct connection to the external network. As + httpd receives a request from a client, the request itself is proxied + to one of these backend servers, which then handles the request, generates + the content and then sends this content back to httpd, which then + generates the actual HTTP response back to the client.

+ +

There are numerous reasons for such an implementation, but generally + the typical rationales are due to security, high-availability, load-balancing + and centralized authentication/authorization. It is critical in these + implementations that the layout, design and architecture of the backend + infrastructure (those servers which actually handle the requests) are + insulated and protected from the outside; as far as the client is concerned, + the reverse proxy server is the sole source of all content.

+ +

A typical implementation is below:

+

reverse-proxy-arch

+ +
+ +
top
+
+

Reverse Proxy

+ +
Related ModulesRelated Directives
+
top
+
+

Simple reverse proxying

+ + +

+ The ProxyPass + directive specifies the mapping of incoming requests to the backend + server (or a cluster of servers known as a Balancer + group). The simpliest example proxies all requests ("/") + to a single backend: +

+ + 
ProxyPass "/"  "http://www.example.com/"
+ + +

+ To ensure that and Location: headers generated from + the backend are modified to point to the reverse proxy, instead of + back to itself, the ProxyPassReverse + directive is most often required: +

+ + 
ProxyPass "/"  "http://www.example.com/"
+ProxyPassReverse "/"  "http://www.example.com/"
+ + +

Only specific URIs can be proxied, as shown in this example:

+ + 
ProxyPass "/images"  "http://www.example.com/"
+ProxyPassReverse "/images"  "http://www.example.com/"
+ + +

In the above, any requests which start with the /images + path with be proxied to the specified backend, otherwise it will be handled + locally. +

+
top
+
+

Clusters and Balancers

+ + +

+ As useful as the above is, it still has the deficiencies that should + the (single) backend node go down, or become heavily loaded, that proxying + those requests provides no real advantage. What is needed is the ability + to define a set or group of backend servers which can handle such + requests and for the reverse proxy to load balance and failover among + them. This group is sometimes called a cluster but Apache httpd's + term is a balancer. One defines a balancer by leveraging the + Proxy and + BalancerMember directives as + shown: +

+ + 
<Proxy balancer://myset>
+    BalancerMember http://www2.example.com:8080
+    BalancerMember http://www3.example.com:8080
+    ProxySet lbmethod=bytraffic
+</Proxy>
+
+ProxyPass "/images/"  "balancer://myset/"
+ProxyPassReverse "/images/"  "balancer://myset/"
+ + +

+ The balancer:// scheme is what tells httpd that we are creating + a balancer set, with the name myset. It includes 2 backend servers, + which httpd calls BalancerMembers. In this case, any requests for + /images will be proxied to one of the 2 backends. + The ProxySet directive + specifies that the myset Balancer use a load balancing algorithm + that balances based on I/O bytes. +

+ +

Hint

+

+ BalancerMembers are also sometimes referred to as workers. +

+
+ +
top
+
+

Balancer and BalancerMember configuration

+ + +

+ You can adjust numerous configuration details of the balancers + and the workers via the various parameters defined in + ProxyPass. For example, + assuming we would want http://www3.example.com:8080 to + handle 3x the traffic with a timeout of 1 second, we would adjust the + configuration as follows: +

+ + 
<Proxy balancer://myset>
+    BalancerMember http://www2.example.com:8080
+    BalancerMember http://www3.example.com:8080 loadfactor=3 timeout=1
+    ProxySet lbmethod=bytraffic
+</Proxy>
+
+ProxyPass "/images"  "balancer://myset/"
+ProxyPassReverse "/images"  "balancer://myset/"
+ + +
top
+
+

Failover

+ + +

+ You can also fine-tune various failover scenarios, detailing which + workers and even which balancers should accessed in such cases. For + example, the below setup implements 2 failover cases: In the first, + http://hstandby.example.com:8080 is only sent traffic + if all other workers in the myset balancer are not available. + If that worker itself is not available, only then will the + http://bkup1.example.com:8080 and http://bkup2.example.com:8080 + workers be brought into rotation: +

+ + 
<Proxy balancer://myset>
+    BalancerMember http://www2.example.com:8080
+    BalancerMember http://www3.example.com:8080 loadfactor=3 timeout=1
+    BalancerMember http://hstandby.example.com:8080 status=+H
+    BalancerMember http://bkup1.example.com:8080 lbset=1
+    BalancerMember http://bkup2.example.com:8080 lbset=1
+    ProxySet lbmethod=byrequests
+</Proxy>
+
+ProxyPass "/images/"  "balancer://myset/"
+ProxyPassReverse "/images/"  "balancer://myset/"
+ + +

+ The magic of this failover setup is setting http://hstandby.example.com:8080 + with the +H status flag, which puts it in hot standby mode, + and making the 2 bkup# servers part of the #1 load balancer set (the + default set is 0); for failover, hot standbys (if they exist) are used 1st, when all regular + workers are unavailable; load balancer sets are always tried lowest number first. +

+ +
top
+
+

Balancer Manager

+ + +

+ One of the most unique and useful features of Apache httpd's reverse proxy is + the embedded balancer-manager application. Similar to + mod_status, balancer-manager displays + the current working configuration and status of the enabled + balancers and workers currently in use. However, not only does it + display these parameters, it also allows for dynamic, runtime, on-the-fly + reconfiguration of almost all of them, including adding new BalancerMembers + (workers) to an existing balancer. To enable these capability, the following + needs to be added to your configuration: +

+ + 
<Location "/balancer-manager">
+    SetHandler balancer-manager
+    Require host localhost
+</Location>
+ + +

Warning

+

Do not enable the balancer-manager until you have secured your server. In + particular, ensure that access to the URL is tightly + restricted.

+
+ +

+ When the reverse proxy server is accessed at that url + (eg: http://rproxy.example.com/balancer-manager/, you will see a + page similar to the below: +

+

balancer-manager page

+ +

+ This form allows the devops admin to adjust various parameters, take + workers offline, change load balancing methods and add new works. For + example, clicking on the balancer itself, you will get the following page: +

+

balancer-manager page

+ +

+ Whereas clicking on a worker, displays this page: +

+

balancer-manager page

+ +

+ To have these changes persist restarts of the reverse proxy, ensure that + BalancerPersist is enabled. +

+ +
top
+
+

Dynamic Health Checks

+ + +

+ Before httpd proxies a request to a worker, it can "test" if that worker + is available via setting the ping parameter for that worker using + ProxyPass. Oftentimes it is + more useful to check the health of the workers out of band, in a + dynamic fashion. This is achieved in Apache httpd by the + mod_proxy_hcheck module. +

+ +
top
+
+

BalancerMember status flags

+ + +

+ In the balancer-manager the current state, or status, of a worker + is displayed and can be set/reset. The meanings of these statuses are as follows: +

+ + + + + + + + + + + +
FlagStringDescription
 OkWorker is available
 InitWorker has been initialized
DDisWorker is disabled and will not accept any requests; will be + automatically retried.
SStopWorker is administratively stopped; will not accept requests + and will not be automatically retried
IIgnWorker is in ignore-errors mode and will always be considered available.
HStbyWorker is in hot-standby mode and will only be used if no other + viable workers are available.
EErrWorker is in an error state, usually due to failing pre-request check; + requests will not be proxied to this worker, but it will be retried depending on + the retry setting of the worker.
NDrnWorker is in drain mode and will only accept existing sticky sessions + destined for itself and ignore all other requests.
CHcFlWorker has failed dynamic health check and will not be used until it + passes subsequent health checks.
+
+
+

Available Languages:  en  | + fr  | + ja  | + ko  | + tr 

+
top

Comments

Notice:
This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our mailing lists.
+
+ \ No newline at end of file diff --git a/docs/manual/howto/ssi.html.en b/docs/manual/howto/ssi.html.en index 082fa1d6..fddc7c68 100644 --- a/docs/manual/howto/ssi.html.en +++ b/docs/manual/howto/ssi.html.en @@ -18,7 +18,7 @@

Modules | Directives | FAQ | Glossary | Sitemap

Apache HTTP Server Version 2.4

-
+
<-

Apache httpd Tutorial: Introduction to Server Side Includes

@@ -494,7 +494,7 @@ var comments_identifier = 'http://httpd.apache.org/docs/2.4/howto/ssi.html'; } })(window, document); //-->