archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
foobar 2005-05-30 15:14:12 +00:00
parent 43ba3897c2
commit 9b57f5ff36
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/soap/soap.c
View file

@ -1479,7 +1479,7 @@ PHP_METHOD(SoapServer, handle)
if (service->type == SOAP_CLASS) { if (service->type == SOAP_CLASS) {
soap_obj = NULL; 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 persistent then set soap_obj from from the previous created session (if available) */
if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
zval **tmp_soap; zval **tmp_soap;
@ -1568,7 +1568,7 @@ PHP_METHOD(SoapServer, handle)
} }
efree(class_name); 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 session then update session hash with new object */
if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) {
zval **tmp_soap_pp; 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)))) { zend_hash_exists(function_table, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) {
if (service->type == SOAP_CLASS) { if (service->type == SOAP_CLASS) {
call_status = call_user_function(NULL, &soap_obj, &function_name, &retval, num_params, params TSRMLS_CC); 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) { if (service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) {
zval_ptr_dtor(&soap_obj); zval_ptr_dtor(&soap_obj);
} }

4
ext/sqlite/sess_sqlite.c
View file

@ -21,7 +21,7 @@
#include "php.h" #include "php.h"
#if HAVE_PHP_SESSION #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
#include "ext/session/php_session.h" #include "ext/session/php_session.h"
#include "ext/standard/php_lcg.h" #include "ext/standard/php_lcg.h"
@ -185,7 +185,7 @@ PS_GC_FUNC(sqlite)
return SQLITE_RETVAL(rv); return SQLITE_RETVAL(rv);
} }
#endif /* HAVE_PHP_SESSION */ #endif /* HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) */
/* /*
* Local variables: * Local variables:

4
ext/sqlite/sqlite.c
View file

@ -61,7 +61,7 @@ extern pdo_driver_t pdo_sqlite2_driver;
ZEND_DECLARE_MODULE_GLOBALS(sqlite) ZEND_DECLARE_MODULE_GLOBALS(sqlite)
#if HAVE_PHP_SESSION #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
extern ps_module ps_mod_sqlite; extern ps_module ps_mod_sqlite;
#define ps_sqlite_ptr &ps_mod_sqlite #define ps_sqlite_ptr &ps_mod_sqlite
#endif #endif
@ -1036,7 +1036,7 @@ PHP_MINIT_FUNCTION(sqlite)
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
#if HAVE_PHP_SESSION #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
php_session_register_module(ps_sqlite_ptr); php_session_register_module(ps_sqlite_ptr);
#endif #endif

6
ext/wddx/wddx.c
View file

@ -223,7 +223,7 @@ static void release_wddx_packet_rsrc(zend_rsrc_list_entry *rsrc TSRMLS_DC)
#include "ext/session/php_session.h" #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
*/ */
PS_SERIALIZER_ENCODE_FUNC(wddx) 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); 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", php_session_register_serializer("wddx",
PS_SERIALIZER_ENCODE_NAME(wddx), PS_SERIALIZER_ENCODE_NAME(wddx),
PS_SERIALIZER_DECODE_NAME(wddx)); PS_SERIALIZER_DECODE_NAME(wddx));
@ -317,7 +317,7 @@ PHP_MINIT_FUNCTION(wddx)
PHP_MINFO_FUNCTION(wddx) PHP_MINFO_FUNCTION(wddx)
{ {
php_info_print_table_start(); 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_header(2, "WDDX Support", "enabled" );
php_info_print_table_row(2, "WDDX Session Serializer", "enabled" ); php_info_print_table_row(2, "WDDX Session Serializer", "enabled" );
#else #else