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 da6bdefc9be1a630731d6ea03be259d018921c47..2c866f0cbba877ca9852de5da540e90ec0d4c2c3 100644 (file)
--- a/modules/md/md.h
+++ b/modules/md/md.h
@@ -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;

diff --git a/modules/md/md_acme.c b/modules/md/md_acme.c
index 3b102e65e527a973611a40a516221dc182180e72..abae7bee53a7b7692a83273edf9ddc3ee955085c 100644 (file)
--- 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 f3e043e87c05b1ff69cef4c0d4b32c301f1e0457..3fd768b23387083fead97096f7a0159322cdd2a7 100644 (file)
--- 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 986b49e8f4a119097979cfe846d9df100644ac6b..719c821f14a4c955ff1fc56954f36fe78a537b8e 100644 (file)
--- 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 da89b832ca27761ac613665f9a0575b9f1871e8a..dcf96d417f9e0531f4a550d17998a263fdc31d85 100644 (file)
--- 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 77063bff703071251dcef794267a0d8042acab56..93bd7def1e498ec0c8465ba00fb37503137fe4fa 100644 (file)
--- 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 (file)
index ace0946..0000000
--- 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 03862c22985a1845ce46c14437c4c8f0622cd70e..af68213d9136c3483a7b7cc35d846f61a929bced 100644 (file)
--- 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 c5d710817c98c85d9e822c63eb8b785e02e01aad..14e3725b094a5d61ecfb87ed5849e8cd11b5b1ab 100644 (file)
--- 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 c83e73d17aa95911382c57bdfcdf42715a55ba40..2f3904cec594401d037393bce02ed6d679bb687b 100644 (file)
--- 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"