From 181fea0157c1a36d93381b9e2675a0c358eccc52 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 17 Dec 2021 19:52:10 +0000
Subject: [PATCH] 25.0.1-debian-10-r39 release

---
 bitnami/wildfly/25/debian-10/Dockerfile          |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libos.sh      | 16 ++++++++++++++++
 .../opt/bitnami/scripts/libwebserver.sh          |  4 ++++
 bitnami/wildfly/README.md                        |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/bitnami/wildfly/25/debian-10/Dockerfile b/bitnami/wildfly/25/debian-10/Dockerfile
index b77079da9be8..954e7cac5dd2 100644
--- a/bitnami/wildfly/25/debian-10/Dockerfile
+++ b/bitnami/wildfly/25/debian-10/Dockerfile
@@ -20,7 +20,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/wildfly/postunpack.sh
 ENV BITNAMI_APP_NAME="wildfly" \
-    BITNAMI_IMAGE_VERSION="25.0.1-debian-10-r38" \
+    BITNAMI_IMAGE_VERSION="25.0.1-debian-10-r39" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/wildfly/bin:/opt/bitnami/common/bin:$PATH" \
     WILDFLY_HOME="/home/wildfly"
diff --git a/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index 6bd564773acb..0a1a92a747f9 100644
--- a/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -446,3 +446,19 @@ generate_sha_hash() {
     echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}'
 }
 
+########################
+# Converts a string to its hexadecimal representation
+# Arguments:
+#   $1 - string
+# Returns:
+#   hexadecimal representation of the string
+#########################
+convert_to_hex() {
+    local -r str=${1:?missing input string}
+    local -i iterator
+    local char
+    for ((iterator=0; iterator<${#str}; iterator++)); do
+        char=${str:iterator:1}
+        printf '%x' "'${char}"
+    done
+}
diff --git a/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 459f99c7d1cd..503650210583 100644
--- a/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/wildfly/25/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -177,6 +177,8 @@ web_server_reload() {
 #   --document-root - Path to document root directory
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional vhost configuration (no default)
+#   --apache-additional-http-configuration - Additional HTTP vhost configuration (no default)
+#   --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default)
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
@@ -224,6 +226,8 @@ ensure_web_server_app_configuration_exists() {
 
             # Specific Apache flags
             --apache-additional-configuration \
+            | --apache-additional-http-configuration \
+            | --apache-additional-https-configuration \
             | --apache-before-vhost-configuration \
             | --apache-allow-override \
             | --apache-extra-directory-configuration \
diff --git a/bitnami/wildfly/README.md b/bitnami/wildfly/README.md
index f322677ec4fc..536a94ebfdc6 100644
--- a/bitnami/wildfly/README.md
+++ b/bitnami/wildfly/README.md
@@ -47,7 +47,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`25`, `25-debian-10`, `25.0.1`, `25.0.1-debian-10-r38`, `latest` (25/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wildfly/blob/25.0.1-debian-10-r38/25/debian-10/Dockerfile)
+* [`25`, `25-debian-10`, `25.0.1`, `25.0.1-debian-10-r39`, `latest` (25/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wildfly/blob/25.0.1-debian-10-r39/25/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wildfly GitHub repo](https://github.com/bitnami/bitnami-docker-wildfly).