diff options
| author | foobar <sniper@php.net> | 2001-10-27 06:26:02 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-10-27 06:26:02 +0000 |
| commit | 4a99c5ee5c7905eae97c59783c4f792b70aebfff (patch) | |
| tree | 1aded011ba66be96a4958ceaef20d328edcfa76c | |
| parent | 44b68122c2ba0cf07cd837af160b3bd01527d081 (diff) | |
| download | php-git-4a99c5ee5c7905eae97c59783c4f792b70aebfff.tar.gz | |
Fixed bug: #13844
| -rw-r--r-- | ext/msession/config.m4 | 4 | ||||
| -rw-r--r-- | ext/session/config.m4 | 1 | ||||
| -rw-r--r-- | ext/wddx/wddx.c | 12 |
3 files changed, 11 insertions, 6 deletions
diff --git a/ext/msession/config.m4 b/ext/msession/config.m4 index 61ebc7acd1..c9953dccfb 100644 --- a/ext/msession/config.m4 +++ b/ext/msession/config.m4 @@ -27,9 +27,5 @@ if test "$PHP_MSESSION" != "no"; then PHP_SUBST(PHOENIX_LIB) PHP_EXTENSION(msession, $ext_shared) - - if test "$enable_session" != "no"; then - AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) - fi fi diff --git a/ext/session/config.m4 b/ext/session/config.m4 index 1fe2141b4f..5366c4fec0 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -29,4 +29,5 @@ if test "$PHP_SESSION" != "no"; then PHP_MISSING_PREAD_DECL PHP_EXTENSION(session,$ext_shared) PHP_SUBST(SESSION_SHARED_LIBADD) + AC_DEFINE(HAVE_PHP_SESSION,1,[ ]) fi diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c index 278422432c..5e39ddfd6c 100644 --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@ -211,6 +211,7 @@ static void release_wddx_packet_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC) #include "ext/session/php_session.h" +#if HAVE_PHP_SESSION /* {{{ PS_SERIALIZER_ENCODE_FUNC */ PS_SERIALIZER_ENCODE_FUNC(wddx) @@ -283,16 +284,20 @@ PS_SERIALIZER_DECODE_FUNC(wddx) 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_MINIT_FUNCTION(wddx) 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(); } /* }}} */ |