Fixed bug #79724

php · Aug 13, 2020 · 8bda799 · 8bda799
1 parent 981af26
commit 8bda799
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -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
@@ -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
@@ -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
@@ -466,7 +466,7 @@ PS_GC_FUNC(mm)
 
 	mm_unlock(data->mm);
 
-	return nrdels;
+	return *nrdels;
 }
 
 PS_CREATE_SID_FUNC(mm)