From: Jeff Trawick <trawick@apache.org>
Date: Sat, 19 Mar 2016 20:41:31 +0000 (+0000)
Subject: Don't check for presence of ap_log_cdata/ap_log_data
X-Git-Tag: 2.5.0-alpha~1865
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be470badccb0bf3d4bb46ac3cf650dfb1e93f6c5;p=apache

Don't check for presence of ap_log_cdata/ap_log_data


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735809 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/mod_ssl_ct.c b/modules/ssl/mod_ssl_ct.c
index 5f4e71b72b..c21beee060 100644
--- a/modules/ssl/mod_ssl_ct.c
+++ b/modules/ssl/mod_ssl_ct.c
@@ -1666,7 +1666,6 @@ static apr_status_t validate_server_data(apr_pool_t *p, conn_rec *c,
 {
     apr_status_t rv = APR_SUCCESS;
 
-#if AP_MODULE_MAGIC_AT_LEAST(20130702,2)
     if (conncfg->serverhello_sct_list) {
         ap_log_cdata(APLOG_MARK, APLOG_TRACE6, c, "SCT(s) from ServerHello",
                      conncfg->serverhello_sct_list,
@@ -1687,7 +1686,6 @@ static apr_status_t validate_server_data(apr_pool_t *p, conn_rec *c,
                      conncfg->ocsp_sct_list_size,
                      AP_LOG_DATA_SHOW_OFFSET);
     }
-#endif /* httpd has ap_log_*data() */
 
     if (!conncfg->all_scts) {
         conncfg->all_scts = apr_array_make(p, 4, sizeof(ct_sct_data));
diff --git a/modules/ssl/ssl_ct_sct.c b/modules/ssl/ssl_ct_sct.c
index 6870d6600b..079c8b672d 100644
--- a/modules/ssl/ssl_ct_sct.c
+++ b/modules/ssl/ssl_ct_sct.c
@@ -278,14 +278,12 @@ apr_status_t sct_parse(const char *source,
                  "SCT from %s: version %d timestamp %s hash alg %d sig alg %d",
                  source, fields->version, fields->timestr,
                  fields->hash_alg, fields->sig_alg);
-#if AP_MODULE_MAGIC_AT_LEAST(20130702,2)
     ap_log_data(APLOG_MARK, APLOG_DEBUG, s, "Log Id",
                 fields->logid, sizeof(fields->logid),
                 AP_LOG_DATA_SHOW_OFFSET);
     ap_log_data(APLOG_MARK, APLOG_DEBUG, s, "Signature",
                 fields->sig, fields->siglen,
                 AP_LOG_DATA_SHOW_OFFSET);
-#endif /* httpd has ap_log_*data() */
 
     ap_assert(!(fields->signed_data && rv != APR_SUCCESS));