configure | 6 3 + 3 - 0 !
configure.in | 6 3 + 3 - 0 !
include/ap_config_layout.h.in | 1 1 + 0 - 0 !
include/httpd.h | 2 1 + 1 - 0 !
4 files changed, 8 insertions(+), 7 deletions(-)

 fix up fhs file locations for apache2 droppings.

support/envvars-std.in | 7 0 + 7 - 0 !
1 file changed, 7 deletions(-)

 remove ld_library_path from envvars-std

support/suexec.c | 17 14 + 3 - 0 !
1 file changed, 14 insertions(+), 3 deletions(-)

 fix race condition with chdir
 Fix /var/www* being accepted as docroot instead of /var/www/*
 (the same for public_html* instead of public_html/* )

support/apxs.in | 137 33 + 104 - 0 !
1 file changed, 33 insertions(+), 104 deletions(-)

 adapt apxs to debian specific changes
 - Make apxs2 use a2enmod and /etc/apache2/mods-available
 - Make libtool happier
 - Use LDFLAGS from config_vars.mk, allow to override them

Makefile.in | 10 6 + 4 - 0 !
support/Makefile.in | 12 8 + 4 - 0 !
2 files changed, 14 insertions(+), 8 deletions(-)

 add suexec-custom to the build system

CHANGES | 82 73 + 9 - 0 !
CMakeLists.txt | 6 3 + 3 - 0 !
README.platforms | 29 4 + 25 - 0 !
build/NWGNUtail.inc | 3 2 + 1 - 0 !
docs/man/rotatelogs.8 | 20 10 + 10 - 0 !
docs/man/tr/rotatelogs.8 | 20 10 + 10 - 0 !
docs/manual/convenience.map | 8 7 + 1 - 0 !
docs/manual/developer/modguide.html.en | 2 1 + 1 - 0 !
docs/manual/expr.html.en | 6 3 + 3 - 0 !
docs/manual/expr.html.fr | 12 9 + 3 - 0 !
docs/manual/logs.html.en | 2 1 + 1 - 0 !
docs/manual/logs.html.fr | 2 1 + 1 - 0 !
docs/manual/logs.html.tr.utf8 | 2 1 + 1 - 0 !
docs/manual/mod/core.html.de | 14 14 + 0 - 0 !
docs/manual/mod/core.html.en | 23 21 + 2 - 0 !
docs/manual/mod/core.html.es | 14 14 + 0 - 0 !
docs/manual/mod/core.html.fr | 31 27 + 4 - 0 !
docs/manual/mod/core.html.ja.utf8 | 14 14 + 0 - 0 !
docs/manual/mod/core.html.tr.utf8 | 21 21 + 0 - 0 !
docs/manual/mod/directives.html.de | 3 2 + 1 - 0 !
docs/manual/mod/directives.html.en | 3 2 + 1 - 0 !
docs/manual/mod/directives.html.es | 3 2 + 1 - 0 !
docs/manual/mod/directives.html.fr | 3 2 + 1 - 0 !
docs/manual/mod/directives.html.ja.utf8 | 3 2 + 1 - 0 !
docs/manual/mod/directives.html.ko.euc-kr | 3 2 + 1 - 0 !
docs/manual/mod/directives.html.tr.utf8 | 3 2 + 1 - 0 !
docs/manual/mod/directives.html.zh-cn.utf8 | 3 2 + 1 - 0 !
docs/manual/mod/index.html.de | 2 1 + 1 - 0 !
docs/manual/mod/index.html.en | 2 1 + 1 - 0 !
docs/manual/mod/index.html.es | 2 1 + 1 - 0 !
docs/manual/mod/index.html.fr | 2 1 + 1 - 0 !
docs/manual/mod/index.html.ja.utf8 | 2 1 + 1 - 0 !
docs/manual/mod/index.html.ko.euc-kr | 2 1 + 1 - 0 !
docs/manual/mod/index.html.tr.utf8 | 2 1 + 1 - 0 !
docs/manual/mod/index.html.zh-cn.utf8 | 2 1 + 1 - 0 !
docs/manual/mod/mod_authn_core.html.en | 2 2 + 0 - 0 !
docs/manual/mod/mod_authn_core.html.fr | 4 4 + 0 - 0 !
docs/manual/mod/mod_authnz_fcgi.html.en | 5 3 + 2 - 0 !
docs/manual/mod/mod_cgid.html.fr | 25 15 + 10 - 0 !
docs/manual/mod/mod_dav.html.en | 2 1 + 1 - 0 !
docs/manual/mod/mod_dav.html.fr | 2 1 + 1 - 0 !
docs/manual/mod/mod_dav.html.ja.utf8 | 2 1 + 1 - 0 !
docs/manual/mod/mod_deflate.html.fr | 56 37 + 19 - 0 !
docs/manual/mod/mod_example.html | 13 0 + 13 - 0 !
docs/manual/mod/mod_example.html.en | 180 0 + 180 - 0 !
docs/manual/mod/mod_example.html.fr | 192 0 + 192 - 0 !
docs/manual/mod/mod_example.html.ko.euc-kr | 181 0 + 181 - 0 !
docs/manual/mod/mod_example_hooks.html | 13 13 + 0 - 0 !
docs/manual/mod/mod_example_hooks.html.en | 180 180 + 0 - 0 !
docs/manual/mod/mod_example_hooks.html.fr | 192 192 + 0 - 0 !
docs/manual/mod/mod_example_hooks.html.ko.euc-kr | 181 181 + 0 - 0 !
docs/manual/mod/mod_ldap.html.fr | 20 12 + 8 - 0 !
docs/manual/mod/mod_log_config.html.en | 6 6 + 0 - 0 !
docs/manual/mod/mod_log_config.html.fr | 6 6 + 0 - 0 !
docs/manual/mod/mod_log_config.html.tr.utf8 | 6 6 + 0 - 0 !
docs/manual/mod/mod_rewrite.html.fr | 135 63 + 72 - 0 !
docs/manual/mod/mod_ssl.html.en | 11 8 + 3 - 0 !
docs/manual/mod/mod_ssl.html.fr | 11 8 + 3 - 0 !
docs/manual/mod/quickreference.html.de | 605 303 + 302 - 0 !
docs/manual/mod/quickreference.html.en | 603 302 + 301 - 0 !
docs/manual/mod/quickreference.html.es | 603 302 + 301 - 0 !
docs/manual/mod/quickreference.html.fr | 627 314 + 313 - 0 !
docs/manual/mod/quickreference.html.ja.utf8 | 591 296 + 295 - 0 !
docs/manual/mod/quickreference.html.ko.euc-kr | 599 300 + 299 - 0 !
docs/manual/mod/quickreference.html.tr.utf8 | 613 307 + 306 - 0 !
docs/manual/mod/quickreference.html.zh-cn.utf8 | 603 302 + 301 - 0 !
docs/manual/programs/rotatelogs.html.en | 18 9 + 9 - 0 !
docs/manual/programs/rotatelogs.html.fr | 18 9 + 9 - 0 !
docs/manual/programs/rotatelogs.html.tr.utf8 | 18 9 + 9 - 0 !
docs/manual/rewrite/advanced.html.en | 157 2 + 155 - 0 !
docs/manual/rewrite/advanced.html.fr | 159 1 + 158 - 0 !
docs/manual/rewrite/rewritemap.html.fr | 2 1 + 1 - 0 !
docs/manual/sitemap.html.de | 2 1 + 1 - 0 !
docs/manual/sitemap.html.en | 2 1 + 1 - 0 !
docs/manual/sitemap.html.es | 2 1 + 1 - 0 !
docs/manual/sitemap.html.fr | 2 1 + 1 - 0 !
docs/manual/sitemap.html.ja.utf8 | 2 1 + 1 - 0 !
docs/manual/sitemap.html.ko.euc-kr | 2 1 + 1 - 0 !
docs/manual/sitemap.html.tr.utf8 | 2 1 + 1 - 0 !
docs/manual/sitemap.html.zh-cn.utf8 | 2 1 + 1 - 0 !
docs/manual/style/version.ent | 2 1 + 1 - 0 !
docs/manual/vhosts/name-based.html.en | 2 1 + 1 - 0 !
docs/manual/vhosts/name-based.html.fr | 2 1 + 1 - 0 !
include/ap_mmn.h | 3 2 + 1 - 0 !
include/http_connection.h | 6 1 + 5 - 0 !
include/http_core.h | 4 4 + 0 - 0 !
include/httpd.h | 5 5 + 0 - 0 !
include/util_md5.h | 30 13 + 17 - 0 !
include/util_varbuf.h | 132 71 + 61 - 0 !
include/util_xml.h | 7 3 + 4 - 0 !
modules/aaa/mod_auth_basic.c | 4 2 + 2 - 0 !
modules/aaa/mod_auth_form.c | 8 4 + 4 - 0 !
modules/aaa/mod_authnz_fcgi.c | 2 1 + 1 - 0 !
modules/aaa/mod_authz_core.c | 9 8 + 1 - 0 !
modules/arch/netware/mod_nw_ssl.c | 2 1 + 1 - 0 !
modules/arch/win32/mod_isapi.c | 24 12 + 12 - 0 !
modules/cache/cache_util.c | 10 6 + 4 - 0 !
modules/cache/mod_cache.c | 2 2 + 0 - 0 !
modules/core/mod_macro.c | 42 21 + 21 - 0 !
modules/core/mod_so.c | 4 2 + 2 - 0 !
modules/core/mod_watchdog.h | 6 3 + 3 - 0 !
modules/database/mod_dbd.c | 7 4 + 3 - 0 !
modules/examples/mod_example_hooks.c | 10 5 + 5 - 0 !
modules/filters/mod_include.c | 14 7 + 7 - 0 !
modules/filters/mod_ratelimit.c | 4 2 + 2 - 0 !
modules/filters/mod_xml2enc.c | 9 3 + 6 - 0 !
modules/generators/mod_autoindex.c | 2 1 + 1 - 0 !
modules/http/byterange_filter.c | 6 2 + 4 - 0 !
modules/http/http_filters.c | 65 51 + 14 - 0 !
modules/http/http_protocol.c | 6 3 + 3 - 0 !
modules/http/http_request.c | 4 4 + 0 - 0 !
modules/ldap/util_ldap.c | 2 1 + 1 - 0 !
modules/loggers/mod_log_config.c | 29 26 + 3 - 0 !
modules/lua/lua_apr.c | 4 2 + 2 - 0 !
modules/lua/lua_request.c | 10 5 + 5 - 0 !
modules/lua/mod_lua.c | 10 5 + 5 - 0 !
modules/mappers/mod_negotiation.c | 2 1 + 1 - 0 !
modules/proxy/mod_proxy.c | 6 3 + 3 - 0 !
modules/proxy/mod_proxy_fcgi.c | 6 3 + 3 - 0 !
modules/proxy/mod_proxy_ftp.c | 8 3 + 5 - 0 !
modules/proxy/mod_proxy_http.c | 31 30 + 1 - 0 !
modules/proxy/mod_proxy_wstunnel.c | 27 2 + 25 - 0 !
modules/slotmem/mod_slotmem_shm.c | 6 3 + 3 - 0 !
modules/ssl/ssl_engine_init.c | 2 1 + 1 - 0 !
modules/ssl/ssl_engine_vars.c | 2 1 + 1 - 0 !
os/bs2000/os.c | 4 2 + 2 - 0 !
os/unix/unixd.c | 4 2 + 2 - 0 !
server/config.c | 4 0 + 4 - 0 !
server/core.c | 17 16 + 1 - 0 !
server/core_filters.c | 18 6 + 12 - 0 !
server/mpm/netware/mpm_netware.c | 2 1 + 1 - 0 !
server/mpm_unix.c | 2 1 + 1 - 0 !
server/protocol.c | 14 10 + 4 - 0 !
server/scoreboard.c | 10 8 + 2 - 0 !
server/util.c | 14 7 + 7 - 0 !
server/util_ebcdic.c | 4 3 + 1 - 0 !
server/util_expr_eval.c | 6 2 + 4 - 0 !
server/util_fcgi.c | 4 2 + 2 - 0 !
server/util_script.c | 6 3 + 3 - 0 !
support/htdigest.c | 2 1 + 1 - 0 !
140 files changed, 3860 insertions(+), 3837 deletions(-)

 pull changes from upstream svn 2.4 branch up to r1632831

modules/aaa/mod_authnz_fcgi.c | 10 5 + 5 - 0 !
modules/proxy/mod_proxy_fcgi.c | 10 5 + 5 - 0 !
2 files changed, 10 insertions(+), 10 deletions(-)

---

server/mpm/event/event.c | 10 0 + 10 - 0 !
server/mpm/event/fdqueue.c | 1 1 + 0 - 0 !
2 files changed, 1 insertion(+), 10 deletions(-)

---

modules/ssl/mod_ssl.c | 7 5 + 2 - 0 !
1 file changed, 5 insertions(+), 2 deletions(-)

---

modules/ssl/ssl_engine_init.c | 7 4 + 3 - 0 !
modules/ssl/ssl_private.h | 14 11 + 3 - 0 !
modules/ssl/ssl_util_stapling.c | 134 78 + 56 - 0 !
3 files changed, 93 insertions(+), 62 deletions(-)

---

CHANGES | 5 5 + 0 - 0 !
modules/lua/mod_lua.c | 27 17 + 10 - 0 !
2 files changed, 22 insertions(+), 10 deletions(-)

---

modules/lua/lua_request.c | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

---

modules/http/http_filters.c | 668 313 + 355 - 0 !
1 file changed, 313 insertions(+), 355 deletions(-)

---

include/ap_mmn.h | 2 2 + 0 - 0 !
include/http_request.h | 23 23 + 0 - 0 !
server/request.c | 74 56 + 18 - 0 !
3 files changed, 81 insertions(+), 18 deletions(-)

---

server/core.c | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

---

server/mpm/event/event.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

---

server/mpm/event/event.c | 50 28 + 22 - 0 !
1 file changed, 28 insertions(+), 22 deletions(-)

---

support/split-logfile.in | 9 4 + 5 - 0 !
1 file changed, 4 insertions(+), 5 deletions(-)

---

server/util_script.c | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

---

modules/cache/mod_socache_memcache.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

modules/proxy/mod_proxy_fcgi.c | 19 13 + 6 - 0 !
1 file changed, 13 insertions(+), 6 deletions(-)

---

modules/aaa/mod_auth_digest.c | 52 43 + 9 - 0 !
1 file changed, 43 insertions(+), 9 deletions(-)

---

modules/session/mod_session_crypto.c | 228 192 + 36 - 0 !
1 file changed, 192 insertions(+), 36 deletions(-)

---

include/http_core.h | 18 18 + 0 - 0 !
include/http_protocol.h | 17 12 + 5 - 0 !
include/httpd.h | 22 22 + 0 - 0 !
modules/http/http_filters.c | 175 149 + 26 - 0 !
server/core.c | 66 66 + 0 - 0 !
server/gen_test_char.c | 45 36 + 9 - 0 !
server/protocol.c | 699 492 + 207 - 0 !
server/util.c | 33 32 + 1 - 0 !
server/vhost.c | 292 237 + 55 - 0 !
9 files changed, 1064 insertions(+), 303 deletions(-)

---

server/vhost.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

include/ap_mmn.h | 2 2 + 0 - 0 !
include/http_protocol.h | 25 24 + 1 - 0 !
server/protocol.c | 48 48 + 0 - 0 !
server/request.c | 17 14 + 3 - 0 !
4 files changed, 88 insertions(+), 4 deletions(-)

---

modules/ssl/ssl_engine_io.c | 15 8 + 7 - 0 !
1 file changed, 8 insertions(+), 7 deletions(-)

---

server/util.c | 6 2 + 4 - 0 !
1 file changed, 2 insertions(+), 4 deletions(-)

---

modules/http/mod_mime.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

---

modules/aaa/mod_auth_digest.c | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

---

server/core.c | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 core: disallow methods' registration at run time (.htaccess), they
 may be used only if registered at init time (httpd.conf).

modules/aaa/mod_authnz_ldap.c | 10 7 + 3 - 0 !
1 file changed, 7 insertions(+), 3 deletions(-)

---

include/ap_mmn.h | 3 3 + 0 - 0 !
include/ap_regex.h | 22 22 + 0 - 0 !
server/core.c | 58 58 + 0 - 0 !
server/util_pcre.c | 35 35 + 0 - 0 !
4 files changed, 118 insertions(+)

---

modules/session/mod_session.c | 13 8 + 5 - 0 !
1 file changed, 8 insertions(+), 5 deletions(-)

---

server/protocol.c | 76 42 + 34 - 0 !
1 file changed, 42 insertions(+), 34 deletions(-)

---

modules/cache/mod_cache_socache.c | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

---

modules/aaa/mod_auth_digest.c | 241 51 + 190 - 0 !
1 file changed, 51 insertions(+), 190 deletions(-)

---