Skip to content

Commit 3fe9e10

Browse files
orlitzkynikic
authored andcommitted
ext/session: catch incompatible configure flags earlier.
The session extension has a --with-mm flag that tells it to build the mm backend ("mm" is the name of the library). However, that backend is not thread-safe, and mod_mm.c will refuse to compile if the --enable-maintainer-zts flag was also passed to the configure script. Rather than crash halfway through the build, this commit adds a check to the session extension's config.m4 file. If both --with-mm and --enable-maintainer-zts are "on," then the configure script will die and explain that they can't be used together. PHP-bug: 14269
1 parent 6dbe046 commit 3fe9e10

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

ext/session/config.m4

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ if test "$PHP_MM" != "no"; then
2727
if test -z "$MM_DIR" ; then
2828
AC_MSG_ERROR(cannot find mm library)
2929
fi
30-
30+
31+
if test "$enable_maintainer_zts" = "yes"; then
32+
dnl The mm library is not thread-safe, and mod_mm.c refuses to compile.
33+
AC_MSG_ERROR(--with-mm cannot be combined with --enable-maintainer-zts)
34+
fi
35+
3136
PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD)
3237
PHP_ADD_INCLUDE($MM_DIR/include)
3338
PHP_INSTALL_HEADERS([ext/session/mod_mm.h])

0 commit comments

Comments
 (0)