mod_md: Remove seeparate versioning.

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

Author: rainerjung

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;

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;

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"

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;

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);

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 */

modules/md/md_version.h

@@ -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;

modules/md/mod_md.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"
 

modules/md/mod_md_drive.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"