diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-13 11:45:05 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-13 17:25:51 +0200 |
| commit | 8bda799d6f6b3027117105ab717dacdcab597032 (patch) | |
| tree | 0a3862c1997e74795506cd8b97b10b360004a467 | |
| parent | 981af26d7bc742a4cfe34b764a5f32f0e3fc776c (diff) | |
| download | php-git-8bda799d6f6b3027117105ab717dacdcab597032.tar.gz | |
Fixed bug #79724
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | azure/apt.yml | 1 | ||||
| -rw-r--r-- | ext/session/mod_mm.c | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -39,6 +39,10 @@ PHP NEWS . Fixed bug #64705 (errorInfo property of PDOException is null when PDO::__construct() fails). (Ahmed Abdou) +- Session: + . Fixed bug #79724 (Return type does not match in ext/session/mod_mm.c). + (Nikita) + - Standard: . Fixed bug #79930 (array_merge_recursive() crashes when called with array with single reference). (Nikita) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 688d36c148..acdf32204b 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-maintainer-zts' + configurationParameters: '--enable-debug --disable-maintainer-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-maintainer-zts' + configurationParameters: '--disable-debug --disable-maintainer-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 93cfde7633..6e175f9b2b 100644 --- a/ext/session/mod_mm.c +++ b/ext/session/mod_mm.c @@ -466,7 +466,7 @@ PS_GC_FUNC(mm) mm_unlock(data->mm); - return nrdels; + return *nrdels; } PS_CREATE_SID_FUNC(mm) |