summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-fpm.conf10
-rw-r--r--php82.spec6
2 files changed, 9 insertions, 7 deletions
diff --git a/php-fpm.conf b/php-fpm.conf
index 53a07b6..750f987 100644
--- a/php-fpm.conf
+++ b/php-fpm.conf
@@ -5,11 +5,6 @@
; All relative paths in this configuration file are relative to PHP's install
; prefix.
-; Include one or more files. If glob(3) exists, it is used to include a bunch of
-; files from a glob(3) pattern. This directive can be used everywhere in the
-; file.
-include=/etc/php-fpm.d/*.conf
-
;;;;;;;;;;;;;;;;;;
; Global Options ;
;;;;;;;;;;;;;;;;;;
@@ -133,5 +128,8 @@ daemonize = yes
; used in logs and stats. There is no limitation on the number of pools which
; FPM can handle. Your system will tell you anyway :)
-; See /etc/php-fpm.d/*.conf
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
+include=/etc/php-fpm.d/*.conf
diff --git a/php82.spec b/php82.spec
index 56749f7..4b97550 100644
--- a/php82.spec
+++ b/php82.spec
@@ -113,7 +113,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -2176,6 +2176,10 @@ fi
%changelog
+* Mon Dec 19 2022 Remi Collet <remi@remirepo.net> - 8.2.1~RC1-2
+- php-fpm.conf: move include directive after [global] section
+ https://github.com/remicollet/remirepo/issues/225
+
* Wed Dec 14 2022 Remi Collet <remi@remirepo.net> - 8.2.1~RC1-1
- update to 8.2.1RC1
- use oracle client library version 21.8