summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2020-07-03 14:44:53 +0200
committerGraham Leggett <minfrin@apache.org>2020-07-03 14:44:53 +0200
commit6bf5bd6cb23885b96a360ffe1167744078d52669 (patch)
treed80030e5ab2630d461ac8e6bc7b1b36219bdcf6f /include
parentAdd skeleton for new features docs for 2.6. (diff)
downloadapache2-6bf5bd6cb23885b96a360ffe1167744078d52669.tar.xz
apache2-6bf5bd6cb23885b96a360ffe1167744078d52669.zip
core: Remove support for the Content-MD5 header, removed in RFC7231.
Functions ap_md5digest() and ap_md5contextTo64() removed, and ContentDigest directive. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879472 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/ap_mmn.h2
-rw-r--r--include/http_core.h2
-rw-r--r--include/util_md5.h15
3 files changed, 2 insertions, 17 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 8bf8ffc087..7629fe7c15 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -651,6 +651,8 @@
* 20200702.1 (2.5.1-dev) Add pool arg to mpm_register_poll_callback and
* mpm_register_poll_callback_timeout hooks
* 20200702.2 (2.5.1-dev) Add dav_get_resource().
+ * 20200703.0 (2.5.1-dev) Remove ap_md5digest(), ap_md5contextTo64(),
+ * ContentDigest directive.
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
diff --git a/include/http_core.h b/include/http_core.h
index 2bcd713560..17a2c50f1a 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -553,8 +553,6 @@ typedef struct {
#define HOSTNAME_LOOKUP_UNSET 3
unsigned int hostname_lookups : 4;
- unsigned int content_md5 : 2; /* calculate Content-MD5? */
-
#define USE_CANONICAL_NAME_OFF (0)
#define USE_CANONICAL_NAME_ON (1)
#define USE_CANONICAL_NAME_DNS (2)
diff --git a/include/util_md5.h b/include/util_md5.h
index 0287ef9f03..a334cbb234 100644
--- a/include/util_md5.h
+++ b/include/util_md5.h
@@ -49,21 +49,6 @@ AP_DECLARE(char *) ap_md5(apr_pool_t *a, const unsigned char *string);
*/
AP_DECLARE(char *) ap_md5_binary(apr_pool_t *a, const unsigned char *buf, int len);
-/**
- * Convert an MD5 checksum into a base64 encoding.
- * @param p The pool to allocate out of
- * @param context The context to convert
- * @return The converted encoding
- */
-AP_DECLARE(char *) ap_md5contextTo64(apr_pool_t *p, apr_md5_ctx_t *context);
-
-/**
- * Create an MD5 Digest for a given file.
- * @param p The pool to allocate out of
- * @param infile The file to create the digest for
- */
-AP_DECLARE(char *) ap_md5digest(apr_pool_t *p, apr_file_t *infile);
-
#ifdef __cplusplus
}
#endif