diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 8 | ||||
| -rw-r--r-- | include/http_ssl.h | 9 | ||||
| -rw-r--r-- | include/httpd.h | 11 |
3 files changed, 9 insertions, 19 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index c1a0c9c8d5..260aca246d 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -667,16 +667,16 @@ * 20201214.1 (2.5.1-dev) Add ap_ssl_conn_is_ssl()/ap_ssl_var_lookup() and hooks * 20201214.2 (2.5.1-dev) Add ap_ssl_add_cert_files, ap_ssl_add_fallback_cert_files * 20201214.3 (2.5.1-dev) Move ap_ssl_* into new http_ssl.h header file - * 20201214.4 (2.5.1-dev) Add `ap_bytes_t` to httpd.h. - * Add ap_ssl_ocsp* hooks and functions to http_ssl.h. + * 20201214.4 (2.5.1-dev) Add ap_ssl_ocsp* hooks and functions to http_ssl.h. + * 20210420.0 (2.5.1-dev) Removed `ap_bytes_t` again from httpd.h and usage in ap_ssl_ocsp*() */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20201214 +#define MODULE_MAGIC_NUMBER_MAJOR 20210420 #endif -#define MODULE_MAGIC_NUMBER_MINOR 4 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/http_ssl.h b/include/http_ssl.h index d238439e9a..556a58bdb7 100644 --- a/include/http_ssl.h +++ b/include/http_ssl.h @@ -200,7 +200,8 @@ AP_DECLARE(void) ap_setup_ssl_optional_fns(apr_pool_t *pool); * @return OK iff stapling is being provided */ AP_DECLARE_HOOK(int, ssl_ocsp_prime_hook, (server_rec *s, apr_pool_t *p, - const ap_bytes_t *id, const char *pem)) + const char *id, apr_size_t id_len, + const char *pem)) /** * Registering a certificate for Provisioning of OCSP responses. It is the caller's @@ -218,7 +219,7 @@ AP_DECLARE_HOOK(int, ssl_ocsp_prime_hook, (server_rec *s, apr_pool_t *p, * APR_ENOENT when no provided was found or took responsibility. */ AP_DECLARE(apr_status_t) ap_ssl_ocsp_prime(server_rec *s, apr_pool_t *p, - const ap_bytes_t *id, + const char *id, apr_size_t id_len, const char *pem); /** @@ -242,7 +243,7 @@ typedef void ap_ssl_ocsp_copy_resp(const unsigned char *der, apr_size_t der_len, * @return OK iff response data has been provided, DECLINED otherwise */ AP_DECLARE_HOOK(int, ssl_ocsp_get_resp_hook, - (server_rec *s, conn_rec *c, const ap_bytes_t *id, + (server_rec *s, conn_rec *c, const char *id, apr_size_t id_len, ap_ssl_ocsp_copy_resp *cb, void *userdata)) /** @@ -268,7 +269,7 @@ AP_DECLARE_HOOK(int, ssl_ocsp_get_resp_hook, * @return APR_SUCCESS iff data has been provided */ AP_DECLARE(apr_status_t) ap_ssl_ocsp_get_resp(server_rec *s, conn_rec *c, - const ap_bytes_t *id, + const char *id, apr_size_t id_len, ap_ssl_ocsp_copy_resp *cb, void *userdata); #ifdef __cplusplus diff --git a/include/httpd.h b/include/httpd.h index 397c80b290..5e4c036d8a 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -830,8 +830,6 @@ typedef struct conn_slave_rec conn_slave_rec; typedef struct request_rec request_rec; /** A structure that represents the status of the current connection */ typedef struct conn_state_t conn_state_t; -/** A structure that represents a number of bytes */ -typedef struct ap_bytes_t ap_bytes_t; /* ### would be nice to not include this from httpd.h ... */ /* This comes after we have defined the request_rec type */ @@ -1485,15 +1483,6 @@ struct ap_loadavg_t { }; /** - * @struct ap_bytes_t - * @brief A structure to hold a number of bytes - */ -struct ap_bytes_t { - unsigned char *data; - apr_size_t len; -}; - -/** * Get the context_document_root for a request. This is a generalization of * the document root, which is too limited in the presence of mappers like * mod_userdir and mod_alias. The context_document_root is the directory |