Skip to content

Commit 8bda799

Browse files
committed
Fixed bug #79724
1 parent 981af26 commit 8bda799

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ PHP NEWS
3939
. Fixed bug #64705 (errorInfo property of PDOException is null when
4040
PDO::__construct() fails). (Ahmed Abdou)
4141

42+
- Session:
43+
. Fixed bug #79724 (Return type does not match in ext/session/mod_mm.c).
44+
(Nikita)
45+
4246
- Standard:
4347
. Fixed bug #79930 (array_merge_recursive() crashes when called with array
4448
with single reference). (Nikita)

azure-pipelines.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ trigger:
1212
- UPGRADING.INTERNALS
1313

1414
jobs:
15+
# We specify --with-mm here, because it cannot be used together with --enable-maintainer-zts.
1516
- template: azure/job.yml
1617
parameters:
1718
configurationName: DEBUG_NTS
18-
configurationParameters: '--enable-debug --disable-maintainer-zts'
19+
configurationParameters: '--enable-debug --disable-maintainer-zts --with-mm'
1920
- template: azure/job.yml
2021
parameters:
2122
configurationName: RELEASE_ZTS
@@ -36,7 +37,7 @@ jobs:
3637
- template: azure/job.yml
3738
parameters:
3839
configurationName: RELEASE_NTS
39-
configurationParameters: '--disable-debug --disable-maintainer-zts'
40+
configurationParameters: '--disable-debug --disable-maintainer-zts --with-mm'
4041
- template: azure/i386/job.yml
4142
parameters:
4243
configurationName: I386_DEBUG_NTS

azure/apt.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ steps:
3434
libldap2-dev \
3535
libsodium-dev \
3636
libargon2-0-dev \
37+
libmm-dev \
3738
postgresql \
3839
postgresql-contrib \
3940
llvm \

ext/session/mod_mm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ PS_GC_FUNC(mm)
466466

467467
mm_unlock(data->mm);
468468

469-
return nrdels;
469+
return *nrdels;
470470
}
471471

472472
PS_CREATE_SID_FUNC(mm)

0 commit comments

Comments
 (0)