svn commit: r1935441 - httpd/httpd/trunk/modules/md
[email protected] Tue, 16 Jun 2026 19:43:00 -0000
| Newsgroups | gmane.comp.apache.cvs |
|---|---|
| Message-ID | <178163898063.2539483.15493622821835375171@svn03-he-fi> |
Author: rjung
Date: Tue Jun 16 19:43:00 2026
New Revision: 1935441
Log:
mod_md: Remove seeparate versioning.
Deleted:
httpd/httpd/trunk/modules/md/md_version.h
Modified:
httpd/httpd/trunk/modules/md/md.h
httpd/httpd/trunk/modules/md/md_acme.c
httpd/httpd/trunk/modules/md/md_acme_acct.c
httpd/httpd/trunk/modules/md/md_acme_drive.h
httpd/httpd/trunk/modules/md/md_status.c
httpd/httpd/trunk/modules/md/md_store_fs.c
httpd/httpd/trunk/modules/md/mod_md.c
httpd/httpd/trunk/modules/md/mod_md_drive.c
httpd/httpd/trunk/modules/md/mod_md_status.c
Modified: httpd/httpd/trunk/modules/md/md.h
==============================================================================
--- httpd/httpd/trunk/modules/md/md.h Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/md.h Tue Jun 16 19:43:00 2026 (r1935441)
@@ -20,7 +20,6 @@
#include <apr_time.h>
#include "md_time.h"
-#include "md_version.h"
struct apr_array_header_t;
struct apr_hash_t;
Modified: httpd/httpd/trunk/modules/md/md_acme.c
==============================================================================
--- httpd/httpd/trunk/modules/md/md_acme.c Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/md_acme.c Tue Jun 16 19:43:00 2026 (r1935441)
@@ -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 **
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;
Modified: httpd/httpd/trunk/modules/md/md_acme_acct.c
==============================================================================
--- httpd/httpd/trunk/modules/md/md_acme_acct.c Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/md_acme_acct.c Tue Jun 16 19:43:00 2026 (r1935441)
@@ -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"
Modified: httpd/httpd/trunk/modules/md/md_acme_drive.h
==============================================================================
--- httpd/httpd/trunk/modules/md/md_acme_drive.h Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/md_acme_drive.h Tue Jun 16 19:43:00 2026 (r1935441)
@@ -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;
Modified: httpd/httpd/trunk/modules/md/md_status.c
==============================================================================
--- httpd/httpd/trunk/modules/md/md_status.c Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/md_status.c Tue Jun 16 19:43:00 2026 (r1935441)
@@ -326,7 +326,7 @@ apr_status_t md_status_get_json(md_json_
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);
Modified: httpd/httpd/trunk/modules/md/md_store_fs.c
==============================================================================
--- httpd/httpd/trunk/modules/md/md_store_fs.c Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/md_store_fs.c Tue Jun 16 19:43:00 2026 (r1935441)
@@ -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 */
Modified: httpd/httpd/trunk/modules/md/mod_md.c
==============================================================================
--- httpd/httpd/trunk/modules/md/mod_md.c Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/mod_md.c Tue Jun 16 19:43:00 2026 (r1935441)
@@ -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_befor
}
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;
Modified: httpd/httpd/trunk/modules/md/mod_md_drive.c
==============================================================================
--- httpd/httpd/trunk/modules/md/mod_md_drive.c Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/mod_md_drive.c Tue Jun 16 19:43:00 2026 (r1935441)
@@ -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"
Modified: httpd/httpd/trunk/modules/md/mod_md_status.c
==============================================================================
--- httpd/httpd/trunk/modules/md/mod_md_status.c Tue Jun 16 19:28:00 2026 (r1935440)
+++ httpd/httpd/trunk/modules/md/mod_md_status.c Tue Jun 16 19:43:00 2026 (r1935441)
@@ -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"