- Fixed bug #33185 (--enable-session=shared does not build)

diff --git a/NEWS b/NEWS
index 9e73fc81f991e385bd920bb9ade6e1d48110c517..e8c29aeff9788851439722f4d42ce70efb44e5f5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP                                                                        NEWS
 - Fixed ext/mysqli to allocate less memory when fetching bound params
   of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
 - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed bug #33185 (--enable-session=shared does not build). (Jani)
 - Fixed bug #33116 (crash when assigning class name to global variable in
   __autoload). (Dmitry)
 - Fixed bug #33090 (mysqli_prepare() doesn't return an error). (Georg)

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 5ff9ad60cf9bc158df765f7d7515fa025a091fda..5f7acc27842fbd61f48a3b9016ae18494d6852e2 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1479,7 +1479,7 @@ PHP_METHOD(SoapServer, handle)
 
        if (service->type == SOAP_CLASS) {
                soap_obj = NULL;
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
                /* If persistent then set soap_obj from from the previous created session (if available) */
                if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
                        zval **tmp_soap;
@@ -1568,7 +1568,7 @@ PHP_METHOD(SoapServer, handle)
                                }
                                efree(class_name);
                        }
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
                        /* If session then update session hash with new object */
                        if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
                                zval **tmp_soap_pp;
@@ -1661,7 +1661,7 @@ PHP_METHOD(SoapServer, handle)
             zend_hash_exists(function_table, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) {
                if (service->type == SOAP_CLASS) {
                        call_status = call_user_function(NULL, &soap_obj, &function_name, &retval, num_params, params TSRMLS_CC);
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
                        if (service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) {
                                zval_ptr_dtor(&soap_obj);
                        }

diff --git a/ext/sqlite/sess_sqlite.c b/ext/sqlite/sess_sqlite.c
index 8789cd61095a973df12e88824ffb1ea711de2376..d3cb132f1039e8a2805959ba0ca31380a21213eb 100644 (file)
--- a/ext/sqlite/sess_sqlite.c
+++ b/ext/sqlite/sess_sqlite.c
@@ -21,7 +21,7 @@
 
 #include "php.h"
 
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
 
 #include "ext/session/php_session.h"
 #include "ext/standard/php_lcg.h"
@@ -185,7 +185,7 @@ PS_GC_FUNC(sqlite)
        return SQLITE_RETVAL(rv);
 }
 
-#endif /* HAVE_PHP_SESSION */
+#endif /* HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) */
 
 /*
  * Local variables:

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 2876567c826f01bc0b92e347a6e3dedf404717d1..23cdab56d135bee717bfc6baac0782b925b23532 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -49,7 +49,7 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(sqlite)
 
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
 extern ps_module ps_mod_sqlite;
 #define ps_sqlite_ptr &ps_mod_sqlite
 #endif
@@ -1015,7 +1015,7 @@ PHP_MINIT_FUNCTION(sqlite)
 
        REGISTER_INI_ENTRIES();
 
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
        php_session_register_module(ps_sqlite_ptr);
 #endif
        

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index d0451ad5f68f18d76de6c85ec6b1b0f39105ca4d..682691bcdb6ddb7217f0c0a69d30acb566f275b4 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -223,7 +223,7 @@ static void release_wddx_packet_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 
 #include "ext/session/php_session.h"
 
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
 /* {{{ PS_SERIALIZER_ENCODE_FUNC
  */
 PS_SERIALIZER_ENCODE_FUNC(wddx)
@@ -302,7 +302,7 @@ PHP_MINIT_FUNCTION(wddx)
 {
        le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number);
 
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
        php_session_register_serializer("wddx",
                                                                        PS_SERIALIZER_ENCODE_NAME(wddx),
                                                                        PS_SERIALIZER_DECODE_NAME(wddx));
@@ -317,7 +317,7 @@ PHP_MINIT_FUNCTION(wddx)
 PHP_MINFO_FUNCTION(wddx)
 {
        php_info_print_table_start();
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
        php_info_print_table_header(2, "WDDX Support", "enabled" );
        php_info_print_table_row(2, "WDDX Session Serializer", "enabled" );
 #else