From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 13 Aug 2020 15:26:20 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3ddda4e3c97c11ae538d44bafa4793fac94a533;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79724
---

c3ddda4e3c97c11ae538d44bafa4793fac94a533
diff --cc azure-pipelines.yml
index 20198f888b,acdf32204b..57def3dc2d
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@@ -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