cvs: php4(PHP_4_0_7) /ext/session config.m4 /ext/wddx wddx.c

sniper Sat Oct 27 02:28:44 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/ext/session config.m4 /php4/ext/wddx wddx.c Log: MFH Index: php4/ext/session/config.m4 diff -u php4/ext/session/config.m4:1.13 php4/ext/session/config.m4:1.13.2.1 --- php4/ext/session/config.m4:1.13 Sun May 20 19:39:09 2001 +++ php4/ext/session/config.m4 Sat Oct 27 02:28:44 2001 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.13 2001/05/20 23:39:09 sas Exp $ +dnl $Id: config.m4,v 1.13.2.1 2001/10/27 06:28:44 sniper Exp $ PHP_ARG_WITH(mm,for mm support, [ --with-mm[=DIR] Include mm support for session storage]) @@ -36,4 +36,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.79.2.2 php4/ext/wddx/wddx.c:1.79.2.3 --- php4/ext/wddx/wddx.c:1.79.2.2 Thu Oct 11 19:52:10 2001 +++ php4/ext/wddx/wddx.c Sat Oct 27 02:28:44 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.79.2.2 2001/10/11 23:52:10 ssb Exp $ */ +/* $Id: wddx.c,v 1.79.2.3 2001/10/27 06:28:44 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(); } /* }}} */ @@ -1197,6 +1205,6 @@ * tab-width: 4 * c-basic-offset: 4 * End: - * vim600: sw=4 ts=4 tw=78 fdm=marker - * vim<600: sw=4 ts=4 tw=78 + * vim600: sw=4 ts=4 fdm=marker + * vim<600: sw=4 ts=4 */