]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1822857, r1876815, r1893499, r1900024, r1900152, r1900306, r1900559, r1900564...
authorJim Jagielski <jim@apache.org>
Sun, 21 Aug 2022 20:26:51 +0000 (20:26 +0000)
committerJim Jagielski <jim@apache.org>
Sun, 21 Aug 2022 20:26:51 +0000 (20:26 +0000)
commit4d37880753ed24f5252f88bd024e0053d4d25ce7
tree8de4b340dbe51c5f2a66dc4aff01f0735d7659d0
parent9b620d646cdb12140799438f769ccc591c756a87
Merge r1822857, r1876815, r1893499, r1900024, r1900152, r1900306, r1900559, r1900564, r1900691, r1900694 from trunk:

* Makefile.in (build/config_vars.out): Rebuild if build/config_vars.sh
  has changed.

sort safe_env_lst
bz 64371

mod_optional_hook_import: debug message at APLOG_DEBUG level.

  *) de-duplicate ALOGNO from code copy.

ab: apr_base64_encode already NUL-terminate the output.

And returns the length including the trailing \0, so setting it at that
length is off by +1.

* Avoid an overflow on large inputs

PR: 66033

dav_get_liveprop_info() returns a long not an int.

Update the type of global_ns accordingly and update the format specifier when this variable is used in printf like functions.

This also aligns code with dav_core_insert_prop() in modules/dav/main/std_liveprop.c

Length computed by count_string() are accumulated in an apr_size_t, so be more consistent and use this data type also in this function.

Fix some typo

[skip ci]

Fix some typos

[skip ci]
Submitted by: jorton, gbechis, ylavic, icing, ylavic, rpluem, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed by: jailletc36, rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1903618 13f79535-47bb-0310-9956-ffa450edef68
13 files changed:
Makefile.in
STATUS
changes-entries/pr66033.txt [new file with mode: 0644]
include/http_ssl.h
modules/dav/fs/repos.c
modules/loggers/mod_log_forensic.c
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_init.c
modules/test/mod_optional_hook_import.c
server/mpm/worker/worker.c
server/util.c
support/ab.c
support/suexec.c