]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 13 Aug 2020 15:26:20 +0000 (17:26 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 13 Aug 2020 15:26:20 +0000 (17:26 +0200)
* PHP-7.4:
  Fixed bug #79724

1  2 
azure-pipelines.yml
ext/session/mod_mm.c

index 20198f888be42d807a63b9f9f9910f0105d3e6b4,acdf32204ba64361b76c8d0f4fe7b3d0bfbd3608..57def3dc2dc67386c1db1e7efdcaadc7171bf3cc
@@@ -15,7 -16,7 +16,7 @@@ jobs
    - template: azure/job.yml
      parameters:
        configurationName: DEBUG_NTS
-       configurationParameters: '--enable-debug --disable-zts'
 -      configurationParameters: '--enable-debug --disable-maintainer-zts --with-mm'
++      configurationParameters: '--enable-debug --disable-zts --with-mm'
    - template: azure/job.yml
      parameters:
        configurationName: RELEASE_ZTS
@@@ -36,7 -37,7 +37,7 @@@
      - template: azure/job.yml
        parameters:
          configurationName: RELEASE_NTS
-         configurationParameters: '--disable-debug --disable-zts'
 -        configurationParameters: '--disable-debug --disable-maintainer-zts --with-mm'
++        configurationParameters: '--disable-debug --disable-zts --with-mm'
      - template: azure/i386/job.yml
        parameters:
          configurationName: I386_DEBUG_NTS
Simple merge