cvs: php4 /ext/msession config.m4 /ext/session config.m4 /ext/wddx wddx.c

sniper Sat Oct 27 02:26:02 2001 EDT Modified files: /php4/ext/msession config.m4 /php4/ext/session config.m4 /php4/ext/wddx wddx.c Log: Fixed bug: #13844 Index: php4/ext/msession/config.m4 diff -u php4/ext/msession/config.m4:1.5 php4/ext/msession/config.m4:1.6 --- php4/ext/msession/config.m4:1.5 Wed Oct 10 20:36:23 2001 +++ php4/ext/msession/config.m4 Sat Oct 27 02:26:01 2001 @@ -27,9 +27,5 @@ PHP_SUBST(PHOENIX_LIB) PHP_EXTENSION(msession, $ext_shared) - - if test "$enable_session" != "no"; then - AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) - fi fi Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.14 php4/ext/session/config.m4:1.15 --- php4/ext/session/config.m4:1.14 Sat Aug 25 12:19:57 2001 +++ php4/ext/session/config.m4 Sat Oct 27 02:26:01 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2001/08/25 16:19:57 zeev Exp $ +dnl $Id: config.m4,v 1.15 2001/10/27 06:26:01 sniper Exp $ PHP_ARG_WITH(mm,for mm support, [ --with-mm[=DIR] Include mm support for session storage]) @@ -29,4 +29,5 @@ PHP_MISSING_PREAD_DECL PHP_EXTENSION(session,$ext_shared) PHP_SUBST(SESSION_SHARED_LIBADD) + AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) fi Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.84 php4/ext/wddx/wddx.c:1.85 --- php4/ext/wddx/wddx.c:1.84 Thu Oct 11 19:33:52 2001 +++ php4/ext/wddx/wddx.c Sat Oct 27 02:26:01 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.84 2001/10/11 23:33:52 ssb Exp $ */ +/* $Id: wddx.c,v 1.85 2001/10/27 06:26:01 sniper Exp $ */ #include "php.h" #include "php_wddx.h" @@ -211,6 +211,7 @@ #include "ext/session/php_session.h" +#if HAVE_PHP_SESSION /* {{{ PS_SERIALIZER_ENCODE_FUNC */ PS_SERIALIZER_ENCODE_FUNC(wddx) @@ -283,16 +284,20 @@ return ret; } /* }}} */ +#endif /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(wddx) { le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number); + +#if HAVE_PHP_SESSION php_session_register_serializer("wddx", PS_SERIALIZER_ENCODE_NAME(wddx), PS_SERIALIZER_DECODE_NAME(wddx)); - +#endif + return SUCCESS; } /* }}} */ @@ -302,7 +307,10 @@ PHP_MINFO_FUNCTION(wddx) { php_info_print_table_start(); - php_info_print_table_row(2, "WDDX Support", "enabled" ); + php_info_print_table_header(2, "WDDX Support", "enabled" ); +#if HAVE_PHP_SESSION + php_info_print_table_row(2, "WDDX Session Serializer", "enabled" ); +#endif php_info_print_table_end(); } /* }}} */