diff options
author | Christophe Jaillet <jailletc36@apache.org> | 2021-04-18 19:40:13 +0000 |
---|---|---|
committer | Christophe Jaillet <jailletc36@apache.org> | 2021-04-18 19:40:13 +0000 |
commit | 8433a9b8c9127929ec6e974a3dec7a8f95628032 (patch) | |
tree | f4539bc86ac7704a4cb5a4196c45652f3806657b /include | |
parent | c0882d02091da592242b329d550604288c8caac5 (diff) | |
download | httpd-8433a9b8c9127929ec6e974a3dec7a8f95628032.tar.gz |
Merge r1730128, r1878140, r1878265, r1881736, r1882775, r1883872, r1884509, r1887720 from trunk
*) Easy patches: synch 2.4.x and trunk
- doxygen: Correct doxygen groupname
- .gdbinit: align columns
- .gdbinit: fix indentation
- mod_dav: Add specific logs for different modes
- core: ap_pbase64encode(): save double NUL byte allocation and assignment
- core: ap_pbase64decode(): save double NUL byte allocation and assignment
- support: Fix a typo in a comment
- proxy_util.c: Fix leak in error path in the do_malloc case
Submitted by: wrowe, ylavic, ylavic, jorton, rpluem, ylavic, jorton, jorton
Reviewed by: jailletc36, gbechis, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1888929 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r-- | include/http_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/http_core.h b/include/http_core.h index 0d7561b4a9..110c9ebe70 100644 --- a/include/http_core.h +++ b/include/http_core.h @@ -160,7 +160,7 @@ AP_DECLARE(const char *) ap_document_root(request_rec *r); /** * Lookup the remote user agent's DNS name or IP address - * @ingroup get_remote_hostname + * @ingroup get_remote_host * @param req The current request * @param type The type of lookup to perform. One of: * <pre> |