···

       
132
       
132
       
 
       
      </listitem>

     

       
133
       
133
       
 
       
      <listitem>

     

       
134
       
134
       
 
       
        <para>

     

       
135
       
135
       
+
       
          PHP is now built <literal>NTS</literal> (Non-Thread Safe)

     

       
136
       
136
       
+
       
          style by default, for Apache and <literal>mod_php</literal>

     

       
137
       
137
       
+
       
          usage we still enable <literal>ZTS</literal> (Zend Thread

     

       
138
       
138
       
+
       
          Safe). This has been a common practice for a long time in

     

       
139
       
139
       
+
       
          other distributions.

     

       
140
       
140
       
+
       
        </para>

     

       
141
       
141
       
+
       
      </listitem>

     

       
142
       
142
       
+
       
      <listitem>

     

       
143
       
143
       
+
       
        <para>

     

       
135
       
144
       
 
       
          <literal>protonup</literal> has been aliased to and replaced

     

       
136
       
145
       
 
       
          by <literal>protonup-ng</literal> due to upstream not

     

       
137
       
146
       
 
       
          maintaining it.

     

···

       
53
       
53
       
 
       


     

       
54
       
54
       
 
       
- PHP now defaults to PHP 8.1, updated from 8.0.

     

       
55
       
55
       
 
       


     

       
56
       
56
       
+
       
- PHP is now built `NTS` (Non-Thread Safe) style by default, for Apache and

     

       
57
       
57
       
+
       
  `mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a

     

       
58
       
58
       
+
       
  common practice for a long time in other distributions.

     

       
59
       
59
       
+
       


     

       
56
       
60
       
 
       
- `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it.

     

       
57
       
61
       
 
       


     

       
58
       
62
       
 
       
- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default.

     

···

       
18
       
18
       
 
       
    sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'

     

       
19
       
19
       
 
       
  '';

     

       
20
       
20
       
 
       


     

       
21
       
21
       
-
       
  php = cfg.phpPackage.override { apacheHttpd = pkg; };

     

       
21
       
21
       
+
       
  php = cfg.phpPackage.override { apxs2Support = true; apacheHttpd = pkg; };

     

       
22
       
22
       
 
       


     

       
23
       
23
       
 
       
  phpModuleName = let

     

       
24
       
24
       
 
       
    majorVersion = lib.versions.major (lib.getVersion php);

     
···

       
658
       
658
       
 
       
        message = ''

     

       
659
       
659
       
 
       
          Options `services.httpd.virtualHosts.<name>.enableACME` and

     

       
660
       
660
       
 
       
          `services.httpd.virtualHosts.<name>.useACMEHost` are mutually exclusive.

     

       
661
       
661
       
+
       
        '';

     

       
662
       
662
       
+
       
      }

     

       
663
       
663
       
+
       
      {

     

       
664
       
664
       
+
       
        assertion = cfg.enablePHP -> php.ztsSupport;

     

       
665
       
665
       
+
       
        message = ''

     

       
666
       
666
       
+
       
          The php package provided by `services.httpd.phpPackage` is not built with zts support. Please

     

       
667
       
667
       
+
       
          ensure the php has zts support by settings `services.httpd.phpPackage = php.override { ztsSupport = true; }`

     

       
661
       
668
       
 
       
        '';

     

       
662
       
669
       
 
       
      }

     

       
663
       
670
       
 
       
    ] ++ map (name: mkCertOwnershipAssertion {

     

···

       
43
       
43
       
 
       
    , phpdbgSupport ? true

     

       
44
       
44
       
 
       


     

       
45
       
45
       
 
       
      # Misc flags

     

       
46
       
46
       
-
       
    , apxs2Support ? !stdenv.isDarwin

     

       
46
       
46
       
+
       
    , apxs2Support ? false

     

       
47
       
47
       
 
       
    , argon2Support ? true

     

       
48
       
48
       
 
       
    , cgotoSupport ? false

     

       
49
       
49
       
 
       
    , embedSupport ? false