diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-10-09 21:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-09 21:45:48 +0200 |
| commit | 8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036 (patch) | |
| tree | 954440061e5a0b2858d036c1e6ded1b796722411 | |
| parent | e3ed2a5df9c37dc6bcf3eaa375c3aabc6e9b55bb (diff) | |
| parent | 351d124376bbaaeb5c7f152aa0d499c116e08430 (diff) | |
| download | nixlib-8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036.tar nixlib-8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036.tar.gz nixlib-8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036.tar.bz2 nixlib-8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036.tar.lz nixlib-8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036.tar.xz nixlib-8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036.tar.zst nixlib-8a690b2a9f73f0b6a74bf2f4d6b195c6f1f4f036.zip | |
Merge pull request #17922 from bjornfor/php-config-file-scan-dir
php: change config-file-scan-dir from /etc to /etc/php.d
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1609.xml | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 56d08bf1c2d6..18b9a333e233 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -165,6 +165,13 @@ following incompatible changes:</para> </para> </listitem> + <listitem> + <para>PHP now scans for extra configuration .ini files in /etc/php.d + instead of /etc. This prevents accidentally loading non-PHP .ini files + that may be in /etc. + </para> + </listitem> + </itemizedlist> diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index f79ef61d36a2..ae8256dfaeaf 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -271,7 +271,7 @@ let done [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags + ./configure --with-config-file-scan-dir=/etc/php.d --with-config-file-path=$out/etc --prefix=$out $configureFlags ''; postInstall = '' |