[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Jul 25 20:32:26 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1696r2=1.1697ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1696 php-src/ChangeLog:1.1697 --- php-src/ChangeLog:1.1696Sat Jul 24 20:32:53 2004 +++ php-src/ChangeLog Sun Jul 25 20:32:25 2004 @@ -1,3 +1,106 @@ +2004-07-25 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_0) + tests/classes/abstract_derived.phpt + tests/classes/autoload_001.phpt + tests/classes/autoload_002.phpt + tests/classes/autoload_003.phpt + tests/classes/autoload_004.phpt + tests/classes/autoload_005.phpt + tests/classes/ctor_failure.phpt + tests/classes/destructor_and_echo.phpt: + - Update/Add tests + +* tests/classes/autoload_001.phpt + tests/classes/autoload_002.phpt + tests/classes/autoload_003.phpt + tests/classes/autoload_004.phpt: + - Do not autoload classes in skip code + +* tests/classes/ctor_failure.phpt: + + - Add new test + +* tests/classes/autoload_005.phpt: + + - Add test + +2004-07-25 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + NEWS + main/rfc1867.c + main/rfc1867.c: + MFH: Fixed bug #29369 (Uploaded files with ' or in their names get their + names truncated at those characters). + +* main/rfc1867.c: + Fixed bug #29369 (Uploaded files with ' or in their names get their names + truncated at those characters). + +2004-07-25 Marcus Boerger [EMAIL PROTECTED] + +* ext/dom/php_dom.c: + - Fixed Bug #29354 Exception constructor marked as both public and +protected + +* ZendEngine2/zend_reflection_api.c: + - Show visibility errors (try to fix #29354) + +* (PHP_5_0) + NEWS: + BFN + +* (PHP_5_0) + ZendEngine2/zend_execute.c + ZendEngine2/zend_objects_API.c + ZendEngine2/zend_objects_API.h: + - MFH: Fix bug #29368 : The destructor is called when an exception is +thrown from the constructor + +* ZendEngine2/zend_execute.c + ZendEngine2/zend_objects_API.c + ZendEngine2/zend_objects_API.h: + - Fix bug #29368 : The destructor is called when an exception is thrown + from the constructor + +* tests/classes/destructor_and_echo.phpt: + + - Add new patch for reordered shutdown sequence + +2004-07-25 Christian Stocker [EMAIL PROTECTED] + +* NEWS + ext/simplexml/simplexml.c: + renamed registerNamespace() to registerXPathNamespace() + +* NEWS + ext/simplexml/simplexml.c: + added new method SimpleXMLElement-registerNamespace(string prefix, string + uri) + registers a prefix - namespaceURI combination for use in a later xpath + query. + +* ext/xsl/php_xsl.c: + set errorhandler to generic php_libxml_error_handler + +2004-07-25 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend.c + ZendEngine2/zend.h + ZendEngine2/zend_execute.h + ZendEngine2/zend_execute_API.c + main/main.c: + - Execute destructors earlier (Florian Schaper, fschaper at intux org) + +* ZendEngine2/zend_reflection_api.c: + - Add ReflectionParameter::isOptional() to test whether a parameter is +optional and also show this information in export. + +* ZendEngine2/zend_exceptions.c: + - Add optional parameters $filename and $lineno to ErrorException +constructor to allow overwriting automatically retrieved information. + 2004-07-24 Rob Richards [EMAIL PROTECTED] * sapi/activescript/classfactory.cpp @@ -6973,7 +7076,7 @@ 2004-03-18 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/tests/bug27582_2.phpt: - - Fix the test description and $Id: ChangeLog,v 1.1696 2004/07/25 00:32:53 changelog Exp $ + - Fix the test description and $Id: ChangeLog,v 1.1697 2004/07/26 00:32:25 changelog Exp $ 2004-03-18 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Jul 25 20:32:29 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.508r2=1.509ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.508 ZendEngine2/ChangeLog:1.509 --- ZendEngine2/ChangeLog:1.508 Fri Jul 23 20:32:58 2004 +++ ZendEngine2/ChangeLog Sun Jul 25 20:32:29 2004 @@ -1,3 +1,35 @@ +2004-07-25 Marcus Boerger [EMAIL PROTECTED] + +* zend_reflection_api.c: + - Show visibility errors (try to fix #29354) + +* (PHP_5_0) + zend_execute.c + zend_objects_API.c + zend_objects_API.h: + - MFH: Fix bug #29368 : The destructor is called when an exception is +thrown from the constructor + +* zend_execute.c + zend_objects_API.c + zend_objects_API.h: + - Fix bug #29368 : The destructor is called when an exception is thrown + from the constructor + +* zend.c + zend.h + zend_execute.h + zend_execute_API.c: + - Execute destructors earlier (Florian Schaper, fschaper at intux org) + +* zend_reflection_api.c: + - Add ReflectionParameter::isOptional() to test whether a parameter is +optional and also show this information in export. + +* zend_exceptions.c: + - Add optional parameters $filename and $lineno to ErrorException +constructor to allow overwriting automatically retrieved information. + 2004-07-23 Marcus Boerger [EMAIL PROTECTED] * zend_execute.c: @@ -5079,7 +5111,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.508 2004/07/24 00:32:58 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.509 2004/07/26 00:32:29 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -6803,7 +6835,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.508 2004/07/24 00:32:58 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.509 2004/07/26 00:32:29 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /main main.c
helly Sun Jul 25 03:14:51 2004 EDT
Modified files:
/php-src/main main.c
Log:
- Execute destructors earlier (Florian Schaper, fschaper at intux org)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.605r2=1.606ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.605 php-src/main/main.c:1.606
--- php-src/main/main.c:1.605 Thu Jul 15 18:22:06 2004
+++ php-src/main/main.c Sun Jul 25 03:14:49 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.605 2004/07/15 22:22:06 helly Exp $ */
+/* $Id: main.c,v 1.606 2004/07/25 07:14:49 helly Exp $ */
/* {{{ includes
*/
@@ -1188,6 +1188,10 @@
zend_try {
sapi_send_headers(TSRMLS_C);
+ } zend_end_try();
+
+ zend_try {
+ zend_call_destructors(TSRMLS_C);
} zend_end_try();
if (PG(modules_activated)) zend_try {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl php_xsl.c
chregu Sun Jul 25 04:37:39 2004 EDT
Modified files:
/php-src/ext/xslphp_xsl.c
Log:
set errorhandler to generic php_libxml_error_handler
http://cvs.php.net/diff.php/php-src/ext/xsl/php_xsl.c?r1=1.22r2=1.23ty=u
Index: php-src/ext/xsl/php_xsl.c
diff -u php-src/ext/xsl/php_xsl.c:1.22 php-src/ext/xsl/php_xsl.c:1.23
--- php-src/ext/xsl/php_xsl.c:1.22 Mon Jul 12 09:04:01 2004
+++ php-src/ext/xsl/php_xsl.c Sun Jul 25 04:37:39 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xsl.c,v 1.22 2004/07/12 13:04:01 chregu Exp $ */
+/* $Id: php_xsl.c,v 1.23 2004/07/25 08:37:39 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -285,6 +285,7 @@
*/
PHP_RINIT_FUNCTION(xsl)
{
+ xsltSetGenericErrorFunc(NULL, php_libxml_error_handler);
return SUCCESS;
}
/* }}} */
@@ -294,6 +295,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(xsl)
{
+ xsltSetGenericErrorFunc(NULL, NULL);
return SUCCESS;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
chregu Sun Jul 25 06:37:28 2004 EDT Modified files: /php-src/ext/libxml libxml.c Log: use php_error_docref for libxml2 errors http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.19r2=1.20ty=u Index: php-src/ext/libxml/libxml.c diff -u php-src/ext/libxml/libxml.c:1.19 php-src/ext/libxml/libxml.c:1.20 --- php-src/ext/libxml/libxml.c:1.19Sun Jul 18 07:45:12 2004 +++ php-src/ext/libxml/libxml.c Sun Jul 25 06:37:27 2004 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: libxml.c,v 1.19 2004/07/18 11:45:12 rrichards Exp $ */ +/* $Id: libxml.c,v 1.20 2004/07/25 10:37:27 chregu Exp $ */ #define IS_EXT_MODULE @@ -355,7 +355,7 @@ php_libxml_ctx_error_level(E_NOTICE, ctx, LIBXML(error_buffer).c TSRMLS_CC); break; default: - php_error(E_WARNING, %s, LIBXML(error_buffer).c); + php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, LIBXML(error_buffer).c); } smart_str_free(LIBXML(error_buffer)); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/simplexml simplexml.c
chregu Sun Jul 25 07:02:43 2004 EDT
Modified files:
/php-srcNEWS
/php-src/ext/simplexml simplexml.c
Log:
added new method SimpleXMLElement-registerNamespace(string prefix, string uri)
registers a prefix - namespaceURI combination for use in a later xpath query.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1773r2=1.1774ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1773 php-src/NEWS:1.1774
--- php-src/NEWS:1.1773 Sat Jul 24 00:01:48 2004
+++ php-src/NEWSSun Jul 25 07:02:42 2004
@@ -13,6 +13,7 @@
. array_intersect_ukey() (Christiano Duarte)
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
+ . SimpleXMLElement-registerNamespace() (Christian)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.139r2=1.140ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.139 php-src/ext/simplexml/simplexml.c:1.140
--- php-src/ext/simplexml/simplexml.c:1.139 Tue May 4 11:03:48 2004
+++ php-src/ext/simplexml/simplexml.c Sun Jul 25 07:02:43 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.139 2004/05/04 15:03:48 wez Exp $ */
+/* $Id: simplexml.c,v 1.140 2004/07/25 11:02:43 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -843,6 +843,29 @@
xmlXPathFreeObject(retval);
}
+
+SXE_METHOD(registerNamespace)
+{
+ php_sxe_object*sxe;
+ zval *id;
+ int prefix_len, ns_uri_len;
+ char *prefix, *ns_uri;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, prefix,
prefix_len, ns_uri, ns_uri_len) == FAILURE) {
+ return;
+ }
+
+ sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
+ if (!sxe-xpath) {
+ sxe-xpath = xmlXPathNewContext((xmlDocPtr) sxe-document-ptr);
+ }
+
+ if (xmlXPathRegisterNs(sxe-xpath, prefix, ns_uri) != 0) {
+ RETURN_FALSE
+ }
+ RETURN_TRUE;
+}
+
/* }}} */
/* {{{ proto asXML([string filename])
@@ -1604,6 +1627,7 @@
SXE_ME(__construct,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must
be called */
SXE_ME(asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath, NULL, ZEND_ACC_PUBLIC)
+ SXE_ME(registerNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
SXE_ME(children, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
@@ -1651,7 +1675,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.139 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.140 $);
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 /ext/libxml libxml.c php_libxml.h
rrichards Sun Jul 25 08:00:28 2004 EDT
Modified files:
/php-src/ext/libxml php_libxml.h libxml.c
Log:
export php_libxml_error_handler for win32 build
http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.8r2=1.9ty=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.8 php-src/ext/libxml/php_libxml.h:1.9
--- php-src/ext/libxml/php_libxml.h:1.8 Mon Mar 1 07:09:22 2004
+++ php-src/ext/libxml/php_libxml.h Sun Jul 25 08:00:28 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.8 2004/03/01 12:09:22 rrichards Exp $ */
+/* $Id: php_libxml.h,v 1.9 2004/07/25 12:00:28 rrichards Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -77,7 +77,7 @@
void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC);
/* When object dtor is called as node may still be referenced */
void php_libxml_node_decrement_resource(php_libxml_node_object *object TSRMLS_DC);
-void php_libxml_error_handler(void *ctx, const char *msg, ...);
+PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...);
void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
void php_libxml_ctx_error(void *ctx, const char *msg, ...);
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.20r2=1.21ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.20 php-src/ext/libxml/libxml.c:1.21
--- php-src/ext/libxml/libxml.c:1.20Sun Jul 25 06:37:27 2004
+++ php-src/ext/libxml/libxml.c Sun Jul 25 08:00:28 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.20 2004/07/25 10:37:27 chregu Exp $ */
+/* $Id: libxml.c,v 1.21 2004/07/25 12:00:28 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -377,7 +377,7 @@
va_end(args);
}
-void php_libxml_error_handler(void *ctx, const char *msg, ...)
+PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...)
{
va_list args;
va_start(args, msg);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /ext/simplexml simplexml.c
pls change to registerXpathNs or registerXpathNamespace().
-sterling
Christian Stocker wrote:
chregu Sun Jul 25 07:02:43 2004 EDT
Modified files:
/php-src NEWS
/php-src/ext/simplexml simplexml.c
Log:
added new method SimpleXMLElement-registerNamespace(string prefix, string uri)
registers a prefix - namespaceURI combination for use in a later xpath query.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1773r2=1.1774ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1773 php-src/NEWS:1.1774
--- php-src/NEWS:1.1773 Sat Jul 24 00:01:48 2004
+++ php-src/NEWS Sun Jul 25 07:02:42 2004
@@ -13,6 +13,7 @@
. array_intersect_ukey() (Christiano Duarte)
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
+ . SimpleXMLElement-registerNamespace() (Christian)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.139r2=1.140ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.139 php-src/ext/simplexml/simplexml.c:1.140
--- php-src/ext/simplexml/simplexml.c:1.139 Tue May 4 11:03:48 2004
+++ php-src/ext/simplexml/simplexml.c Sun Jul 25 07:02:43 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.139 2004/05/04 15:03:48 wez Exp $ */
+/* $Id: simplexml.c,v 1.140 2004/07/25 11:02:43 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -843,6 +843,29 @@
xmlXPathFreeObject(retval);
}
+
+SXE_METHOD(registerNamespace)
+{
+ php_sxe_object*sxe;
+ zval *id;
+ int prefix_len, ns_uri_len;
+ char *prefix, *ns_uri;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, prefix, prefix_len, ns_uri, ns_uri_len) == FAILURE) {
+ return;
+ }
+
+ sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
+ if (!sxe-xpath) {
+ sxe-xpath = xmlXPathNewContext((xmlDocPtr) sxe-document-ptr);
+ }
+
+ if (xmlXPathRegisterNs(sxe-xpath, prefix, ns_uri) != 0) {
+ RETURN_FALSE
+ }
+ RETURN_TRUE;
+}
+
/* }}} */
/* {{{ proto asXML([string filename])
@@ -1604,6 +1627,7 @@
SXE_ME(__construct,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must be called */
SXE_ME(asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath, NULL, ZEND_ACC_PUBLIC)
+ SXE_ME(registerNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
SXE_ME(children, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
@@ -1651,7 +1675,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.139 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.140 $);
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
Re: [PHP-CVS] cvs: php-src / NEWS /ext/simplexml simplexml.c
On 25.7.2004 16:53 Uhr, Sterling Hughes wrote:
pls change to registerXpathNs or registerXpathNamespace().
Yep, makes sense..
chregu
-sterling
Christian Stocker wrote:
chreguSun Jul 25 07:02:43 2004 EDT
Modified files: /php-srcNEWS
/php-src/ext/simplexmlsimplexml.c Log:
added new method SimpleXMLElement-registerNamespace(string prefix,
string uri) registers a prefix - namespaceURI combination for use
in a later xpath query.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1773r2=1.1774ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1773 php-src/NEWS:1.1774
--- php-src/NEWS:1.1773Sat Jul 24 00:01:48 2004
+++ php-src/NEWSSun Jul 25 07:02:42 2004
@@ -13,6 +13,7 @@
. array_intersect_ukey() (Christiano Duarte)
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
+ . SimpleXMLElement-registerNamespace() (Christian)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.139r2=1.140ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.139
php-src/ext/simplexml/simplexml.c:1.140
--- php-src/ext/simplexml/simplexml.c:1.139Tue May 4 11:03:48 2004
+++ php-src/ext/simplexml/simplexml.cSun Jul 25 07:02:43 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.139 2004/05/04 15:03:48 wez Exp $ */
+/* $Id: simplexml.c,v 1.140 2004/07/25 11:02:43 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -843,6 +843,29 @@
xmlXPathFreeObject(retval);
}
+
+SXE_METHOD(registerNamespace)
+{
+php_sxe_object*sxe;
+zval *id;
+int prefix_len, ns_uri_len;
+char *prefix, *ns_uri;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss,
prefix, prefix_len, ns_uri, ns_uri_len) == FAILURE) {
+return;
+}
+
+sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
+if (!sxe-xpath) {
+sxe-xpath = xmlXPathNewContext((xmlDocPtr) sxe-document-ptr);
+}
+
+if (xmlXPathRegisterNs(sxe-xpath, prefix, ns_uri) != 0) {
+RETURN_FALSE
+}
+RETURN_TRUE;
+}
+
/* }}} */
/* {{{ proto asXML([string filename])
@@ -1604,6 +1627,7 @@
SXE_ME(__construct,NULL,
ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must be called */
SXE_ME(asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath, NULL, ZEND_ACC_PUBLIC)
+SXE_ME(registerNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
SXE_ME(children, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
@@ -1651,7 +1675,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-php_info_print_table_row(2, Revision, $Revision: 1.139 $);
+php_info_print_table_row(2, Revision, $Revision: 1.140 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
christian stocker | Bitflux GmbH | schoeneggstrasse 5 | ch-8004 zurich
phone +41 1 240 56 70 | mobile +41 76 561 88 60 | fax +41 1 240 56 71
http://www.bitflux.ch | [EMAIL PROTECTED] | gnupg-keyid 0x5CE1DECB
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/simplexml simplexml.c
chregu Sun Jul 25 10:59:21 2004 EDT
Modified files:
/php-srcNEWS
/php-src/ext/simplexml simplexml.c
Log:
renamed registerNamespace() to registerXPathNamespace()
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1774r2=1.1775ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1774 php-src/NEWS:1.1775
--- php-src/NEWS:1.1774 Sun Jul 25 07:02:42 2004
+++ php-src/NEWSSun Jul 25 10:59:20 2004
@@ -13,7 +13,7 @@
. array_intersect_ukey() (Christiano Duarte)
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
- . SimpleXMLElement-registerNamespace() (Christian)
+ . SimpleXMLElement-registerXPathNamespace() (Christian)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.140r2=1.141ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.140 php-src/ext/simplexml/simplexml.c:1.141
--- php-src/ext/simplexml/simplexml.c:1.140 Sun Jul 25 07:02:43 2004
+++ php-src/ext/simplexml/simplexml.c Sun Jul 25 10:59:21 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.140 2004/07/25 11:02:43 chregu Exp $ */
+/* $Id: simplexml.c,v 1.141 2004/07/25 14:59:21 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -844,7 +844,7 @@
xmlXPathFreeObject(retval);
}
-SXE_METHOD(registerNamespace)
+SXE_METHOD(registerXPathNamespace)
{
php_sxe_object*sxe;
zval *id;
@@ -1627,7 +1627,7 @@
SXE_ME(__construct,NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must
be called */
SXE_ME(asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath, NULL, ZEND_ACC_PUBLIC)
- SXE_ME(registerNamespace, NULL, ZEND_ACC_PUBLIC)
+ SXE_ME(registerXPathNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
SXE_ME(children, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
@@ -1675,7 +1675,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.140 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.141 $);
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 /tests/classes destructor_and_echo.phpt
helly Sun Jul 25 12:12:18 2004 EDT
Added files:
/php-src/tests/classes destructor_and_echo.phpt
Log:
- Add new patch for reordered shutdown sequence
http://cvs.php.net/co.php/php-src/tests/classes/destructor_and_echo.phpt?r=1.1p=1
Index: php-src/tests/classes/destructor_and_echo.phpt
+++ php-src/tests/classes/destructor_and_echo.phpt
--TEST--
Destructors and echo
--FILE--
?php
class Test
{
function __construct() {
echo __METHOD__ . \n;
}
function __destruct() {
echo __METHOD__ . \n;
}
}
$o = new Test;
?
===DONE===
--EXPECT--
Test::__construct
===DONE===
Test::__destruct
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
helly Sun Jul 25 13:38:44 2004 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.7r2=1.1760.2.8ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.7 php-src/NEWS:1.1760.2.8 --- php-src/NEWS:1.1760.2.7 Wed Jul 21 14:38:23 2004 +++ php-src/NEWSSun Jul 25 13:38:44 2004 @@ -3,6 +3,8 @@ ?? ??? 2004, PHP 5.0.1 - Fixed unloading of dynamically loaded extensions. (Marcus, kameshj at fastmail dot fm) +- Fixed bug #29368 (The destructor is called when an exception is thrown from + the constructor). (Marcus) - Fixed bug #29291 (get_class_vars() return names with NULLs). (Marcus) - Fixed bug #29119 (html_entity_decode() misbehaves with UTF-8). (Moriyoshi) - Fixed bug #28895 (ReflectionClass::isAbstract always returns false). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom php_dom.c
helly Sun Jul 25 14:50:26 2004 EDT Modified files: /php-src/ext/domphp_dom.c Log: - Fixed Bug #29354 Exception constructor marked as both public and protected # If the constructor should be protected then it needs to be overwritten # with a method that simply calls the parent, this function simply changes # the visibility of the original function and makes that (public+protected) http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.60r2=1.61ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.60 php-src/ext/dom/php_dom.c:1.61 --- php-src/ext/dom/php_dom.c:1.60 Tue Jun 15 07:50:56 2004 +++ php-src/ext/dom/php_dom.c Sun Jul 25 14:50:24 2004 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_dom.c,v 1.60 2004/06/15 11:50:56 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.61 2004/07/25 18:50:24 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -384,7 +384,6 @@ INIT_CLASS_ENTRY(ce, DOMException, php_dom_domexception_class_functions); dom_domexception_class_entry = zend_register_internal_class_ex(ce, zend_exception_get_default(), NULL TSRMLS_CC); dom_domexception_class_entry-ce_flags |= ZEND_ACC_FINAL; - dom_domexception_class_entry-constructor-common.fn_flags |= ZEND_ACC_PROTECTED; zend_declare_property_long(dom_domexception_class_entry, code, sizeof(code)-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); REGISTER_DOM_CLASS(ce, DOMStringList, NULL, php_dom_domstringlist_class_functions, dom_domstringlist_class_entry); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
iliaa Sun Jul 25 15:19:26 2004 EDT
Modified files:
/php-src/main rfc1867.c
Log:
Fixed bug #29369 (Uploaded files with ' or in their names get their names
truncated at those characters).
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159r2=1.160ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.159 php-src/main/rfc1867.c:1.160
--- php-src/main/rfc1867.c:1.159Sat Jul 10 03:46:09 2004
+++ php-src/main/rfc1867.c Sun Jul 25 15:19:26 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.159 2004/07/10 07:46:09 andi Exp $ */
+/* $Id: rfc1867.c,v 1.160 2004/07/25 19:19:26 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -632,6 +632,7 @@
if ((quote = *str) == '' || quote == '\'') {
strend = str + 1;
+look_for_quote:
while (*strend *strend != quote) {
if (*strend == '\\' strend[1] strend[1] == quote) {
strend += 2;
@@ -639,6 +640,14 @@
++strend;
}
}
+ if (*strend *strend == quote) {
+ char p = *(strend + 1);
+ if (p != '\r' p != '\n' p != '\0') {
+ strend++;
+ goto look_for_quote;
+ }
+ }
+
res = substring_conf(str + 1, strend - str - 1, quote TSRMLS_CC);
if (*strend == quote) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /main rfc1867.c
iliaa Sun Jul 25 15:19:28 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main rfc1867.c
Log:
MFH: Fixed bug #29369 (Uploaded files with ' or in their names get their
names truncated at those characters).
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159r2=1.159.2.1ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.159 php-src/main/rfc1867.c:1.159.2.1
--- php-src/main/rfc1867.c:1.159Sat Jul 10 03:46:09 2004
+++ php-src/main/rfc1867.c Sun Jul 25 15:19:28 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.159 2004/07/10 07:46:09 andi Exp $ */
+/* $Id: rfc1867.c,v 1.159.2.1 2004/07/25 19:19:28 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -632,6 +632,7 @@
if ((quote = *str) == '' || quote == '\'') {
strend = str + 1;
+look_for_quote:
while (*strend *strend != quote) {
if (*strend == '\\' strend[1] strend[1] == quote) {
strend += 2;
@@ -639,6 +640,14 @@
++strend;
}
}
+ if (*strend *strend == quote) {
+ char p = *(strend + 1);
+ if (p != '\r' p != '\n' p != '\0') {
+ strend++;
+ goto look_for_quote;
+ }
+ }
+
res = substring_conf(str + 1, strend - str - 1, quote TSRMLS_CC);
if (*strend == quote) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /main rfc1867.c
iliaa Sun Jul 25 15:19:33 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/main rfc1867.c
Log:
MFH: Fixed bug #29369 (Uploaded files with ' or in their names get their
names truncated at those characters).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.707r2=1.1247.2.708ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.707 php-src/NEWS:1.1247.2.708
--- php-src/NEWS:1.1247.2.707 Thu Jul 22 22:05:54 2004
+++ php-src/NEWSSun Jul 25 15:19:32 2004
@@ -4,6 +4,8 @@
- Updated PCRE to provide better error handling in certain cases. (Andrei)
- NSAPI: added bucket parameter to list of non-php.ini-keys of php4_execute
for doing performance stats without warnings in server-log. (Uwe Schindler)
+- Fixed bug #29369 (Uploaded files with ' or in their names get their names
+ truncated at those characters). (Ilia)
- Fixed bug #29333 (output_buffering+trans_sess_id can corrupt output). (Ilia)
- Fixed bug #29226 (ctype_* functions missing validation of numeric string
representations). (Ilia)
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.22r2=1.122.2.23ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.22 php-src/main/rfc1867.c:1.122.2.23
--- php-src/main/rfc1867.c:1.122.2.22 Wed Jul 21 12:25:28 2004
+++ php-src/main/rfc1867.c Sun Jul 25 15:19:32 2004
@@ -16,7 +16,7 @@
| Jani Taskinen [EMAIL PROTECTED] |
+--+
*/
-/* $Id: rfc1867.c,v 1.122.2.22 2004/07/21 16:25:28 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.23 2004/07/25 19:19:32 iliaa Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -628,6 +628,7 @@
if ((quote = *str) == '' || quote == '\'') {
strend = str + 1;
+look_for_quote:
while (*strend *strend != quote) {
if (*strend == '\\' strend[1] strend[1] == quote) {
strend += 2;
@@ -635,6 +636,14 @@
++strend;
}
}
+ if (*strend *strend == quote) {
+ char p = *(strend + 1);
+ if (p != '\r' p != '\n' p != '\0') {
+ strend++;
+ goto look_for_quote;
+ }
+ }
+
res = substring_conf(str + 1, strend - str - 1, quote TSRMLS_CC);
if (*strend == quote) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes autoload_005.phpt
helly Sun Jul 25 15:20:47 2004 EDT
Added files:
/php-src/tests/classes autoload_005.phpt
Log:
- Add test
http://cvs.php.net/co.php/php-src/tests/classes/autoload_005.phpt?r=1.1p=1
Index: php-src/tests/classes/autoload_005.phpt
+++ php-src/tests/classes/autoload_005.phpt
--TEST--
ZE2 Autoload from destructor
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
function __autoload($class_name)
{
var_dump(class_exists($class_name, false));
require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
echo __FUNCTION__ . '(' . $class_name . )\n;
}
var_dump(class_exists('autoload_derived', false));
var_dump(class_exists('autoload_derived', false));
class Test
{
function __destruct() {
echo __METHOD__ . \n;
$o = new autoload_derived;
var_dump($o);
}
}
$o = new Test;
unset($o);
?
===DONE===
--EXPECTF--
bool(false)
bool(false)
Test::__destruct
bool(false)
bool(false)
__autoload(autoload_root)
__autoload(autoload_derived)
object(autoload_derived)#%d (0) {
}
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes ctor_failure.phpt
helly Sun Jul 25 15:21:21 2004 EDT
Added files:
/php-src/tests/classes ctor_failure.phpt
Log:
- Add new test
http://cvs.php.net/co.php/php-src/tests/classes/ctor_failure.phpt?r=1.1p=1
Index: php-src/tests/classes/ctor_failure.phpt
+++ php-src/tests/classes/ctor_failure.phpt
--TEST--
Do not call destructors if constructor fails
--FILE--
?php
class Test
{
function __construct($msg) {
echo __METHOD__ . ($msg)\n;
throw new Exception($msg);
}
function __destruct() {
echo __METHOD__ . \n;
}
}
try
{
$o = new Test('Hello');
unset($o);
}
catch (Exception $e)
{
echo 'Caught ' . get_class($e) . '(' . $e-getMessage() . )\n;
}
?
===DONE===
--EXPECT--
Test::__construct(Hello)
Caught Exception(Hello)
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes autoload_001.phpt autoload_002.phpt autoload_003.phpt autoload_004.phpt
helly Sun Jul 25 15:23:17 2004 EDT
Modified files:
/php-src/tests/classes autoload_001.phpt autoload_002.phpt
autoload_003.phpt autoload_004.phpt
Log:
- Do not autoload classes in skip code
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_001.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/autoload_001.phpt
diff -u php-src/tests/classes/autoload_001.phpt:1.1
php-src/tests/classes/autoload_001.phpt:1.2
--- php-src/tests/classes/autoload_001.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_001.phpt Sun Jul 25 15:23:17 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_002.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/autoload_002.phpt
diff -u php-src/tests/classes/autoload_002.phpt:1.1
php-src/tests/classes/autoload_002.phpt:1.2
--- php-src/tests/classes/autoload_002.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_002.phpt Sun Jul 25 15:23:17 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_003.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/autoload_003.phpt
diff -u php-src/tests/classes/autoload_003.phpt:1.1
php-src/tests/classes/autoload_003.phpt:1.2
--- php-src/tests/classes/autoload_003.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_003.phpt Sun Jul 25 15:23:17 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_004.phpt?r1=1.1r2=1.2ty=u
Index: php-src/tests/classes/autoload_004.phpt
diff -u php-src/tests/classes/autoload_004.phpt:1.1
php-src/tests/classes/autoload_004.phpt:1.2
--- php-src/tests/classes/autoload_004.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_004.phpt Sun Jul 25 15:23:17 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /tests/classes abstract_derived.phpt autoload_001.phpt autoload_002.phpt autoload_003.phpt autoload_004.phpt autoload_005.phpt ctor_failure.phpt destructor_and_echo.phpt
helly Sun Jul 25 15:35:30 2004 EDT
Added files: (Branch: PHP_5_0)
/php-src/tests/classes abstract_derived.phpt autoload_005.phpt
ctor_failure.phpt destructor_and_echo.phpt
Modified files:
/php-src/tests/classes autoload_001.phpt autoload_002.phpt
autoload_003.phpt autoload_004.phpt
Log:
- Update/Add tests
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_001.phpt?r1=1.1r2=1.1.2.1ty=u
Index: php-src/tests/classes/autoload_001.phpt
diff -u php-src/tests/classes/autoload_001.phpt:1.1
php-src/tests/classes/autoload_001.phpt:1.1.2.1
--- php-src/tests/classes/autoload_001.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_001.phpt Sun Jul 25 15:35:30 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_002.phpt?r1=1.1r2=1.1.2.1ty=u
Index: php-src/tests/classes/autoload_002.phpt
diff -u php-src/tests/classes/autoload_002.phpt:1.1
php-src/tests/classes/autoload_002.phpt:1.1.2.1
--- php-src/tests/classes/autoload_002.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_002.phpt Sun Jul 25 15:35:30 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_003.phpt?r1=1.1r2=1.1.2.1ty=u
Index: php-src/tests/classes/autoload_003.phpt
diff -u php-src/tests/classes/autoload_003.phpt:1.1
php-src/tests/classes/autoload_003.phpt:1.1.2.1
--- php-src/tests/classes/autoload_003.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_003.phpt Sun Jul 25 15:35:30 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
http://cvs.php.net/diff.php/php-src/tests/classes/autoload_004.phpt?r1=1.1r2=1.1.2.1ty=u
Index: php-src/tests/classes/autoload_004.phpt
diff -u php-src/tests/classes/autoload_004.phpt:1.1
php-src/tests/classes/autoload_004.phpt:1.1.2.1
--- php-src/tests/classes/autoload_004.phpt:1.1 Mon Dec 29 07:36:31 2003
+++ php-src/tests/classes/autoload_004.phpt Sun Jul 25 15:35:30 2004
@@ -3,7 +3,7 @@
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
- if (class_exists('autoload_root')) die('skip Autoload test classes exist
already');
+ if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
http://cvs.php.net/co.php/php-src/tests/classes/abstract_derived.phpt?r=1.1p=1
Index: php-src/tests/classes/abstract_derived.phpt
+++ php-src/tests/classes/abstract_derived.phpt
--TEST--
ZE2 A derived class with an abstract method must be abstract
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class base {
}
class derived extends base {
abstract function show();
}
?
===DONE===
?php exit(0); ?
--EXPECTF--
Fatal error: Class derived contains 1 abstract methods and must therefore be declared
abstract (derived::show) in %sabstract_derived.php on line %d
http://cvs.php.net/co.php/php-src/tests/classes/autoload_005.phpt?r=1.1p=1
Index: php-src/tests/classes/autoload_005.phpt
+++ php-src/tests/classes/autoload_005.phpt
--TEST--
ZE2 Autoload from destructor
--SKIPIF--
?php
if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed');
if (class_exists('autoload_root', false)) die('skip Autoload test classes
exist already');
?
--FILE--
?php
function __autoload($class_name)
{
var_dump(class_exists($class_name, false));
require_once(dirname(__FILE__) . '/' . $class_name . '.p5c');
echo __FUNCTION__ . '(' . $class_name . )\n;
}
var_dump(class_exists('autoload_derived', false));
var_dump(class_exists('autoload_derived', false));
class Test
{
function __destruct() {
echo __METHOD__ . \n;
$o = new autoload_derived;
var_dump($o);
}
}
$o = new Test;
unset($o);
?
===DONE===
--EXPECTF--
bool(false)
bool(false)
Test::__destruct
bool(false)
[PHP-CVS] cvs: php-src / NEWS /ext/mysqli mysqli_prop.c
georg Mon Jul 26 01:44:06 2004 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mysqli mysqli_prop.c
Log:
fixed bug in mysql-client_version
added mysql-client_info property
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1775r2=1.1776ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1775 php-src/NEWS:1.1776
--- php-src/NEWS:1.1775 Sun Jul 25 10:59:20 2004
+++ php-src/NEWSMon Jul 26 01:44:06 2004
@@ -14,12 +14,14 @@
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
. SimpleXMLElement-registerXPathNamespace() (Christian)
+ . mysqli-client_info property (Georg)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
- Added MDTM support to ftp_url_stat. (Sara)
- Added zlib stream filter suport. (Sara)
- Added bz2 stream filter support. (Sara)
+- Fixed bug in mysql-client_version (Georg)
- Changed the implementation of TRUE, FALSE, and NULL from constants to
keywords. (Marcus)
- Fixed ZTS destruction. (Marcus)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.14r2=1.15ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.14 php-src/ext/mysqli/mysqli_prop.c:1.15
--- php-src/ext/mysqli/mysqli_prop.c:1.14 Wed Jul 7 04:02:27 2004
+++ php-src/ext/mysqli/mysqli_prop.cMon Jul 26 01:44:06 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_prop.c,v 1.14 2004/07/07 08:02:27 georg Exp $
+ $Id: mysqli_prop.c,v 1.15 2004/07/26 05:44:06 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -82,11 +82,19 @@
int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
ALLOC_ZVAL(*retval);
- ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
+ ZVAL_LONG(*retval, MYSQL_VERSION_ID);
return SUCCESS;
}
/* }}} */
+/* {{{ property link_client_info_read */
+int link_client_info_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
+ ALLOC_ZVAL(*retval);
+ ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
+ return SUCCESS;
+}
+/* }}} */
/* {{{ property link_test_read */
int link_test_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
@@ -191,6 +199,7 @@
mysqli_property_entry mysqli_link_property_entries[] = {
{affected_rows, link_affected_rows_read, NULL},
+ {client_info, link_client_info_read, NULL},
{client_version, link_client_version_read, NULL},
{test, link_test_read, NULL},
{connect_errno, link_connect_errno_read, NULL},
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
