From 9035cbf0c13d9adf8aed8ea0057496c08850f733 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Fri, 17 Dec 2021 00:40:04 +0000
Subject: [PATCH] 5.8.2-debian-10-r37 release

---
 bitnami/wordpress-nginx/5/debian-10/Dockerfile   |  4 ++--
 .../prebuildfs/opt/bitnami/scripts/libos.sh      | 16 ++++++++++++++++
 .../opt/bitnami/scripts/libwebserver.sh          |  4 ++++
 bitnami/wordpress-nginx/README.md                |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/bitnami/wordpress-nginx/5/debian-10/Dockerfile b/bitnami/wordpress-nginx/5/debian-10/Dockerfile
index 2e85dd1f3166..354c9bcb9ff5 100644
--- a/bitnami/wordpress-nginx/5/debian-10/Dockerfile
+++ b/bitnami/wordpress-nginx/5/debian-10/Dockerfile
@@ -20,13 +20,13 @@ RUN chmod g+rwX /opt/bitnami
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
-RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/nginx/postunpack.sh
+RUN /opt/bitnami/scripts/php/postunpack.sh
 RUN /opt/bitnami/scripts/nginx-php-fpm/postunpack.sh
 RUN /opt/bitnami/scripts/wordpress/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="wordpress-nginx" \
-    BITNAMI_IMAGE_VERSION="5.8.2-debian-10-r36" \
+    BITNAMI_IMAGE_VERSION="5.8.2-debian-10-r37" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
     MARIADB_ROOT_PASSWORD="" \
diff --git a/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index 6bd564773acb..0a1a92a747f9 100644
--- a/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/wordpress-nginx/5/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/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 459f99c7d1cd..503650210583 100644
--- a/bitnami/wordpress-nginx/5/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/wordpress-nginx/5/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/wordpress-nginx/README.md b/bitnami/wordpress-nginx/README.md
index b40a5f0d548b..127bee7a4a48 100644
--- a/bitnami/wordpress-nginx/README.md
+++ b/bitnami/wordpress-nginx/README.md
@@ -37,7 +37,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/).
 
 
-- [`5`, `5-debian-10`, `5.8.2`, `5.8.2-debian-10-r36`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/5.8.2-debian-10-r36/5/debian-10/Dockerfile)
+- [`5`, `5-debian-10`, `5.8.2`, `5.8.2-debian-10-r37`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress-nginx/blob/5.8.2-debian-10-r37/5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wordpress-nginx GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress-nginx).