diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-13 17:26:20 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-13 17:26:20 +0200 |
| commit | c3ddda4e3c97c11ae538d44bafa4793fac94a533 (patch) | |
| tree | bdb822ca3c8304434c7b35deee007a3273d1a02d | |
| parent | e40c9d49184d2ce93392a09033dbe5193d36e55f (diff) | |
| parent | 8bda799d6f6b3027117105ab717dacdcab597032 (diff) | |
| download | php-git-c3ddda4e3c97c11ae538d44bafa4793fac94a533.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #79724
| -rw-r--r-- | azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | azure/apt.yml | 1 | ||||
| -rw-r--r-- | ext/session/mod_mm.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 20198f888b..57def3dc2d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,10 +12,11 @@ trigger: - UPGRADING.INTERNALS jobs: + # We specify --with-mm here, because it cannot be used together with --enable-maintainer-zts. - template: azure/job.yml parameters: configurationName: DEBUG_NTS - configurationParameters: '--enable-debug --disable-zts' + configurationParameters: '--enable-debug --disable-zts --with-mm' - template: azure/job.yml parameters: configurationName: RELEASE_ZTS @@ -36,7 +37,7 @@ jobs: - template: azure/job.yml parameters: configurationName: RELEASE_NTS - configurationParameters: '--disable-debug --disable-zts' + configurationParameters: '--disable-debug --disable-zts --with-mm' - template: azure/i386/job.yml parameters: configurationName: I386_DEBUG_NTS diff --git a/azure/apt.yml b/azure/apt.yml index 8e51d80629..e8da9b001d 100644 --- a/azure/apt.yml +++ b/azure/apt.yml @@ -34,6 +34,7 @@ steps: libldap2-dev \ libsodium-dev \ libargon2-0-dev \ + libmm-dev \ postgresql \ postgresql-contrib \ llvm \ diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c index 6698c307e0..e6f8fa22b5 100644 --- a/ext/session/mod_mm.c +++ b/ext/session/mod_mm.c @@ -464,7 +464,7 @@ PS_GC_FUNC(mm) mm_unlock(data->mm); - return nrdels; + return *nrdels; } PS_CREATE_SID_FUNC(mm) |