From: Rainer Jung Date: Tue, 16 Jun 2026 19:43:00 +0000 (+0000) Subject: mod_md: Remove seeparate versioning. X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=679b1a49ad7882c6d68950b6fd46fcea36b33db1;p=thirdparty%2Fapache%2Fhttpd.git mod_md: Remove seeparate versioning. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935441 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/md/md.h b/modules/md/md.h index da6bdefc9b..2c866f0cbb 100644 --- a/modules/md/md.h +++ b/modules/md/md.h @@ -20,7 +20,6 @@ #include #include "md_time.h" -#include "md_version.h" struct apr_array_header_t; struct apr_hash_t; diff --git a/modules/md/md_acme.c b/modules/md/md_acme.c index 3b102e65e5..abae7bee53 100644 --- a/modules/md/md_acme.c +++ b/modules/md/md_acme.c @@ -34,7 +34,6 @@ #include "md_store.h" #include "md_result.h" #include "md_util.h" -#include "md_version.h" #include "md_acme.h" #include "md_acme_acct.h" @@ -647,7 +646,7 @@ apr_status_t md_acme_create(md_acme_t **pacme, apr_pool_t *p, const char *url, acme->url = url; acme->p = p; acme->user_agent = apr_psprintf(p, "%s mod_md/%s", - base_product, MOD_MD_VERSION); + base_product, AP_SERVER_BASEREVISION); acme->proxy_url = apr_pstrdup(p, proxy_url); acme->max_retries = 9; acme->ca_file = ca_file; diff --git a/modules/md/md_acme_acct.c b/modules/md/md_acme_acct.c index f3e043e87c..3fd768b233 100644 --- a/modules/md/md_acme_acct.c +++ b/modules/md/md_acme_acct.c @@ -33,7 +33,6 @@ #include "md_result.h" #include "md_store.h" #include "md_util.h" -#include "md_version.h" #include "md_acme.h" #include "md_acme_acct.h" diff --git a/modules/md/md_acme_drive.h b/modules/md/md_acme_drive.h index 986b49e8f4..719c821f14 100644 --- a/modules/md/md_acme_drive.h +++ b/modules/md/md_acme_drive.h @@ -16,6 +16,8 @@ #ifndef md_acme_drive_h #define md_acme_drive_h +#define MD_ACME_DEF_URL "https://acme-v02.api.letsencrypt.org/directory" + struct apr_array_header_t; struct md_acme_order_t; struct md_credentials_t; diff --git a/modules/md/md_status.c b/modules/md/md_status.c index da89b832ca..dcf96d417f 100644 --- a/modules/md/md_status.c +++ b/modules/md/md_status.c @@ -326,7 +326,7 @@ apr_status_t md_status_get_json(md_json_t **pjson, apr_array_header_t *mds, int i; json = md_json_create(p); - md_json_sets(MOD_MD_VERSION, json, MD_KEY_VERSION, NULL); + md_json_sets(AP_SERVER_BASEREVISION, json, MD_KEY_VERSION, NULL); for (i = 0; i < mds->nelts; ++i) { md = APR_ARRAY_IDX(mds, i, const md_t *); status_get_md_json(&mdj, md, reg, ocsp, 0, p); diff --git a/modules/md/md_store_fs.c b/modules/md/md_store_fs.c index 77063bff70..93bd7def1e 100644 --- a/modules/md/md_store_fs.c +++ b/modules/md/md_store_fs.c @@ -33,7 +33,6 @@ #include "md_store.h" #include "md_store_fs.h" #include "md_util.h" -#include "md_version.h" /**************************************************************************************************/ /* file system based implementation of md_store_t */ diff --git a/modules/md/md_version.h b/modules/md/md_version.h deleted file mode 100644 index ace0946095..0000000000 --- a/modules/md/md_version.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef mod_md_md_version_h -#define mod_md_md_version_h - -#undef PACKAGE_VERSION -#undef PACKAGE_TARNAME -#undef PACKAGE_STRING -#undef PACKAGE_NAME -#undef PACKAGE_BUGREPORT - -/** - * @macro - * Version number of the md module as c string - */ -#define MOD_MD_VERSION "2.6.10" - -/** - * @macro - * Numerical representation of the version number of the md module - * release. This is a 24 bit number with 8 bits for major number, 8 bits - * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. - */ -#define MOD_MD_VERSION_NUM 0x02060a - -#define MD_ACME_DEF_URL "https://acme-v02.api.letsencrypt.org/directory" - -#endif /* mod_md_md_version_h */ diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c index 03862c2298..af68213d91 100644 --- a/modules/md/mod_md.c +++ b/modules/md/mod_md.c @@ -44,7 +44,6 @@ #include "md_reg.h" #include "md_status.h" #include "md_util.h" -#include "md_version.h" #include "md_acme.h" #include "md_acme_authz.h" @@ -878,7 +877,7 @@ static apr_status_t md_post_config_before_ssl(apr_pool_t *p, apr_pool_t *plog, } else { ap_log_error( APLOG_MARK, APLOG_INFO, 0, s, APLOGNO(10071) - "mod_md (v%s), initializing...", MOD_MD_VERSION); + "mod_md (v%s), initializing...", AP_SERVER_BASEREVISION); } (void)plog; diff --git a/modules/md/mod_md_drive.c b/modules/md/mod_md_drive.c index c5d710817c..14e3725b09 100644 --- a/modules/md/mod_md_drive.c +++ b/modules/md/mod_md_drive.c @@ -41,7 +41,6 @@ #include "md_result.h" #include "md_reg.h" #include "md_util.h" -#include "md_version.h" #include "md_acme.h" #include "md_acme_authz.h" diff --git a/modules/md/mod_md_status.c b/modules/md/mod_md_status.c index c83e73d17a..2f3904cec5 100644 --- a/modules/md/mod_md_status.c +++ b/modules/md/mod_md_status.c @@ -40,7 +40,6 @@ #include "md_log.h" #include "md_reg.h" #include "md_util.h" -#include "md_version.h" #include "md_acme.h" #include "md_acme_authz.h"