]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1486027, r1828909, r1839249, r1842888, r1844343, r1846651 from trunk:
authorJoe Orton <jorton@apache.org>
Tue, 12 Mar 2019 09:29:24 +0000 (09:29 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 12 Mar 2019 09:29:24 +0000 (09:29 +0000)
commit605a598ef34c525c96a7840bed3f86f5efef83f9
treeae3ca866ad634b05b84bf5146126254d5ea8d5fb
parentada264f205453671963e995839cedebfc1b59c83
Merge r1486027, r1828909, r1839249, r1842888, r1844343, r1846651 from trunk:

Clarify the existing behavior.

* modules/generators/mod_info.c: Constify fixed tables and mark
  module-private global variables static. No functional change.

Axe an old and apparently out-dated comment.

There is a typo in the comment.
HN_UPDATE_SEC has been renamed HM_UPDATE_SEC.
The TODO seems to have been taken into account in r759862.

* modules/filters/mod_deflate.c
  (deflate_out_filter): Fix typo setting output note. (Coverity warning)
  (deflate_in_filter): Fix redundant assignment. (clang warning)

* modules/md/md_acme_authz.c (md_acme_authz_update): Fix typo in log
  message.

* modules/dav/main/mod_dav.c (dav_method_propfind): Tag the scratchpool.

Submitted by: minfrin, jorton, jailletc36
Reviewed by: jailletc36, icing, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855300 13f79535-47bb-0310-9956-ffa450edef68
modules/cluster/mod_heartmonitor.c
modules/dav/main/mod_dav.c
modules/dav/main/props.c
modules/filters/mod_deflate.c
modules/generators/mod_info.c
modules/md/md_acme_authz.c