Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79724

Author: nikic

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

azure/apt.yml

@@ -34,6 +34,7 @@ steps:
                        libldap2-dev \
                        libsodium-dev \
                        libargon2-0-dev \
+                       libmm-dev \
                        postgresql \
                        postgresql-contrib \
                        llvm \

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)