sniper Mon May 30 11:13:58 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/soap soap.c
/php-src/ext/sqlite sess_sqlite.c sqlite.c
/php-src/ext/wddx wddx.c
Log:
- Fixed bug #33185 (--enable-session=shared does not build)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.405&r2=1.1760.2.406&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.405 php-src/NEWS:1.1760.2.406
--- php-src/NEWS:1.1760.2.405 Fri May 27 14:07:30 2005
+++ php-src/NEWS Mon May 30 11:13:56 2005
@@ -12,6 +12,7 @@
- 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)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.36&r2=1.110.2.37&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.36 php-src/ext/soap/soap.c:1.110.2.37
--- php-src/ext/soap/soap.c:1.110.2.36 Wed May 11 17:16:44 2005
+++ php-src/ext/soap/soap.c Mon May 30 11:13:57 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.110.2.36 2005/05/11 21:16:44 tony2001 Exp $ */
+/* $Id: soap.c,v 1.110.2.37 2005/05/30 15:13:57 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1479,7 +1479,7 @@
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 @@
}
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 @@
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);
}
http://cvs.php.net/diff.php/php-src/ext/sqlite/sess_sqlite.c?r1=1.16&r2=1.16.2.1&ty=u
Index: php-src/ext/sqlite/sess_sqlite.c
diff -u php-src/ext/sqlite/sess_sqlite.c:1.16
php-src/ext/sqlite/sess_sqlite.c:1.16.2.1
--- php-src/ext/sqlite/sess_sqlite.c:1.16 Sun Mar 7 17:35:26 2004
+++ php-src/ext/sqlite/sess_sqlite.c Mon May 30 11:13:57 2005
@@ -17,11 +17,11 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sess_sqlite.c,v 1.16 2004/03/07 22:35:26 sas Exp $ */
+/* $Id: sess_sqlite.c,v 1.16.2.1 2005/05/30 15:13:57 sniper Exp $ */
#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 @@
return SQLITE_RETVAL(rv);
}
-#endif /* HAVE_PHP_SESSION */
+#endif /* HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) */
/*
* Local variables:
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.146.2.5&r2=1.146.2.6&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.146.2.5
php-src/ext/sqlite/sqlite.c:1.146.2.6
--- php-src/ext/sqlite/sqlite.c:1.146.2.5 Thu May 26 07:56:03 2005
+++ php-src/ext/sqlite/sqlite.c Mon May 30 11:13:57 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.146.2.5 2005/05/26 11:56:03 helly Exp $
+ $Id: sqlite.c,v 1.146.2.6 2005/05/30 15:13:57 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -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 @@
REGISTER_INI_ENTRIES();
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
php_session_register_module(ps_sqlite_ptr);
#endif
@@ -1076,7 +1076,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.146.2.5 2005/05/26 11:56:03 helly
Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.146.2.6 2005/05/30 15:13:57
sniper Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
http://cvs.php.net/diff.php/php-src/ext/wddx/wddx.c?r1=1.111.2.2&r2=1.111.2.3&ty=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.111.2.2 php-src/ext/wddx/wddx.c:1.111.2.3
--- php-src/ext/wddx/wddx.c:1.111.2.2 Mon Apr 11 07:58:36 2005
+++ php-src/ext/wddx/wddx.c Mon May 30 11:13:57 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.111.2.2 2005/04/11 11:58:36 dmitry Exp $ */
+/* $Id: wddx.c,v 1.111.2.3 2005/05/30 15:13:57 sniper Exp $ */
#include "php.h"
@@ -223,7 +223,7 @@
#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 @@
{
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_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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
