From e63c3932163d672e97d6aee8956376cf3c8c139e Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Thu, 2 Jul 2020 15:12:25 +0200
Subject: [PATCH] Add easyrdf.patch

---
 distillery/resources/compose/runtime/.dockerignore           | 3 ++-
 distillery/resources/compose/runtime/Dockerfile              | 3 +++
 distillery/resources/compose/runtime/patch/easyrdf.patch     | 4 ++++
 .../resources/compose/runtime/scripts/provision_container.sh | 5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 distillery/resources/compose/runtime/patch/easyrdf.patch

diff --git a/distillery/resources/compose/runtime/.dockerignore b/distillery/resources/compose/runtime/.dockerignore
index 0b6ac15..f8d22a7 100644
--- a/distillery/resources/compose/runtime/.dockerignore
+++ b/distillery/resources/compose/runtime/.dockerignore
@@ -3,4 +3,5 @@
 
 # allow the following files:
 !conf/*
-!scripts/*
\ No newline at end of file
+!scripts/*
+!patch/*
\ No newline at end of file
diff --git a/distillery/resources/compose/runtime/Dockerfile b/distillery/resources/compose/runtime/Dockerfile
index d408bb8..5f3e523 100644
--- a/distillery/resources/compose/runtime/Dockerfile
+++ b/distillery/resources/compose/runtime/Dockerfile
@@ -51,6 +51,9 @@ ENV PATH "/usr/local/bin:/var/www/data/project/vendor/bin:$PATH"
 # remove default configuration
 RUN rm /etc/apache2/sites-available/*.conf && \
     rm /etc/apache2/sites-enabled/*.conf
+
+ADD patch/easyrdf.patch /patch/easyrdf.patch
+
 # Add wisski configuration
 ADD conf/ports.conf /etc/apache2/ports.conf
 ADD conf/wisski.conf /etc/apache2/sites-available/wisski.conf
diff --git a/distillery/resources/compose/runtime/patch/easyrdf.patch b/distillery/resources/compose/runtime/patch/easyrdf.patch
new file mode 100644
index 0000000..46daa01
--- /dev/null
+++ b/distillery/resources/compose/runtime/patch/easyrdf.patch
@@ -0,0 +1,4 @@
+281c281
+<         if (preg_match("|^HTTP/([\d\.x]+) (\d+) ([^\r\n]+)|", $status, $m)) {
+---
+>         if(preg_match("|^HTTP/([\d\.x]+) (\d+) ([^\r\n]*)|", $status, $m)) {
diff --git a/distillery/resources/compose/runtime/scripts/provision_container.sh b/distillery/resources/compose/runtime/scripts/provision_container.sh
index a04acf2..3a69f48 100644
--- a/distillery/resources/compose/runtime/scripts/provision_container.sh
+++ b/distillery/resources/compose/runtime/scripts/provision_container.sh
@@ -107,6 +107,11 @@ log_info " => Enable Wisski modules"
 drush pm-enable --yes wisski_core wisski_linkblock wisski_pathbuilder wisski_adapter_sparql11_pb wisski_salz
 drupal_sites_permission_workaround
 
+# Because of a regresssion in EasyRDF and Tomcat, we need to manually patch EasyRDF
+EASYRDF_RESPONSE="$COMPOSER_DIR/vendor/easyrdf/easyrdf/lib/EasyRdf/Http/Response.php"
+log_info " => Patching '$EASYRDF_RESPONSE'"
+patch "$EASYRDF_RESPONSE" < "/patch/easyrdf.patch"
+
 log_info " => Provisioning is now complete. "
 log_ok "Your installation details are as follows:"
 function printdetails() {