diff options
| -rw-r--r-- | nixos/release-combined.nix | 1 | ||||
| -rw-r--r-- | nixos/release-small.nix | 1 | ||||
| -rw-r--r-- | nixos/release.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/php-pcre.nix | 44 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 7 |
5 files changed, 52 insertions, 2 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 125e6b7050bc..7536bf3e48ef 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -109,6 +109,7 @@ in rec { (all nixos.tests.nfs3) (all nixos.tests.nfs4) (all nixos.tests.openssh) + (all nixos.tests.php-pcre) (all nixos.tests.printing) (all nixos.tests.proxy) (all nixos.tests.sddm.default) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 28f1340caf8d..e9f3cfb4de53 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -40,6 +40,7 @@ in rec { nat nfs3 openssh + php-pcre proxy simple; installer = { diff --git a/nixos/release.nix b/nixos/release.nix index 28eb76d888e4..e02851ac45ae 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -309,6 +309,7 @@ in rec { tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; + tests.php-pcre = callTest tests/php-pcre.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; tests.pgmanage = callTest tests/pgmanage.nix {}; tests.postgis = callTest tests/postgis.nix {}; diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix new file mode 100644 index 000000000000..f618a39a2293 --- /dev/null +++ b/nixos/tests/php-pcre.nix @@ -0,0 +1,44 @@ + +let testString = "can-use-subgroups"; in + +import ./make-test.nix ({ pkgs, ...}: { + name = "php-httpd-pcre-jit-test"; + machine = { config, lib, pkgs, ... }: { + time.timeZone = "UTC"; + services.httpd = { + enable = true; + adminAddr = "please@dont.contact"; + extraSubservices = lib.singleton { + function = f: { + enablePHP = true; + phpOptions = "pcre.jit = true"; + + extraConfig = + let + testRoot = pkgs.writeText "index.php" + '' + <?php + preg_match('/(${testString})/', '${testString}', $result); + var_dump($result); + ?> + ''; + in + '' + Alias / ${testRoot}/ + + <Directory ${testRoot}> + Require all granted + </Directory> + ''; + }; + }; + }; + }; + testScript = { nodes, ... }: + '' + $machine->waitForUnit('httpd.service'); + # Ensure php evaluation by matching on the var_dump syntax + $machine->succeed('curl -vvv -s http://127.0.0.1:80/index.php \ + | grep "string(${toString (builtins.stringLength testString)}) \"${testString}\""'); + ''; +}) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index de8ab8b71813..db4eb6eaee0c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,6 +1,8 @@ +# pcre functionality is tested in nixos/tests/php-pcre.nix + { lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , mysql, libxml2, readline, zlib, curl, postgresql, gettext -, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype +, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds , uwimap, pam, gmp, apacheHttpd, libiconv, systemd }: @@ -23,7 +25,7 @@ let enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ flex bison ] + buildInputs = [ flex bison pcre ] ++ lib.optional stdenv.isLinux systemd; CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11"; @@ -287,6 +289,7 @@ let configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" + "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}" ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}" ++ lib.optional stdenv.isLinux "--with-fpm-systemd"; |