[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Jun 7 05:32:04 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/ZendEngine2/ChangeLog?r1=1.932r2=1.933diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.932 ZendEngine2/ChangeLog:1.933 --- ZendEngine2/ChangeLog:1.932 Tue Jun 6 05:31:56 2006 +++ ZendEngine2/ChangeLog Wed Jun 7 05:32:04 2006 @@ -1,3 +1,31 @@ +2006-06-06 Antony Dovgal [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.c: + revert by Andi's request + +* tests/bug33732.phpt + tests/bug33732.phpt: + fix test + +* (PHP_5_2) + zend_compile.c + tests/objects_012.phpt + tests/objects_013.phpt + tests/objects_014.phpt: + MFH: do not allow to implement the same interface twice + add tests + +* zend_compile.c + tests/objects_012.phpt + tests/objects_012.phpt + tests/objects_013.phpt + tests/objects_013.phpt + tests/objects_014.phpt + tests/objects_014.phpt: + do not allow to implement the same interface twice + add tests + 2006-06-05 Zeev Suraski [EMAIL PROTECTED] * (PHP_5_2) @@ -13988,7 +14016,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.932 2006/06/06 05:31:56 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.933 2006/06/07 05:32:04 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -15712,7 +15740,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.932 2006/06/06 05:31:56 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.933 2006/06/07 05:32:04 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /main output.c
mikeTue Jun 6 11:08:45 2006 UTC
Modified files:
/php-src/main output.c
Log:
- fix regression with bug #22690 (ob_start() with create_function() output
handler)
http://cvs.php.net/viewcvs.cgi/php-src/main/output.c?r1=1.180r2=1.181diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.180 php-src/main/output.c:1.181
--- php-src/main/output.c:1.180 Sun Jun 4 10:01:57 2006
+++ php-src/main/output.c Tue Jun 6 11:08:45 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: output.c,v 1.180 2006/06/04 10:01:57 mike Exp $ */
+/* $Id: output.c,v 1.181 2006/06/06 11:08:45 mike Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -1258,7 +1258,7 @@
long chunk_size = 0;
long flags = PHP_OUTPUT_HANDLER_CLEANABLE|PHP_OUTPUT_HANDLER_REMOVABLE;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |zlb,
output_handler, chunk_size, flags)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
|z/lb, output_handler, chunk_size, flags)) {
RETURN_FALSE;
}
if (chunk_size 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c
rrichards Tue Jun 6 12:05:30 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
Log:
restore missing ze1 compat code
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.6r2=1.151.2.22.2.7diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.6
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.7
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.6Mon Jun 5 16:53:21 2006
+++ php-src/ext/simplexml/simplexml.c Tue Jun 6 12:05:30 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.6 2006/06/05 16:53:21 zeev Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.7 2006/06/06 12:05:30 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1848,7 +1848,11 @@
zend_object_value rv;
rv.handle = zend_objects_store_put(intern, sxe_object_dtor,
(zend_objects_free_object_storage_t)sxe_object_free_storage, sxe_object_clone
TSRMLS_CC);
- rv.handlers = (zend_object_handlers *) sxe_object_handlers;
+ if (EG(ze1_compatibility_mode)) {
+ rv.handlers = (zend_object_handlers *) sxe_ze1_object_handlers;
+ } else {
+ rv.handlers = (zend_object_handlers *) sxe_object_handlers;
+ }
return rv;
}
@@ -2303,7 +2307,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.6 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.7 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom php_dom.c
rrichards Tue Jun 6 12:08:11 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domphp_dom.c
Log:
nuke unused call
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.5r2=1.73.2.12.2.6diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.5
php-src/ext/dom/php_dom.c:1.73.2.12.2.6
--- php-src/ext/dom/php_dom.c:1.73.2.12.2.5 Mon Jun 5 16:53:21 2006
+++ php-src/ext/dom/php_dom.c Tue Jun 6 12:08:11 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.73.2.12.2.5 2006/06/05 16:53:21 zeev Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12.2.6 2006/06/06 12:08:11 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -510,7 +510,6 @@
} else {
return dom_object_handlers;
}
- return dom_object_handlers;
}
static zend_module_dep dom_deps[] = {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams memory.c
tony2001Tue Jun 6 14:08:47 2006 UTC
Modified files:
/php-src/main/streams memory.c
Log:
don't leak when decoding failed
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.22r2=1.23diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.22 php-src/main/streams/memory.c:1.23
--- php-src/main/streams/memory.c:1.22 Tue May 23 22:26:23 2006
+++ php-src/main/streams/memory.c Tue Jun 6 14:08:47 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.22 2006/05/23 22:26:23 helly Exp $ */
+/* $Id: memory.c,v 1.23 2006/06/06 14:08:47 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -661,6 +661,7 @@
if (base64) {
comma = (char*)php_base64_decode((const unsigned char *)comma,
dlen, ilen);
if (!comma) {
+ zval_ptr_dtor(meta);
php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, rfc2397: unable to decode);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main/streams memory.c
tony2001Tue Jun 6 14:09:12 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams memory.c
Log:
MFH: don't leak when decoding failed
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/memory.c?r1=1.8.2.6.2.6r2=1.8.2.6.2.7diff_format=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.6.2.6
php-src/main/streams/memory.c:1.8.2.6.2.7
--- php-src/main/streams/memory.c:1.8.2.6.2.6 Tue May 23 22:31:25 2006
+++ php-src/main/streams/memory.c Tue Jun 6 14:09:12 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.8.2.6.2.6 2006/05/23 22:31:25 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.6.2.7 2006/06/06 14:09:12 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -661,6 +661,7 @@
if (base64) {
comma = (char*)php_base64_decode((const unsigned char *)comma,
dlen, ilen);
if (!comma) {
+ zval_ptr_dtor(meta);
php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, rfc2397: unable to decode);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
tony2001Tue Jun 6 20:08:58 2006 UTC Modified files: /php-srcNEWS Log: this function also exists in 5.2, no need for this news entry in HEAD http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2117r2=1.2118diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2117 php-src/NEWS:1.2118 --- php-src/NEWS:1.2117 Tue May 23 22:24:10 2006 +++ php-src/NEWSTue Jun 6 20:08:58 2006 @@ -33,7 +33,6 @@ . Added curl_setopt_array() which allows setting of multiple cURL options. . Added CURLINFO_HEADER_OUT constant to facilitate request retrieval. -- Add implementation of curl_multi_info_read (Brian) - Added jump label operator (limited goto). (Dmitry, Sara) - Added E_STRICT to E_ALL. (Dmitry) - Added gmp_nextprime() function. (Tony, patch by ants dot aasma at gmail dot com) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_iterators.c
tony2001Tue Jun 6 20:11:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splspl_iterators.c
Log:
plug a leak in ext/spl/tests/iterator_047.phpt
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.9r2=1.73.2.30.2.10diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.9
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.10
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.9 Sun May 21 18:13:37 2006
+++ php-src/ext/spl/spl_iterators.c Tue Jun 6 20:11:35 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.9 2006/05/21 18:13:37 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.10 2006/06/06 20:11:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1773,6 +1773,7 @@
if (intern-u.caching.flags
CIT_CATCH_GET_CHILD) {
zend_clear_exception(TSRMLS_C);
} else {
+ zval_ptr_dtor(retval);
return;
}
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
tony2001Tue Jun 6 20:12:46 2006 UTC
Modified files:
/php-src/ext/splspl_iterators.c
Log:
MFB: plug a leak
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.136r2=1.137diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.136
php-src/ext/spl/spl_iterators.c:1.137
--- php-src/ext/spl/spl_iterators.c:1.136 Fri May 26 01:40:57 2006
+++ php-src/ext/spl/spl_iterators.c Tue Jun 6 20:12:46 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.136 2006/05/26 01:40:57 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.137 2006/06/06 20:12:46 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1785,6 +1785,7 @@
if (intern-u.caching.flags
CIT_CATCH_GET_CHILD) {
zend_clear_exception(TSRMLS_C);
} else {
+ zval_ptr_dtor(retval);
return;
}
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl streams.c
mikeTue Jun 6 21:38:03 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl streams.c
Log:
- only try to fetch stream context options if context is set
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.1r2=1.14.2.2.2.2diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.14.2.2.2.1
php-src/ext/curl/streams.c:1.14.2.2.2.2
--- php-src/ext/curl/streams.c:1.14.2.2.2.1 Thu May 25 12:41:35 2006
+++ php-src/ext/curl/streams.c Tue Jun 6 21:38:03 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streams.c,v 1.14.2.2.2.1 2006/05/25 12:41:35 mike Exp $ */
+/* $Id: streams.c,v 1.14.2.2.2.2 2006/06/06 21:38:03 mike Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -300,7 +300,7 @@
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, FG(user_agent) ?
FG(user_agent) : PHP/ PHP_VERSION);
/* TODO: read cookies and options from context */
- if (!strncasecmp(filename, http, sizeof(http)-1)) {
+ if (context !strncasecmp(filename, http, sizeof(http)-1)) {
/* HTTP(S) */
if (SUCCESS == php_stream_context_get_option(context, http,
user_agent, ctx_opt) Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT,
Z_STRVAL_PP(ctx_opt));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl streams.c
mikeTue Jun 6 21:38:29 2006 UTC
Modified files:
/php-src/ext/curl streams.c
Log:
MFB: only try to fetch stream context options if context is set
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/streams.c?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.17 php-src/ext/curl/streams.c:1.18
--- php-src/ext/curl/streams.c:1.17 Thu May 25 12:47:46 2006
+++ php-src/ext/curl/streams.c Tue Jun 6 21:38:28 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streams.c,v 1.17 2006/05/25 12:47:46 mike Exp $ */
+/* $Id: streams.c,v 1.18 2006/06/06 21:38:28 mike Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -300,7 +300,7 @@
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT, FG(user_agent) ?
FG(user_agent) : PHP/ PHP_VERSION);
/* TODO: read cookies and options from context */
- if (!strncasecmp(filename, http, sizeof(http)-1)) {
+ if (context !strncasecmp(filename, http, sizeof(http)-1)) {
/* HTTP(S) */
if (SUCCESS == php_stream_context_get_option(context, http,
user_agent, ctx_opt) Z_TYPE_PP(ctx_opt) == IS_STRING) {
curl_easy_setopt(curlstream-curl, CURLOPT_USERAGENT,
Z_STRVAL_PP(ctx_opt));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlreader php_xmlreader.c
tony2001Tue Jun 6 21:44:34 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xmlreader php_xmlreader.c
Log:
implement a dummy clone_obj handler for ze1 compat mode
(fixes segfault on every XMLReader instantiation)
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14.2.1r2=1.13.2.14.2.2diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.1
php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.2
--- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.1 Wed May 10 12:04:46 2006
+++ php-src/ext/xmlreader/php_xmlreader.c Tue Jun 6 21:44:34 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xmlreader.c,v 1.13.2.14.2.1 2006/05/10 12:04:46 rrichards Exp $ */
+/* $Id: php_xmlreader.c,v 1.13.2.14.2.2 2006/06/06 21:44:34 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -35,6 +35,7 @@
zend_class_entry *xmlreader_class_entry;
static zend_object_handlers xmlreader_object_handlers;
+static zend_object_handlers xmlreader_object_handlers_ze1;
static HashTable xmlreader_prop_handlers;
@@ -351,6 +352,14 @@
}
/* }}} */
+/* {{{ xmlreader_objects_ze1_clone_obj */
+zend_object_value xmlreader_objects_ze1_clone_obj(zval *object TSRMLS_DC)
+{
+ php_error(E_ERROR, Cannot clone object of class %s due to
'zend.ze1_compatibility_mode', Z_OBJCE_P(object)-name);
+ return object-value.obj;
+}
+/* }}} */
+
/* {{{ xmlreader_free_resources */
static void xmlreader_free_resources(xmlreader_object *intern) {
if (intern) {
@@ -404,7 +413,7 @@
zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) xmlreader_objects_free_storage,
xmlreader_objects_clone TSRMLS_CC);
intern-handle = retval.handle;
- retval.handlers = xmlreader_object_handlers;
+ retval.handlers = EG(ze1_compatibility_mode) ?
xmlreader_object_handlers_ze1 : xmlreader_object_handlers;
return retval;
}
/* }}} */
@@ -1199,6 +1208,12 @@
xmlreader_object_handlers.write_property = xmlreader_write_property;
xmlreader_object_handlers.get_property_ptr_ptr =
xmlreader_get_property_ptr_ptr;
+ memcpy(xmlreader_object_handlers_ze1, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
+ xmlreader_object_handlers_ze1.read_property = xmlreader_read_property;
+ xmlreader_object_handlers_ze1.write_property = xmlreader_write_property;
+ xmlreader_object_handlers_ze1.get_property_ptr_ptr =
xmlreader_get_property_ptr_ptr;
+ xmlreader_object_handlers_ze1.clone_obj =
xmlreader_objects_ze1_clone_obj;
+
INIT_CLASS_ENTRY(ce, XMLReader, xmlreader_functions);
ce.create_object = xmlreader_objects_new;
xmlreader_class_entry = zend_register_internal_class(ce TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_dbh.c
tony2001Tue Jun 6 22:05:56 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdopdo_dbh.c
Log:
yet another dummy clone_obj handler to fix problems created by ze1 compat mode
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.1r2=1.82.2.31.2.2diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.1
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.2
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.1 Thu May 11 22:43:44 2006
+++ php-src/ext/pdo/pdo_dbh.c Tue Jun 6 22:05:56 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.1 2006/05/11 22:43:44 helly Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.2 2006/06/06 22:05:56 tony2001 Exp $ */
/* The PDO Database Handle Class */
@@ -1251,7 +1251,14 @@
return -1;
}
+static zend_object_value dbh_ze1_clone_obj(zval *object TSRMLS_DC)
+{
+ php_error(E_ERROR, Cannot clone object of class %s due to
'zend.ze1_compatibility_mode', Z_OBJCE_P(object)-name);
+ return object-value.obj;
+}
+
static zend_object_handlers pdo_dbh_object_handlers;
+static zend_object_handlers pdo_dbh_object_handlers_ze1;
void pdo_dbh_init(TSRMLS_D)
{
@@ -1264,6 +1271,11 @@
memcpy(pdo_dbh_object_handlers, std_object_handlers,
sizeof(zend_object_handlers));
pdo_dbh_object_handlers.get_method = dbh_method_get;
pdo_dbh_object_handlers.compare_objects = dbh_compare;
+
+ memcpy(pdo_dbh_object_handlers_ze1, std_object_handlers,
sizeof(zend_object_handlers));
+ pdo_dbh_object_handlers_ze1.get_method = dbh_method_get;
+ pdo_dbh_object_handlers_ze1.compare_objects = dbh_compare;
+ pdo_dbh_object_handlers_ze1.clone_obj = dbh_ze1_clone_obj;
REGISTER_PDO_CLASS_CONST_LONG(PARAM_BOOL, (long)PDO_PARAM_BOOL);
REGISTER_PDO_CLASS_CONST_LONG(PARAM_NULL, (long)PDO_PARAM_NULL);
@@ -1447,7 +1459,7 @@
dbh-def_stmt_ce = pdo_dbstmt_ce;
retval.handle = zend_objects_store_put(dbh,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t)pdo_dbh_free_storage, NULL TSRMLS_CC);
- retval.handlers = pdo_dbh_object_handlers;
+ retval.handlers = EG(ze1_compatibility_mode) ?
pdo_dbh_object_handlers_ze1 : pdo_dbh_object_handlers;
return retval;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main output.c
mikeTue Jun 6 22:13:23 2006 UTC
Modified files:
/php-src/main output.c
Log:
- fix SEGV in php_output_handler_started()
http://cvs.php.net/viewcvs.cgi/php-src/main/output.c?r1=1.181r2=1.182diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.181 php-src/main/output.c:1.182
--- php-src/main/output.c:1.181 Tue Jun 6 11:08:45 2006
+++ php-src/main/output.c Tue Jun 6 22:13:23 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: output.c,v 1.181 2006/06/06 11:08:45 mike Exp $ */
+/* $Id: output.c,v 1.182 2006/06/06 22:13:23 mike Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -561,7 +561,7 @@
int i, count = php_output_get_level(TSRMLS_C);
if (count) {
- handlers = *(php_output_handler ***)
zend_stack_base(OG(handlers));
+ handlers = (php_output_handler **)
zend_stack_base(OG(handlers));
for (i = 0; i count; ++i) {
if (!zend_binary_zval_strcmp(handlers[i]-name, name)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pdo pdo_dbh.c
iliaa Wed Jun 7 03:33:16 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdopdo_dbh.c /php-srcNEWS Log: Fixed bug #37709 (Possible crash in PDO::errorCode()). http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.2r2=1.82.2.31.2.3diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.2 php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.3 --- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.2 Tue Jun 6 22:05:56 2006 +++ php-src/ext/pdo/pdo_dbh.c Wed Jun 7 03:33:15 2006 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_dbh.c,v 1.82.2.31.2.2 2006/06/06 22:05:56 tony2001 Exp $ */ +/* $Id: pdo_dbh.c,v 1.82.2.31.2.3 2006/06/07 03:33:15 iliaa Exp $ */ /* The PDO Database Handle Class */ @@ -1049,8 +1049,6 @@ zval_dtor(return_value); } - PDO_HANDLE_STMT_ERR(); - /* kill the object handle for the stmt here */ zval_dtor(return_value); http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.77r2=1.2027.2.547.2.78diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.77 php-src/NEWS:1.2027.2.547.2.78 --- php-src/NEWS:1.2027.2.547.2.77 Mon Jun 5 22:52:11 2006 +++ php-src/NEWSWed Jun 7 03:33:16 2006 @@ -49,6 +49,7 @@ - Added RFC2397 (data: stream) support. (Marcus) - Fixed memory leaks in openssl streams context options (Pierre) - Fixed handling of extremely long paths inside tempnam() function. (Ilia) +- Fixed bug #37709 (Possible crash in PDO::errorCode()). (Ilia) - Fixed bug #37705 (Semaphore constants not available). (Ilia) - Fixed bug #37671 (MySQLi extension fails to recognize BIT column). (Ilia) - Fixed bug #37635 (parameter of pcntl signal handler is trashed). (Mike) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c
iliaa Wed Jun 7 03:33:39 2006 UTC Modified files: /php-src/ext/pdopdo_dbh.c Log: MFB: Fixed bug #37709 (Possible crash in PDO::errorCode()). http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.130r2=1.131diff_format=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.130 php-src/ext/pdo/pdo_dbh.c:1.131 --- php-src/ext/pdo/pdo_dbh.c:1.130 Thu May 4 07:10:37 2006 +++ php-src/ext/pdo/pdo_dbh.c Wed Jun 7 03:33:39 2006 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_dbh.c,v 1.130 2006/05/04 07:10:37 tony2001 Exp $ */ +/* $Id: pdo_dbh.c,v 1.131 2006/06/07 03:33:39 iliaa Exp $ */ /* The PDO Database Handle Class */ @@ -1040,8 +1040,6 @@ /* something broke */ } - PDO_HANDLE_STMT_ERR(); - /* kill the object handle for the stmt here */ zval_dtor(return_value); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] 【身体契約】
【身体契約】→ 再度貴方の生活をサポートします！！！ 今まで似たようなメールも有ったかも知れませんが、ご利用する 前に規約の確認は重要です。当番組は契約希望者に十分ご理解を頂 く為、登録費用・年会費・契約紹介費などを全額免除と致しまして、 大変好評を得ております。契約宣伝拡大の為、貴方をご紹介させて 頂きます。 【身体契約】とは？ 『貴方の体を○金で買いたい・・・』と希望している女性と直接交渉 して頂き、女性の要望を満たせると契約金額をゲットする方法であ る。当番組は無料で契約仲介を行っております。男性から費用を一 切頂いておりませんので、ご安心下さい。 契約希望の方は早急、下記リンクより無料申し込みを済ませて下さ い。 ［希望者用 http://sruq.com/?a16］ 申し込み次第、紹介相手(地域一致女性会員)の連絡方法を差し上げ ますので(希望女性から直接メールが届く場合も多い)、即金額交渉 をお勧めします。 メルいらないのぉ？ [EMAIL PROTECTED]
