Bumping version after last merges. Relaxing proxy setup to work on all platforms (hopefully).

Stefan Eissing · Stefan Eissing · commit 9c7aae8aa73b · 2020-01-09T14:28:23.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,4 @@
+ * Michal Karm Babacek (@Karm) added `cmake` support, especially valuable under Windows.
  * protocol check for pre-configured "tls-alpn-01" challenge has been improved. It will now
    check all matching virtual hosts for protocol support. Thanks to @mkauf.
 
diff --git a/README.md b/README.md
@@ -743,9 +743,13 @@ dir modules\
 mod_md.exp  mod_md.lib  mod_md.so*  mod_md.so.manifest
 ```
 
+## Debian
+
+Debian unstable includes the latest Apache httpd release. If you want a newer version of `mod_md` on top of it, it should be easy to build it with the instructions above.
+
 ## Fedora
 
-The plan in Fedora is to include v2.x of mod_md with Fedora 31, which is due to be released end of summer 2019.
+The module has become part of Fedora 31.
 
 ## Ubuntu
 
diff --git a/configure.ac b/configure.ac
@@ -14,7 +14,7 @@
 #
 
 AC_PREREQ([2.69])
-AC_INIT([mod_md], [2.2.5], [stefan.eissing@greenbytes.de])
+AC_INIT([mod_md], [2.2.6], [stefan.eissing@greenbytes.de])
 
 LT_PREREQ([2.2.6])
 LT_INIT()
diff --git a/src/md_version.h b/src/md_version.h
@@ -27,15 +27,15 @@
  * @macro
  * Version number of the md module as c string
  */
-#define MOD_MD_VERSION "2.2.5-git"
+#define MOD_MD_VERSION "2.2.6-git"
 
 /**
  * @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 0x020205
+#define MOD_MD_VERSION_NUM 0x020206
 
 #define MD_ACME_DEF_URL    "https://acme-v02.api.letsencrypt.org/directory"
 
diff --git a/test/conf/proxy.conf b/test/conf/proxy.conf
@@ -7,9 +7,7 @@ Listen 5052
     ProxyVia On
 
     <Proxy *>
-        Order deny,allow
-        Deny from all
-        Allow from localhost
+        # No require or other restrictions, this is just a test server
     </Proxy> 
 </VirtualHost>
 
diff --git a/test/conf/proxy.conf.in b/test/conf/proxy.conf.in
@@ -7,7 +7,7 @@ Listen @HTTP_PROXY_PORT@
     ProxyVia On
 
     <Proxy *>
-        Require localhost
+        # No require or other restrictions, this is just a test server
     </Proxy> 
 </VirtualHost>
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	+ * Michal Karm Babacek (@Karm) added `cmake` support, especially valuable under Windows.
`1`	`2`	`* protocol check for pre-configured "tls-alpn-01" challenge has been improved. It will now`
`2`	`3`	`check all matching virtual hosts for protocol support. Thanks to @mkauf.`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#`
`15`	`15`
`16`	`16`	`AC_PREREQ([2.69])`
`17`		`-AC_INIT([mod_md], [2.2.5], [stefan.eissing@greenbytes.de])`
	`17`	`+AC_INIT([mod_md], [2.2.6], [stefan.eissing@greenbytes.de])`
`18`	`18`
`19`	`19`	`LT_PREREQ([2.2.6])`
`20`	`20`	`LT_INIT()`