From acffd4cf383cf31c238fdec3244e8434655b6138 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 4 Apr 2019 22:28:24 +0200
Subject: [PATCH 1/4] Fix OPcache warnings

---
 conf/php-fpm.ini | 7 -------
 scripts/upgrade  | 4 ++++
 2 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 conf/php-fpm.ini

diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini
deleted file mode 100644
index 104f242..0000000
--- a/conf/php-fpm.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-opcache.enable=1
-opcache.enable_cli=1
-opcache.interned_strings_buffer=8
-opcache.max_accelerated_files=10000
-opcache.memory_consumption=128
-opcache.save_comments=1
-opcache.revalidate_freq=1
diff --git a/scripts/upgrade b/scripts/upgrade
index d905f64..c600414 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -140,6 +140,10 @@ ynh_print_info "Upgrading php-fpm configuration..."
 # Create a dedicated php-fpm config
 ynh_add_fpm_config
 
+# Delete existing ini configuration file (backward compatibility)
+if [ -f /etc/php/7.0/fpm/conf.d/20-$app.ini ]; then
+	ynh_secure_remove /etc/php/7.0/fpm/conf.d/20-$app.ini
+fi
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================

From 779173d6c4fb229d7cb0590be6a5f08c2f55c560 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 4 Apr 2019 22:28:53 +0200
Subject: [PATCH 2/4] Fix PATH warning

---
 conf/php-fpm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 74825fa..60ddc95 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -392,7 +392,7 @@ chdir = __FINALPATH__
 ;env[TMP] = /tmp
 ;env[TMPDIR] = /tmp
 ;env[TEMP] = /tmp
-
+env[PATH] = $PATH
 ; Additional php.ini defines, specific to this pool of workers. These settings
 ; overwrite the values previously defined in the php.ini. The directives are the
 ; same as the PHP SAPI:

From 477391a2031bb6827910c1bc6a6a1feabbdfbdaf Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 4 Apr 2019 22:29:06 +0200
Subject: [PATCH 3/4] Fix always_populate_raw_post_data warning

---
 conf/php-fpm.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 60ddc95..f13ed6d 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -433,7 +433,6 @@ env[PATH] = $PATH
 php_value[upload_max_filesize] = 10G
 php_value[post_max_size] = 10G
 php_value[default_charset] = UTF-8
-php_value[always_populate_raw_post_data] = -1
 php_value[opcache.enable]=1
 php_value[opcache.enable_cli]=1
 php_value[opcache.interned_strings_buffer]=8

From 2549f0ed40fe217907fc91386d4b4fb97d0aff5b Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 4 Apr 2019 22:29:43 +0200
Subject: [PATCH 4/4] Fix impossible upload via web interface

---
 conf/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 3159d95..6c5d7ec 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -65,7 +65,7 @@ location ^~ __PATH__/ {
 
   location ~ ^__PATH__/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|ocm-provider/.+)\.php(/.*|)$ {
     include fastcgi_params;
-    fastcgi_split_path_info ^(.+\.php)(/.*|)$;
+    fastcgi_split_path_info ^(.+\.php)(/.+)$;
     fastcgi_param SCRIPT_FILENAME $request_filename;
     fastcgi_param PATH_INFO $fastcgi_path_info;
     fastcgi_param HTTPS on;