httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1735809 - in /httpd/httpd/trunk/modules/ssl: mod_ssl_ct.c ssl_ct_sct.c
Date Sat, 19 Mar 2016 20:41:31 GMT
Author: trawick
Date: Sat Mar 19 20:41:31 2016
New Revision: 1735809

URL: http://svn.apache.org/viewvc?rev=1735809&view=rev
Log:
Don't check for presence of ap_log_cdata/ap_log_data

Modified:
    httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c
    httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c

Modified: httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c?rev=1735809&r1=1735808&r2=1735809&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c (original)
+++ httpd/httpd/trunk/modules/ssl/mod_ssl_ct.c Sat Mar 19 20:41:31 2016
@@ -1666,7 +1666,6 @@ static apr_status_t validate_server_data
 {
     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
                      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));

Modified: httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c?rev=1735809&r1=1735808&r2=1735809&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_ct_sct.c Sat Mar 19 20:41:31 2016
@@ -278,14 +278,12 @@ apr_status_t sct_parse(const char *sourc
                  "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));
 



Mime
View raw message