Skip to content

Commit 9b8b361

Browse files
committed
correctness fixes and PS_VALIDATE_SID_FUNC rewrite
1 parent bdbc671 commit 9b8b361

2 files changed

Lines changed: 118 additions & 150 deletions

File tree

ext/session/config.m4

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,16 @@ if test "$PHP_SESSION" != "no"; then
2323
AC_DEFINE([HAVE_PHP_SESSION], [1],
2424
[Define to 1 if the PHP extension 'session' is available.])
2525

26+
dnl GH-14019: was libmm (mm_create/mm_malloc/...), now GLib GHashTable.
2627
AS_VAR_IF([PHP_MM], [no],, [
27-
PKG_CHECK_MODULES([LIBGLIB], [glib-2.0 >= 2.0])
28+
PKG_CHECK_MODULES([LIBGLIB], [glib-2.0 >= 2.40])
2829
29-
PHP_EVAL_INCLINE($[LIBGLIB_CFLAGS])
30-
PHP_EVAL_LIBLINE($[LIBGLIB_LIBS], [GLIB_SHARED_LIBADD])
31-
PHP_CHECK_LIBRARY([glib-2.0], [g_try_malloc],
32-
[AC_DEFINE([HAVE_GLIB2], [1],
33-
[Define to 1 if libglib-2.0 library has 'g_try_malloc' function.])],
34-
[]
35-
[$GLIB_LIBS])
30+
PHP_EVAL_INCLINE($LIBGLIB_CFLAGS)
31+
PHP_EVAL_LIBLINE($LIBGLIB_LIBS, [GLIB_SHARED_LIBADD])
3632
3733
SESSION_CFLAGS="$SESSION_CFLAGS $LIBGLIB_CFLAGS"
3834
PHP_SUBST([GLIB_SHARED_LIBADD])
3935
40-
4136
PHP_INSTALL_HEADERS([ext/session], [mod_mm.h])
4237
AC_DEFINE([HAVE_LIBGLIB], [1],
4338
[Define to 1 if the system has the 'glib' library.])

0 commit comments

Comments
 (0)