[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Feb 4 20:32:13 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1528r2=1.1529ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1528 php-src/ChangeLog:1.1529 --- php-src/ChangeLog:1.1528Tue Feb 3 20:32:13 2004 +++ php-src/ChangeLog Wed Feb 4 20:32:11 2004 @@ -1,3 +1,159 @@ +2004-02-04 Zeev Suraski [EMAIL PROTECTED] + +* ZendEngine2/zend_execute_API.c: + Fix exceptions happening inside internal functions called through + zend_user_function() + +* ZendEngine2/zend_execute_API.c: + Remove double initialization + +2004-02-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + sapi/cli/php_cli.c: + MFH: Parse command line ini directives passed using -d before -i, to ensure + correct settings output. + +* sapi/cli/php_cli.c: + Parse command line ini directives passed using -d before -i, to ensure + correct settings output. + +2004-02-04 Wez Furlong [EMAIL PROTECTED] + +* main/streams/streams.c + main/streams/transports.c + main/streams/xp_socket.c: + Fix a bug in the persistent socket liveness checks and feof(); they were + using the default socket timeout of 60 seconds before returning the socket + to the calling script. The reason they were using that value is that the + same code is used for feof(), so the fix is allowing the caller to + indicate the timeout value for liveness checks. + + A possible remaining issue now is that 0 second timeout[1] for pfsockopen + is possibly too short; it's impossible to specify a sane value for all + possible uses, so maybe we need a stream context or an .ini option to + control this, or maybe use the timeout value that was passed to + pfsockopen(). + + +2004-02-04 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_objects.h: + Add new prototype + +* ZendEngine2/zend_reflection_api.c: + Fix reflection + +* tests/classes/this.phpt: + Add test + +* tests/lang/030.phpt: + The new is no longer needed, prevent E_STRICT message + +2004-02-04 Andi Gutmans [EMAIL PROTECTED] + +* NEWS: + - Added recent stuff to NEWS + +2004-02-04 Marcus Boerger [EMAIL PROTECTED] + +* ext/xsl/php_xsl.c: + Fix Warning + +* ZendEngine2/zend_iterators.c: + Fix warnings + +2004-02-04 Zeev Suraski [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c: + Fixlet + +* ZendEngine2/zend_compile.c: + Fix handling of $this in some cases + +* tests/lang/bug24573.phpt: + Update test (reason: can no longer assign to $this) + +* tests/classes/final_redeclare.phpt: + Update test (reason: early binding changes its behavior) + +* tests/classes/class_final.phpt: + Update test (reason: early binding changes its behavior) + +* ZendEngine2/zend_compile.c: + Handle additional cases + +* ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.h + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_language_parser.y: + Reinstate early-binding for classes. + + Note that this is available for downwards compatibility only - and it + doesn't + work if you use new features (namely, interfaces). Generally, people + should + declare their classes before using them, but we just didn't want hell to + break + loose (c) + +* ZendEngine2/zend_opcode.c: + Optimize + +* ZendEngine2/zend_compile.c: + - Improve $this assignment detection and generalize some code in + zend_compile.c + +2004-02-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/dom/php_dom.c: + Fixed compile warnings. + +2004-02-04 Zeev Suraski [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c: + -Error out when trying to re-assign $this + +* ext/sqlite/sqlite.c: + kill warning + +* ZendEngine2/zend_objects_API.c + ZendEngine2/zend_objects_API.h: + The valid bit was necessary after all - restored + +* ZendEngine2/zend_objects_API.c: + Fixlets + +* ZendEngine2/zend_compile.c + ZendEngine2/zend_objects.c: + - Small fixes + +* ZendEngine2/zend_execute.c: + - Improve wording + +* ext/com_dotnet/com_handlers.c + ext/com_dotnet/com_misc.c + ext/com_dotnet/com_saproxy.c + ext/com_dotnet/php_com_dotnet_internal.h + ext/dom/php_dom.c + ext/mono/php_mono.c + ext/mysqli/mysqli.c + ext/simplexml/simplexml.c + ext/sqlite/sqlite.c + ext/xsl/php_xsl.c + ext/xsl/php_xsl.h: + - Update with new destructor code + +* ZendEngine2/zend_execute_API.c + ZendEngine2/zend_iterators.c + ZendEngine2/zend_objects.c + ZendEngine2/zend_objects_API.c + ZendEngine2/zend_objects_API.h +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Feb 4 20:32:18 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.400r2=1.401ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.400 ZendEngine2/ChangeLog:1.401 --- ZendEngine2/ChangeLog:1.400 Tue Feb 3 20:32:17 2004 +++ ZendEngine2/ChangeLog Wed Feb 4 20:32:18 2004 @@ -1,3 +1,82 @@ +2004-02-04 Zeev Suraski [EMAIL PROTECTED] + +* zend_execute_API.c: + Fix exceptions happening inside internal functions called through + zend_user_function() + +* zend_execute_API.c: + Remove double initialization + +2004-02-04 Marcus Boerger [EMAIL PROTECTED] + +* zend_objects.h: + Add new prototype + +* zend_reflection_api.c: + Fix reflection + +* zend_iterators.c: + Fix warnings + +2004-02-04 Zeev Suraski [EMAIL PROTECTED] + +* zend_compile.c: + Fixlet + +* zend_compile.c: + Fix handling of $this in some cases + +* zend_compile.c: + Handle additional cases + +* zend_compile.c + zend_compile.h + zend_execute.c + zend_execute.h + zend_execute_API.c + zend_language_parser.y: + Reinstate early-binding for classes. + + Note that this is available for downwards compatibility only - and it + doesn't + work if you use new features (namely, interfaces). Generally, people + should + declare their classes before using them, but we just didn't want hell to + break + loose (c) + +* zend_opcode.c: + Optimize + +* zend_compile.c: + - Improve $this assignment detection and generalize some code in + zend_compile.c + +* zend_compile.c: + -Error out when trying to re-assign $this + +* zend_objects_API.c + zend_objects_API.h: + The valid bit was necessary after all - restored + +* zend_objects_API.c: + Fixlets + +* zend_compile.c + zend_objects.c: + - Small fixes + +* zend_execute.c: + - Improve wording + +* zend_execute_API.c + zend_iterators.c + zend_objects.c + zend_objects_API.c + zend_objects_API.h + zend_reflection_api.c: + Change destructor implementation (details will follow on internals@) + 2004-02-03 Marcus Boerger [EMAIL PROTECTED] * tests/bug24884.phpt: @@ -3135,7 +3214,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.400 2004/02/04 01:32:17 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.401 2004/02/05 01:32:18 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -4859,7 +4938,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.400 2004/02/04 01:32:17 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.401 2004/02/05 01:32:18 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl AUTHORS Makefile.am Makefile.bcc32 README config.h.in configure.in mbfl.rc /ext/mbstring/libmbfl/filters Makefile.am html_entities.c html_entities.h mbfilter_htmlent.c /ext/mbstring/libmbfl/mbfl Makefile.am mbfilter.c mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_convert.c mbfl_convert.h mbfl_ident.c mbfl_ident.h /ext/mbstring/libmbfl/nls Makefile.am
moriyoshi Wed Feb 4 02:24:09 2004 EDT Modified files: /php-src/ext/mbstring/libmbfl AUTHORS Makefile.am Makefile.bcc32 README config.h.in configure.in mbfl.rc /php-src/ext/mbstring/libmbfl/filters Makefile.am html_entities.c html_entities.h mbfilter_htmlent.c /php-src/ext/mbstring/libmbfl/mbfl Makefile.am mbfilter.c mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_convert.c mbfl_convert.h mbfl_ident.c mbfl_ident.h /php-src/ext/mbstring/libmbfl/nls Makefile.am Log: - Update libmbfl to the latest. This fixes several serious issues in the html entity encoder and the encoding detection facility. There should be no problem with mailparse() as API change was made so carefully that it would be as small as possible. http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/AUTHORS?r1=1.1r2=1.2ty=u Index: php-src/ext/mbstring/libmbfl/AUTHORS diff -u php-src/ext/mbstring/libmbfl/AUTHORS:1.1 php-src/ext/mbstring/libmbfl/AUTHORS:1.2 --- php-src/ext/mbstring/libmbfl/AUTHORS:1.1Sat Aug 23 02:18:35 2003 +++ php-src/ext/mbstring/libmbfl/AUTHORSWed Feb 4 02:24:05 2004 @@ -1,8 +1,10 @@ +Den V. Tsopa [EMAIL PROTECTED] Hironori Sato [EMAIL PROTECTED] +Marcus Boerger [EMAIL PROTECTED] +Moriyoshi Koizumi [EMAIL PROTECTED] +Rui Hirokawa [EMAIL PROTECTED] Shigeru Kanemoto [EMAIL PROTECTED] Tsukada Takuya [EMAIL PROTECTED] -U. Kenkichi [EMAIL PROTECTED] Tateyama [EMAIL PROTECTED] -Moriyoshi Koizumi [EMAIL PROTECTED] -Rui Hirokawa [EMAIL PROTECTED] -Other gracious contributors +U. Kenkichi [EMAIL PROTECTED] +Wez Furlong [EMAIL PROTECTED] http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/Makefile.am?r1=1.1r2=1.2ty=u Index: php-src/ext/mbstring/libmbfl/Makefile.am diff -u php-src/ext/mbstring/libmbfl/Makefile.am:1.1 php-src/ext/mbstring/libmbfl/Makefile.am:1.2 --- php-src/ext/mbstring/libmbfl/Makefile.am:1.1Sat Aug 23 02:18:35 2003 +++ php-src/ext/mbstring/libmbfl/Makefile.amWed Feb 4 02:24:05 2004 @@ -1,2 +1,5 @@ -EXTRA_DIST=AUTHORS DISCLAIMER +EXTRA_DIST=AUTHORS DISCLAIMER LICENSE Makefile.bcc32 \ + config.h.bcc32 config.h.vc6 \ + libmbfl.dsp libmbfl.dsw libmbfl.sln libmbfl.vcproj mbfl.rc \ + mksbcc32.bat rules.mak.bcc32 SUBDIRS = nls filters mbfl http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/Makefile.bcc32?r1=1.1r2=1.2ty=u Index: php-src/ext/mbstring/libmbfl/Makefile.bcc32 diff -u php-src/ext/mbstring/libmbfl/Makefile.bcc32:1.1 php-src/ext/mbstring/libmbfl/Makefile.bcc32:1.2 --- php-src/ext/mbstring/libmbfl/Makefile.bcc32:1.1 Sun Aug 24 16:07:07 2003 +++ php-src/ext/mbstring/libmbfl/Makefile.bcc32 Wed Feb 4 02:24:05 2004 @@ -5,12 +5,12 @@ all: mbfl.dll mbfl.lib mbfl.lib: mbfl.dll - implib mbfl.lib mbfl.dll + implib -a mbfl.lib mbfl.dll -mbfl.dll: compile mbfl.def mbfl.res +mbfl.dll: compile mbfl.res @if exist linker.rsp del linker.rsp @for %i in ($(SUBDIRS)) do @for %j in (%i\*.obj) do @echo %j+ linker.rsp - ilink32 $(LDFLAGS) @linker.rsp,mbfl.dll,,$(LIBS),mbfl.def,mbfl.res + ilink32 $(LDFLAGS) @linker.rsp,mbfl.dll,,$(LIBS),,mbfl.res del linker.rsp mbfl.res: mbfl.rc @@ -22,6 +22,8 @@ clean: @for %i in ($(SUBDIRS)) do $(COMSPEC) /C mksbcc32.bat $(MAKE) %i clean + @if exist linker.rsp del linker.rsp + @if exist mbfl.RES del mbfl.RES @if exist mbfl.dll del mbfl.dll @if exist mbfl.lib del mbfl.lib @if exist config.h del config.h http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/README?r1=1.2r2=1.3ty=u Index: php-src/ext/mbstring/libmbfl/README diff -u php-src/ext/mbstring/libmbfl/README:1.2 php-src/ext/mbstring/libmbfl/README:1.3 --- php-src/ext/mbstring/libmbfl/README:1.2 Sun Aug 24 16:07:07 2003 +++ php-src/ext/mbstring/libmbfl/README Wed Feb 4 02:24:05 2004 @@ -5,4 +5,4 @@ See the file INSTALL for building and installation instructions. -# $Id: README,v 1.1.2.2 2003/08/24 18:18:51 moriyoshi Exp +# $Id: README,v 1.3 2004/02/04 07:24:05 moriyoshi Exp $ http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/config.h.in?r1=1.1r2=1.2ty=u Index: php-src/ext/mbstring/libmbfl/config.h.in diff -u php-src/ext/mbstring/libmbfl/config.h.in:1.1 php-src/ext/mbstring/libmbfl/config.h.in:1.2 --- php-src/ext/mbstring/libmbfl/config.h.in:1.1Sat Aug 23 02:18:35 2003 +++ php-src/ext/mbstring/libmbfl/config.h.inWed Feb 4 02:24:05 2004 @@ -3,6 +3,9 @@ /* Define to 1 if you have the assert.h header file. */ #undef HAVE_ASSERT_H +/* Define to 1 if you have the dlfcn.h header file. */ +#undef
Re: [PHP-CVS] cvs: php-src /ext/mbstring/libmbfl AUTHORS Makefile.am Makefile.bcc32 README config.h.in configure.in mbfl.rc /ext/mbstring/libmbfl/filters Makefile.am html_entities.c html_entities.h mbfilter_htmlent.c /ext/mbstring/libmbfl/mbfl Makefile.am mbfilter.c mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_convert.c mbfl_convert.h mbfl_ident.c mbfl_ident.h /ext/mbstring/libmbfl/nls Makefile.am
Hello Moriyoshi,
Wednesday, February 4, 2004, 8:24:09 AM, you wrote:
moriyoshi Wed Feb 4 02:24:09 2004 EDT
Modified files:
/php-src/ext/mbstring/libmbfl AUTHORS Makefile.am Makefile.bcc32
README config.h.in configure.in
mbfl.rc
/php-src/ext/mbstring/libmbfl/filters Makefile.am html_entities.c
html_entities.h
mbfilter_htmlent.c
/php-src/ext/mbstring/libmbfl/mbflMakefile.am mbfilter.c
mbfilter.h mbfilter_8bit.h
mbfilter_pass.h mbfilter_wchar.h
mbfl_convert.c mbfl_convert.h
mbfl_ident.c mbfl_ident.h
/php-src/ext/mbstring/libmbfl/nls Makefile.am
Log:
- Update libmbfl to the latest. This fixes several serious issues in the html
entity encoder and the encoding detection facility. There should be no
problem with mailparse() as API change was made so carefully that it
would be as small as possible.
Why were the following changed to be converted always?
Doing so prevents you from sending out html code.
-const mbfl_html_entity mbfl_html_entity_list[] = { /*
- {quot, 34}, DO NOT CONVERT THESE AUTOMATICALLY
+const mbfl_html_entity_entry mbfl_html_entity_list[] = {
+ {quot, 34},
{amp,38},
{lt, 60},
- {gt, 62}, */
+ {gt, 62},
Best regards,
Marcusmailto:[EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring/libmbfl AUTHORS Makefile.am Makefile.bcc32 README config.h.in configure.in mbfl.rc /ext/mbstring/libmbfl/filters Makefile.am html_entities.c html_entities.h mbfilter_htmlent.c /ext/mbstring/libmbfl/mbfl Makefile.am mbfilter.c mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_convert.c mbfl_convert.h mbfl_ident.c mbfl_ident.h /ext/mbstring/libmbfl/nls Makefile.am
On 2004/02/04, at 16:39, Marcus Boerger wrote:
Why were the following changed to be converted always?
Doing so prevents you from sending out html code.
-const mbfl_html_entity mbfl_html_entity_list[] = { /*
- {quot, 34}, DO NOT CONVERT THESE AUTOMATICALLY
+const mbfl_html_entity_entry mbfl_html_entity_list[] = {
+ {quot, 34},
{amp,38},
{lt, 60},
- {gt, 62}, */
+ {gt, 62},
Those entities are not processed anyway because the related
functions look up htmlentitifieds[256] and convert each characters
to the corresponding entities if the value 1 is mapped to that
character on the htmlentitifieds table. This is actually a slight
algorithmic change.
Moriyoshi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring/libmbfl AUTHORS Makefile.am Makefile.bcc32 README config.h.in configure.in mbfl.rc /ext/mbstring/libmbfl/filters Makefile.am html_entities.c html_entities.h mbfilter_htmlent.c /ext/mbstring/libmbfl/mbfl Makefile.am mbfilter.c mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_convert.c mbfl_convert.h mbfl_ident.c mbfl_ident.h /ext/mbstring/libmbfl/nls Makefile.am
functions look up htmlentitifieds[256] and convert each characters to the corresponding entities if the value 1 is mapped to that s/each characters/each character/ s/corresponding entities/corresponding entity/ :) Moriyoshi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring/libmbfl AUTHORS Makefile.am Makefile.bcc32 README config.h.in configure.in mbfl.rc /ext/mbstring/libmbfl/filters Makefile.am html_entities.c html_entities.h mbfilter_htmlent.c /ext/mbstring/libmbfl/mbfl Makefile.am mbfilter.c mbfilter.h mbfilter_8bit.h mbfilter_pass.h mbfilter_wchar.h mbfl_convert.c mbfl_convert.h mbfl_ident.c mbfl_ident.h /ext/mbstring/libmbfl/nls Makefile.am
Hello Moriyoshi,
Wednesday, February 4, 2004, 8:49:47 AM, you wrote:
On 2004/02/04, at 16:39, Marcus Boerger wrote:
Why were the following changed to be converted always?
Doing so prevents you from sending out html code.
-const mbfl_html_entity mbfl_html_entity_list[] = { /*
- {quot, 34}, DO NOT CONVERT THESE AUTOMATICALLY
+const mbfl_html_entity_entry mbfl_html_entity_list[] = {
+ {quot, 34},
{amp,38},
{lt, 60},
- {gt, 62}, */
+ {gt, 62},
Those entities are not processed anyway because the related
functions look up htmlentitifieds[256] and convert each characters
to the corresponding entities if the value 1 is mapped to that
character on the htmlentitifieds table. This is actually a slight
algorithmic change.
Good then :-)
--
Best regards,
Marcusmailto:[EMAIL PROTECTED]
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
zeevWed Feb 4 06:12:39 2004 EDT
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Update with new destructor code
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.123r2=1.124ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.123 php-src/ext/simplexml/simplexml.c:1.124
--- php-src/ext/simplexml/simplexml.c:1.123 Mon Feb 2 03:10:31 2004
+++ php-src/ext/simplexml/simplexml.c Wed Feb 4 06:12:31 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.123 2004/02/02 08:10:31 sniper Exp $ */
+/* $Id: simplexml.c,v 1.124 2004/02/04 11:12:31 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -114,16 +114,16 @@
/* {{{ match_ns()
*/
-static inline int
+static inline int
match_ns(php_sxe_object *sxe, xmlNodePtr node, xmlChar *name)
{
if (name == NULL (node-ns == NULL || node-ns-prefix == NULL)) {
return 1;
}
-
+
if (node-ns !xmlStrcmp(node-ns-href, name)) {
return 1;
- }
+ }
return 0;
}
@@ -392,7 +392,7 @@
newnode = node;
++counter;
}
-
+
next_iter:
node = node-next;
}
@@ -459,7 +459,7 @@
xmlNodePtr node;
xmlAttrPtr attr = NULL;
int exists = 0;
-
+
sxe = php_sxe_fetch_object(object TSRMLS_CC);
name = Z_STRVAL_P(member);
@@ -488,7 +488,7 @@
exists = 1;
break;
}
-
+
attr = attr-next;
}
}
@@ -568,9 +568,9 @@
node = node-children;
while (node) {
nnext = node-next;
-
+
SKIP_TEXT(node);
-
+
if (!xmlStrcmp(node-name, Z_STRVAL_P(member))) {
xmlUnlinkNode(node);
php_libxml_node_free_resource(node TSRMLS_CC);
@@ -613,7 +613,7 @@
xmlChar*contents;
MAKE_STD_ZVAL(*value);
-
+
if (node-children node-children-type == XML_TEXT_NODE
!xmlIsBlankNode(node-children)) {
contents = xmlNodeListGetString(node-doc, node-children, 1);
if (contents) {
@@ -676,7 +676,7 @@
goto next_iter;
}
}
-
+
name = (char *) node-name;
if (!name) {
goto next_iter;
@@ -685,7 +685,7 @@
}
_get_base_node_value(sxe, node, value TSRMLS_CC);
-
+
h = zend_hash_func(name, namelen);
if (zend_hash_quick_find(rv, name, namelen, h, (void **)
data_ptr) == SUCCESS) {
if (Z_TYPE_PP(data_ptr) == IS_ARRAY) {
@@ -738,7 +738,7 @@
/* }}} */
/* {{{ xpath()
- */
+ */
SXE_METHOD(xpath)
{
php_sxe_object*sxe;
@@ -813,7 +813,7 @@
add_next_index_zval(return_value, value);
}
}
-
+
xmlXPathFreeObject(retval);
}
/* }}} */
@@ -838,10 +838,10 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, filename,
filename_len) == FAILURE) {
RETURN_FALSE;
}
-
+
sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
GET_NODE(sxe, node);
-
+
if (node) {
if (XML_DOCUMENT_NODE == node-parent-type) {
xmlSaveFile(filename, (xmlDocPtr) sxe-document-ptr);
@@ -850,7 +850,7 @@
if (outbuf == NULL) {
RETURN_FALSE;
- }
+ }
xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe-document-ptr, node, 0, 1, NULL);
xmlOutputBufferClose(outbuf);
@@ -873,11 +873,11 @@
if (outbuf == NULL) {
RETURN_FALSE;
- }
+ }
xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe-document-ptr,
node, 0, 1, ((xmlDocPtr) sxe-document-ptr)-encoding);
[PHP-CVS] cvs: php-src /ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c php_com_dotnet_internal.h /ext/dom php_dom.c /ext/mono php_mono.c /ext/mysqli mysqli.c /ext/sqlite sqlite.c /ext/tidy php_tidy.h tidy.c /ext/xsl php_xsl.c php_xsl.h
zeevWed Feb 4 06:14:48 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_handlers.c com_misc.c com_saproxy.c
php_com_dotnet_internal.h
/php-src/ext/domphp_dom.c
/php-src/ext/mono php_mono.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/tidy php_tidy.h tidy.c
/php-src/ext/xslphp_xsl.c php_xsl.h
Log:
- Update with new destructor code
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.13r2=1.14ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.13
php-src/ext/com_dotnet/com_handlers.c:1.14
--- php-src/ext/com_dotnet/com_handlers.c:1.13 Tue Jan 13 11:05:38 2004
+++ php-src/ext/com_dotnet/com_handlers.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.13 2004/01/13 16:05:38 wez Exp $ */
+/* $Id: com_handlers.c,v 1.14 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -554,7 +554,7 @@
}
}
-void php_com_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+void php_com_object_free_storage(void *object TSRMLS_DC)
{
php_com_dotnet_object *obj = (php_com_dotnet_object*)object;
@@ -616,7 +616,8 @@
obj-code_page = CP_ACP;
obj-ce = ce;
- retval.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+
+ retval.handle = zend_objects_store_put(obj, NULL, php_com_object_free_storage,
php_com_object_clone TSRMLS_CC);
retval.handlers = php_com_object_handlers;
return retval;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_misc.c?r1=1.3r2=1.4ty=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.3 php-src/ext/com_dotnet/com_misc.c:1.4
--- php-src/ext/com_dotnet/com_misc.c:1.3 Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_misc.c Wed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_misc.c,v 1.3 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_misc.c,v 1.4 2004/02/04 11:14:30 zeev Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -60,7 +60,7 @@
IDispatch_GetTypeInfo(V_DISPATCH(obj-v), 0, LANG_NEUTRAL, obj-typeinfo);
Z_TYPE_P(z) = IS_OBJECT;
- z-value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z-value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z-value.obj.handlers = php_com_object_handlers;
}
@@ -83,7 +83,7 @@
Z_TYPE_P(z) = IS_OBJECT;
- z-value.obj.handle = zend_objects_store_put(obj, php_com_object_dtor,
php_com_object_clone TSRMLS_CC);
+ z-value.obj.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
z-value.obj.handlers = php_com_object_handlers;
}
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.2r2=1.3ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.2
php-src/ext/com_dotnet/com_saproxy.c:1.3
--- php-src/ext/com_dotnet/com_saproxy.c:1.2Thu Jan 8 03:14:20 2004
+++ php-src/ext/com_dotnet/com_saproxy.cWed Feb 4 06:14:30 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.2 2004/01/08 08:14:20 andi Exp $ */
+/* $Id: com_saproxy.c,v 1.3 2004/02/04 11:14:30 zeev Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -261,7 +261,7 @@
saproxy_object_cast
};
-static void saproxy_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void saproxy_free_storage(void *object TSRMLS_DC)
{
php_com_saproxy *proxy = (php_com_saproxy *)object;
@@ -313,7 +313,7 @@
proxy-indices[proxy-dimensions-1] = index;
Z_TYPE_P(proxy_out) = IS_OBJECT;
- Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, saproxy_dtor,
saproxy_clone TSRMLS_CC);
+ Z_OBJ_HANDLE_P(proxy_out) = zend_objects_store_put(proxy, NULL,
saproxy_free_storage, saproxy_clone TSRMLS_CC);
Z_OBJ_HT_P(proxy_out) = php_com_saproxy_handlers;
return 1;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.8r2=1.9ty=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.8
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.9
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.8Tue Jan 13 08:38:11
2004
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.hWed Feb 4
[PHP-CVS] cvs: php-src /ext/spl spl_array.c spl_directory.c spl_iterators.c
zeevWed Feb 4 07:45:48 2004 EDT
Modified files:
/php-src/ext/splspl_array.c spl_directory.c spl_iterators.c
Log:
API updates
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.30r2=1.31ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.30 php-src/ext/spl/spl_array.c:1.31
--- php-src/ext/spl/spl_array.c:1.30Tue Jan 20 15:59:45 2004
+++ php-src/ext/spl/spl_array.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.30 2004/01/20 20:59:45 helly Exp $ */
+/* $Id: spl_array.c,v 1.31 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -75,8 +75,8 @@
HashPosition pos;
} spl_array_object;
-/* {{{ spl_array_object_dtor */
-static void spl_array_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+/* {{{ spl_array_object_free_storage */
+static void spl_array_object_free_storage(void *object TSRMLS_DC)
{
spl_array_object *intern = (spl_array_object *)object;
@@ -114,7 +114,7 @@
}
zend_hash_internal_pointer_reset_ex(HASH_OF(intern-array), intern-pos);
- retval.handle = zend_objects_store_put(intern, spl_array_object_dtor, NULL
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) spl_array_object_free_storage, NULL TSRMLS_CC);
if (class_type == spl_ce_ArrayIterator) {
retval.handlers = spl_handler_ArrayIterator;
} else {
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.21r2=1.22ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.21 php-src/ext/spl/spl_directory.c:1.22
--- php-src/ext/spl/spl_directory.c:1.21Fri Jan 23 16:33:56 2004
+++ php-src/ext/spl/spl_directory.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.21 2004/01/23 21:33:56 helly Exp $ */
+/* $Id: spl_directory.c,v 1.22 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -50,9 +50,9 @@
zend_class_entry *spl_ce_RecursiveDirectoryIterator;
-/* {{{ spl_ce_dir_object_dtor */
+/* {{{ spl_ce_dir_object_free_storage */
/* close all resources and the memory allocated for the object */
-static void spl_ce_dir_object_dtor(void *object, zend_object_handle handle TSRMLS_DC)
+static void spl_ce_dir_object_free_storage(void *object TSRMLS_DC)
{
spl_ce_dir_object *intern = (spl_ce_dir_object *)object;
@@ -99,7 +99,7 @@
zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
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, spl_ce_dir_object_dtor, NULL
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) spl_ce_dir_object_free_storage, NULL TSRMLS_CC);
retval.handlers = spl_ce_dir_handlers;
return retval;
}
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.18r2=1.19ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.18 php-src/ext/spl/spl_iterators.c:1.19
--- php-src/ext/spl/spl_iterators.c:1.18Wed Jan 28 17:59:03 2004
+++ php-src/ext/spl/spl_iterators.c Wed Feb 4 07:45:47 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.18 2004/01/28 22:59:03 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.19 2004/02/04 12:45:47 zeev Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -413,7 +413,7 @@
}
/* {{{ spl_RecursiveIteratorIterator_dtor */
-static void spl_RecursiveIteratorIterator_dtor(void *_object, zend_object_handle
handle TSRMLS_DC)
+static void spl_RecursiveIteratorIterator_free_storage(void *_object TSRMLS_DC)
{
spl_recursive_it_object *object = (spl_recursive_it_object *)_object;
zend_object_iterator *sub_iter;
@@ -449,7 +449,7 @@
zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
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,
spl_RecursiveIteratorIterator_dtor, NULL TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) spl_RecursiveIteratorIterator_free_storage, NULL
TSRMLS_CC);
retval.handlers = spl_handlers_rec_it_it;
return retval;
}
@@ -791,8 +791,8 @@
zval_ptr_dtor(retval);
}
-/* {{{ spl_dual_it_dtor */
-static INLINE void spl_dual_it_dtor(void *_object, zend_object_handle handle
TSRMLS_DC)
+/* {{{
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
zeevWed Feb 4 07:45:57 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
kill warning
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.116r2=1.117ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.116 php-src/ext/sqlite/sqlite.c:1.117
--- php-src/ext/sqlite/sqlite.c:1.116 Wed Feb 4 06:14:35 2004
+++ php-src/ext/sqlite/sqlite.c Wed Feb 4 07:45:56 2004
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.116 2004/02/04 11:14:35 zeev Exp $
+ $Id: sqlite.c,v 1.117 2004/02/04 12:45:56 zeev Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -791,7 +791,7 @@
zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
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, NULL,
sqlite_object_free_storage, NULL TSRMLS_CC);
+ retval-handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL TSRMLS_CC);
retval-handlers = handlers;
}
@@ -1054,7 +1054,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.116 2004/02/04 11:14:35 zeev Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.117 2004/02/04 12:45:56 zeev 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();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Wed Feb 4 10:17:23 2004 EDT Modified files: /CVSROOTavail Log: peardoc karma for gurugeek http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.821r2=1.822ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.821 CVSROOT/avail:1.822 --- CVSROOT/avail:1.821 Mon Feb 2 10:33:50 2004 +++ CVSROOT/avail Wed Feb 4 10:17:22 2004 @@ -54,7 +54,7 @@ avail|arnaud,bjoern,chregu,dams,david,jmcastagnetto,rashid,tuupola,silvano|pearweb/weeklynews # Some people get access to the peardoc -avail|sroebke,thierry_bo,tony2001,schst,mcgyver5,sousk|peardoc +avail|sroebke,thierry_bo,tony2001,schst,mcgyver5,sousk,gurugeek|peardoc avail|elf|peardoc/ja avail|elf|phpdoc/ja -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
sas Wed Feb 4 10:28:02 2004 EDT Modified files: /CVSROOTavail Log: some phpdoc and peardoc karma http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.822r2=1.823ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.822 CVSROOT/avail:1.823 --- CVSROOT/avail:1.822 Wed Feb 4 10:17:22 2004 +++ CVSROOT/avail Wed Feb 4 10:28:02 2004 @@ -25,7 +25,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,tony2001,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz|phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,livedocs
[PHP-CVS] cvs: CVSROOT / avail
sas Wed Feb 4 10:33:26 2004 EDT Modified files: /CVSROOTavail Log: some pear karma http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.823r2=1.824ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.823 CVSROOT/avail:1.824 --- CVSROOT/avail:1.823 Wed Feb 4 10:28:02 2004 +++ CVSROOT/avail Wed Feb 4 10:33:25 2004 @@ -44,7 +44,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure|pear,peardoc +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,pajoye,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,darknoise,tarjei,toby,danielc,ieure,metz|pear,peardoc # PEAR bits in the main php-src module avail|cox,mj,vblavet,dickmann,tal,pajoye,jmcastagnetto,alexmerz,cellog|php-src/pear -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes class_final.phpt
zeevWed Feb 4 12:45:10 2004 EDT
Modified files:
/php-src/tests/classes class_final.phpt
Log:
Update test (reason: early binding changes its behavior)
http://cvs.php.net/diff.php/php-src/tests/classes/class_final.phpt?r1=1.2r2=1.3ty=u
Index: php-src/tests/classes/class_final.phpt
diff -u php-src/tests/classes/class_final.phpt:1.2
php-src/tests/classes/class_final.phpt:1.3
--- php-src/tests/classes/class_final.phpt:1.2 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/class_final.phpt Wed Feb 4 12:45:08 2004
@@ -12,7 +12,6 @@
}
$t = new base();
-$t-show();
class derived extends base {
}
@@ -20,6 +19,4 @@
echo Done\n; // shouldn't be displayed
?
--EXPECTF--
-base
-
Fatal error: Class derived may not inherit from final class (base) in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes final_redeclare.phpt
zeevWed Feb 4 12:47:36 2004 EDT
Modified files:
/php-src/tests/classes final_redeclare.phpt
Log:
Update test (reason: early binding changes its behavior)
http://cvs.php.net/diff.php/php-src/tests/classes/final_redeclare.phpt?r1=1.2r2=1.3ty=u
Index: php-src/tests/classes/final_redeclare.phpt
diff -u php-src/tests/classes/final_redeclare.phpt:1.2
php-src/tests/classes/final_redeclare.phpt:1.3
--- php-src/tests/classes/final_redeclare.phpt:1.2 Sat Aug 9 10:48:47 2003
+++ php-src/tests/classes/final_redeclare.phpt Wed Feb 4 12:47:35 2004
@@ -12,7 +12,6 @@
}
$t = new pass();
-$t-show();
class fail extends pass {
function show() {
@@ -23,6 +22,4 @@
echo Done\n; // Shouldn't be displayed
?
--EXPECTF--
-Call to function pass::show()
-
Fatal error: Cannot override final method pass::show() in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
andiWed Feb 4 16:29:29 2004 EDT Modified files: /php-srcNEWS Log: - Added recent stuff to NEWS http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1595r2=1.1596ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1595 php-src/NEWS:1.1596 --- php-src/NEWS:1.1595 Tue Feb 3 01:44:45 2004 +++ php-src/NEWSWed Feb 4 16:29:28 2004 @@ -1,6 +1,20 @@ PHPNEWS ||| -?? ??? 2004, PHP 5 RC1 +?? ??? 2004, PHP 5 Beta 4 +- Readded support for using classes before they are declared according to + the behavior in PHP 4. This won't work with classes who are using PHP 5 + features such as interfaces. (Zeev, Andi) +- Added error message when trying to re-assign to $this variable. (Zeev, Andi) +- Improved destructor implementation to always call destructors on clean + shutdown. An order of destruction is not guaranteed. (Zeev, Andi) +- Fixed problem with parse error in include() file not stopping PHP's + execution (Ilia) +- Redesigned exception support. This fixes many bugs in the previous design + such as nested try's and problems with overloaded extensions. (Zeev, Andi) +- Redesigned clone by adding a clone keyword (clone $obj) and copying all + properties before __clone() is called. Also allows calling parent __clone + function by using parent::__clone(). (Zeev, Andi) +- Added support for an interface to extend another interface (Zeev) - Respect property visibility in foreach. (Marcus) - Completely overhauled SimpleXML extension. (Marcus, Rob, Sterling) - Added new Interbase functions: (Ard) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
Hello Andi,
Wednesday, February 4, 2004, 10:29:29 PM, you wrote:
andi Wed Feb 4 16:29:29 2004 EDT
Modified files:
/php-src NEWS
Log:
- Added recent stuff to NEWS
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1595r2=1.1596ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1595 php-src/NEWS:1.1596
--- php-src/NEWS:1.1595 Tue Feb 3 01:44:45 2004
+++ php-src/NEWS Wed Feb 4 16:29:28 2004
@@ -1,6 +1,20 @@
PHPNEWS
[...]
+- Added support for an interface to extend another interface (Zeev)
He didn't fix anything here. The point was to disallow interface
implemnts but we still need to allow multiple base inetrfaces.
Here is the patch to fix it:
If you don't object i will commit.
--
Best regards,
Marcusmailto:[EMAIL PROTECTED]Index: tests/classes/interface_doubled.phpt
===
RCS file: /repository/php-src/tests/classes/interface_doubled.phpt,v
retrieving revision 1.6
diff -u -p -d -r1.6 interface_doubled.phpt
--- tests/classes/interface_doubled.phpt21 Jan 2004 22:36:49 - 1.6
+++ tests/classes/interface_doubled.phpt4 Feb 2004 21:59:14 -
@@ -25,7 +25,7 @@ interface if_e {
abstract function f_d();
}
-interface if_f extends if_e, if_a, if_b, if_c, if_d, if_e {
+interface if_f extends /*if_e,*/ if_a, if_b, if_c, if_d /*, if_e*/ {
}
class base {
@@ -154,6 +154,7 @@ echo $t-test('if_d');
echo $t-test('if_e');
?
+===DONE===
--EXPECTF--
class_a
is_a(class_a, if_a) yes
@@ -196,4 +197,5 @@ is_a(class_g, if_a) yes
is_a(class_g, if_b) yes
is_a(class_g, if_c) yes
is_a(class_g, if_d) yes
-is_a(class_g, if_e) yes
\ No newline at end of file
+is_a(class_g, if_e) no
+===DONE===
Index: Zend/zend_compile.c
===
RCS file: /repository/ZendEngine2/zend_compile.c,v
retrieving revision 1.536
diff -u -p -d -r1.536 zend_compile.c
--- Zend/zend_compile.c 4 Feb 2004 18:24:44 - 1.536
+++ Zend/zend_compile.c 4 Feb 2004 21:59:15 -
@@ -2456,7 +2456,7 @@ void zend_do_begin_class_declaration(zno
new_class_entry-line_start = zend_get_compiled_lineno(TSRMLS_C);
new_class_entry-ce_flags |= class_token-u.constant.value.lval;
- if (parent_class_name-op_type != IS_UNUSED) {
+ if (parent_class_name parent_class_name-op_type != IS_UNUSED) {
doing_inheritance = 1;
}
@@ -2546,10 +2546,6 @@ void zend_do_implements_interface(znode
{
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
- if (CG(active_class_entry)-ce_flags ZEND_ACC_INTERFACE) {
- zend_error(E_COMPILE_ERROR, Interfaces cannot implement other
classes/interfaces);
- }
-
opline-opcode = ZEND_ADD_INTERFACE;
opline-op1 = CG(implementing_class);
opline-op2 = *interface_znode;
Index: Zend/zend_language_parser.y
===
RCS file: /repository/ZendEngine2/zend_language_parser.y,v
retrieving revision 1.137
diff -u -p -d -r1.137 zend_language_parser.y
--- Zend/zend_language_parser.y 4 Feb 2004 16:30:15 - 1.137
+++ Zend/zend_language_parser.y 4 Feb 2004 21:59:16 -
@@ -274,6 +274,12 @@ unticked_class_declaration_statement:
'{'
class_statement_list
'}' { zend_do_end_class_declaration($1, $2 TSRMLS_CC); }
+ | interface_entry T_STRING
+ { zend_do_begin_class_declaration($1, $2, NULL TSRMLS_CC); }
+ interface_extends_list
+ '{'
+ class_statement_list
+ '}' { zend_do_end_class_declaration($1, $2 TSRMLS_CC); }
;
@@ -281,7 +287,6 @@ class_entry_type:
T_CLASS { $$.u.constant.value.lval = 0; }
| T_ABSTRACT T_CLASS { $$.u.constant.value.lval =
ZEND_ACC_ABSTRACT_CLASS; }
| T_FINAL T_CLASS { $$.u.constant.value.lval = ZEND_ACC_FINAL_CLASS; }
- | T_INTERFACE { $$.u.constant.value.lval =
ZEND_ACC_INTERFACE; }
;
extends_from:
@@ -289,6 +294,15 @@ extends_from:
| T_EXTENDS fully_qualified_class_name{ $$ = $2; }
;
+interface_entry:
+ T_INTERFACE { $$.u.constant.value.lval = ZEND_ACC_INTERFACE; }
+;
+
+interface_extends_list:
+ /* empty */
+ | T_EXTENDS interface_list
+;
+
implements_list:
/* empty */
| T_IMPLEMENTS interface_list
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
iliaa Wed Feb 4 17:49:29 2004 EDT
Modified files:
/php-src/sapi/cli php_cli.c
Log:
Parse command line ini directives passed using -d before -i, to ensure
correct settings output.
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.107r2=1.108ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.107 php-src/sapi/cli/php_cli.c:1.108
--- php-src/sapi/cli/php_cli.c:1.107Tue Jan 13 22:14:17 2004
+++ php-src/sapi/cli/php_cli.c Wed Feb 4 17:49:28 2004
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.107 2004/01/14 03:14:17 wez Exp $ */
+/* $Id: php_cli.c,v 1.108 2004/02/04 22:49:28 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -641,10 +641,21 @@
exit_status=1;
goto out_err;
}
-
+
+ /* here is the place for hard coded defaults which cannot be
overwritten in the ini file */
+ INI_HARDCODED(register_argc_argv, 1);
+ INI_HARDCODED(html_errors, 0);
+ INI_HARDCODED(implicit_flush, 1);
+ INI_HARDCODED(output_buffering, 0);
+ INI_HARDCODED(max_execution_time, 0);
+
while ((c = php_getopt(argc, argv, OPTIONS, optarg, optind, 0)) !=
-1) {
switch (c) {
+ case 'd': /* define ini entries on command line */
+ define_command_line_ini_entry(optarg);
+ break;
+
case 'h': /* help quit */
case '?':
php_output_startup();
@@ -696,12 +707,6 @@
/* Set some CLI defaults */
SG(options) |= SAPI_OPTION_NO_CHDIR;
- /* here is the place for hard coded defaults which cannot be
overwritten in the ini file */
- INI_HARDCODED(register_argc_argv, 1);
- INI_HARDCODED(html_errors, 0);
- INI_HARDCODED(implicit_flush, 1);
- INI_HARDCODED(output_buffering, 0);
- INI_HARDCODED(max_execution_time, 0);
optind = orig_optind;
optarg = orig_optarg;
@@ -717,9 +722,6 @@
case 'C': /* don't chdir to the script directory */
/* This is default so NOP */
break;
- case 'd': /* define ini entries on command line */
- define_command_line_ini_entry(optarg);
- break;
case 'e': /* enable extended info output */
CG(extended_info) = 1;
--
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) /sapi/cli php_cli.c
iliaa Wed Feb 4 17:49:56 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/cli php_cli.c
Log:
MFH: Parse command line ini directives passed using -d before -i, to ensure
correct settings output.
http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.51.2.31r2=1.51.2.32ty=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.51.2.31 php-src/sapi/cli/php_cli.c:1.51.2.32
--- php-src/sapi/cli/php_cli.c:1.51.2.31Tue Jan 13 04:13:44 2004
+++ php-src/sapi/cli/php_cli.c Wed Feb 4 17:49:55 2004
@@ -596,10 +596,21 @@
exit_status=1;
goto out_err;
}
-
+
+ /* here is the place for hard coded defaults which cannot be
overwritten in the ini file */
+ INI_HARDCODED(register_argc_argv, 1);
+ INI_HARDCODED(html_errors, 0);
+ INI_HARDCODED(implicit_flush, 1);
+ INI_HARDCODED(output_buffering, 0);
+ INI_HARDCODED(max_execution_time, 0);
+
while ((c = php_getopt(argc, argv, OPTIONS, optarg, optind, 0)) !=
-1) {
switch (c) {
+ case 'd': /* define ini entries on command line */
+ define_command_line_ini_entry(optarg);
+ break;
+
case 'h': /* help quit */
case '?':
php_output_startup();
@@ -651,12 +662,6 @@
/* Set some CLI defaults */
SG(options) |= SAPI_OPTION_NO_CHDIR;
- /* here is the place for hard coded defaults which cannot be
overwritten in the ini file */
- INI_HARDCODED(register_argc_argv, 1);
- INI_HARDCODED(html_errors, 0);
- INI_HARDCODED(implicit_flush, 1);
- INI_HARDCODED(output_buffering, 0);
- INI_HARDCODED(max_execution_time, 0);
optind = orig_optind;
optarg = orig_optarg;
@@ -671,9 +676,6 @@
case 'C': /* don't chdir to the script directory */
/* This is default so NOP */
break;
- case 'd': /* define ini entries on command line */
- define_command_line_ini_entry(optarg);
- break;
case 'e': /* enable extended info output */
CG(extended_info) = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
Does this fix have possibly anything to do with bug #26863 ??
And how about doing a nice little MFH?
--Jani
On Wed, 4 Feb 2004, Wez Furlong wrote:
wezWed Feb 4 17:46:45 2004 EDT
Modified files:
/php-src/main/streams streams.c transports.c xp_socket.c
Log:
Fix a bug in the persistent socket liveness checks and feof(); they were
using the default socket timeout of 60 seconds before returning the socket
to the calling script. The reason they were using that value is that the
same code is used for feof(), so the fix is allowing the caller to
indicate the timeout value for liveness checks.
A possible remaining issue now is that 0 second timeout[1] for pfsockopen
is possibly too short; it's impossible to specify a sane value for all
possible uses, so maybe we need a stream context or an .ini option to
control this, or maybe use the timeout value that was passed to
pfsockopen().
# [1] by timeout, I mean the time that PHP will wait for data on a
# persistent socket before deciding if a new connection should be made;
# NOT the timeout while waiting for a new connection to be established.
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.48r2=1.49ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.48 php-src/main/streams/streams.c:1.49
--- php-src/main/streams/streams.c:1.48Wed Jan 28 17:21:54 2004
+++ php-src/main/streams/streams.c Wed Feb 4 17:46:44 2004
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.48 2004/01/28 22:21:54 pollita Exp $ */
+/* $Id: streams.c,v 1.49 2004/02/04 22:46:44 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -602,9 +602,10 @@
return 0;
}
+ /* use the configured timeout when checking eof */
if (!stream-eof PHP_STREAM_OPTION_RETURN_ERR ==
php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS,
- 0, NULL)) {
+ -1, NULL)) {
stream-eof = 1;
}
http://cvs.php.net/diff.php/php-src/main/streams/transports.c?r1=1.11r2=1.12ty=u
Index: php-src/main/streams/transports.c
diff -u php-src/main/streams/transports.c:1.11 php-src/main/streams/transports.c:1.12
--- php-src/main/streams/transports.c:1.11 Tue Jan 27 17:40:44 2004
+++ php-src/main/streams/transports.c Wed Feb 4 17:46:44 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: transports.c,v 1.11 2004/01/27 22:40:44 wez Exp $ */
+/* $Id: transports.c,v 1.12 2004/02/04 22:46:44 wez Exp $ */
#include php.h
#include php_streams_int.h
@@ -74,6 +74,8 @@
if (persistent_id) {
switch(php_stream_from_persistent_id(persistent_id, stream
TSRMLS_CC)) {
case PHP_STREAM_PERSISTENT_SUCCESS:
+ /* use a 0 second timeout when checking if the socket
+ * has already died */
if (PHP_STREAM_OPTION_RETURN_OK ==
php_stream_set_option(stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL)) {
return stream;
}
http://cvs.php.net/diff.php/php-src/main/streams/xp_socket.c?r1=1.21r2=1.22ty=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.21 php-src/main/streams/xp_socket.c:1.22
--- php-src/main/streams/xp_socket.c:1.21 Thu Jan 8 03:17:59 2004
+++ php-src/main/streams/xp_socket.c Wed Feb 4 17:46:44 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_socket.c,v 1.21 2004/01/08 08:17:59 andi Exp $ */
+/* $Id: xp_socket.c,v 1.22 2004/02/04 22:46:44 wez Exp $ */
#include php.h
#include ext/standard/file.h
@@ -230,10 +230,14 @@
char buf;
int alive = 1;
- if (sock-timeout.tv_sec == -1) {
- tv.tv_sec = FG(default_socket_timeout);
+ if (value == -1) {
+ if (sock-timeout.tv_sec == -1) {
+ tv.tv_sec = FG(default_socket_timeout);
+ } else {
+ tv = sock-timeout;
+ }
} else {
- tv = sock-timeout;
+ tv.tv_sec = value;
}
if (sock-socket == -1) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
Possibly :) I found the code hanging around in my tree after being there for a week or more; I can't remember what I was working towards when I wrote it, and I'm a little too busy to check into it right now. Try this with php4.3: php -r '$fp = pfsockopen(localhost,80); $fp = pfsockopen(localhost,80);' the patch needs MFH'ing if that takes ~60 seconds to complete with no error message; I'll merge it if it needs doing (it won't be simple since the guts have changed from 4.3 to 5). --Wez. - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Thursday, February 05, 2004 12:53 AM Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c Does this fix have possibly anything to do with bug #26863 ?? And how about doing a nice little MFH? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
I'm propably missing the point..but that test completes without any errors in ~30 secs with latest builds of both PHP_4_3 and HEAD. (HEAD without your patch does exactly same..) (propably irrelevant, but with 4.2.3 it completes in less than a second, also without any errors) --Jani On Thu, 5 Feb 2004, Wez Furlong wrote: Possibly :) I found the code hanging around in my tree after being there for a week or more; I can't remember what I was working towards when I wrote it, and I'm a little too busy to check into it right now. Try this with php4.3: php -r '$fp = pfsockopen(localhost,80); $fp = pfsockopen(localhost,80);' the patch needs MFH'ing if that takes ~60 seconds to complete with no error message; I'll merge it if it needs doing (it won't be simple since the guts have changed from 4.3 to 5). --Wez. - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Thursday, February 05, 2004 12:53 AM Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c Does this fix have possibly anything to do with bug #26863 ?? And how about doing a nice little MFH? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy/tests 007.html 007.phpt 012.phpt 013.phpt
johnWed Feb 4 20:39:00 2004 EDT
Added files:
/php-src/ext/tidy/tests 007.html
Modified files:
/php-src/ext/tidy/tests 007.phpt 012.phpt 013.phpt
Log:
Updating tests that got left behind when we changed to studlyCaps
and fixed another test
http://cvs.php.net/diff.php/php-src/ext/tidy/tests/007.phpt?r1=1.6r2=1.7ty=u
Index: php-src/ext/tidy/tests/007.phpt
diff -u php-src/ext/tidy/tests/007.phpt:1.6 php-src/ext/tidy/tests/007.phpt:1.7
--- php-src/ext/tidy/tests/007.phpt:1.6 Tue Jan 13 21:43:33 2004
+++ php-src/ext/tidy/tests/007.phpt Wed Feb 4 20:38:59 2004
@@ -6,7 +6,7 @@
tidy.default_config=
--FILE--
?php
- $a = new tidy();
+ $a = new tidy(ext/tidy/tests/007.html);
echo Current Value of 'tidy-mark': ;
var_dump($a-getopt(tidy-mark));
echo Current Value of 'error-file': ;
http://cvs.php.net/diff.php/php-src/ext/tidy/tests/012.phpt?r1=1.2r2=1.3ty=u
Index: php-src/ext/tidy/tests/012.phpt
diff -u php-src/ext/tidy/tests/012.phpt:1.2 php-src/ext/tidy/tests/012.phpt:1.3
--- php-src/ext/tidy/tests/012.phpt:1.2 Tue Jan 13 21:43:33 2004
+++ php-src/ext/tidy/tests/012.phpt Wed Feb 4 20:38:59 2004
@@ -10,14 +10,14 @@
function dump_nodes(tidy_node $node) {
-var_dump($node-has_children());
-if($node-has_children()) {
+var_dump($node-hasChildren());
+if($node-hasChildren()) {
foreach($node-child as $c) {
var_dump($c);
-if($c-has_children()) {
+if($c-hasChildren()) {
dump_nodes($c);
http://cvs.php.net/diff.php/php-src/ext/tidy/tests/013.phpt?r1=1.2r2=1.3ty=u
Index: php-src/ext/tidy/tests/013.phpt
diff -u php-src/ext/tidy/tests/013.phpt:1.2 php-src/ext/tidy/tests/013.phpt:1.3
--- php-src/ext/tidy/tests/013.phpt:1.2 Tue Jan 13 21:43:33 2004
+++ php-src/ext/tidy/tests/013.phpt Wed Feb 4 20:38:59 2004
@@ -8,9 +8,9 @@
--FILE--
?php
$tidy = new tidy(ext/tidy/tests/013.html, array(show-body-only=true));
-$tidy-clean_repair();
+$tidy-cleanRepair();
echo $tidy;
?
--EXPECT--
-btesting/b
\ No newline at end of file
+btesting/b
http://cvs.php.net/co.php/php-src/ext/tidy/tests/007.html?r=1.1p=1
Index: php-src/ext/tidy/tests/007.html
+++ php-src/ext/tidy/tests/007.html
Btesting/I
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
It should be more like 4.2.x and return in a very short time; it returns immediately for me using php5 + my patch. Is your default_socket_timeout set to 30 seconds? --Wez. - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: Wez Furlong [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Thursday, February 05, 2004 1:31 AM Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c I'm propably missing the point..but that test completes without any errors in ~30 secs with latest builds of both PHP_4_3 and HEAD. (HEAD without your patch does exactly same..) (propably irrelevant, but with 4.2.3 it completes in less than a second, also without any errors) --Jani On Thu, 5 Feb 2004, Wez Furlong wrote: Possibly :) I found the code hanging around in my tree after being there for a week or more; I can't remember what I was working towards when I wrote it, and I'm a little too busy to check into it right now. Try this with php4.3: php -r '$fp = pfsockopen(localhost,80); $fp = pfsockopen(localhost,80);' the patch needs MFH'ing if that takes ~60 seconds to complete with no error message; I'll merge it if it needs doing (it won't be simple since the guts have changed from 4.3 to 5). --Wez. - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Thursday, February 05, 2004 12:53 AM Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c Does this fix have possibly anything to do with bug #26863 ?? And how about doing a nice little MFH? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
iliaa Wed Feb 4 21:17:34 2004 EDT
Modified files:
/php-srcNEWS
Log:
Bug fixing news.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1596r2=1.1597ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1596 php-src/NEWS:1.1597
--- php-src/NEWS:1.1596 Wed Feb 4 16:29:28 2004
+++ php-src/NEWSWed Feb 4 21:17:33 2004
@@ -32,6 +32,8 @@
(Derick)
- Fixed problems with longlong values in mysqli. (Georg)
- Fixed class name case preserving of user defined classes. (Marcus)
+- Fixed bug #27145 (Unmangle private/protected property names before printing
+ then inside error messages). (Ilia)
- Fixed bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into
octets). (Moriyoshi)
- Fixed bug #27042 (SPL: SeekableIterator seek() broken). (Marcus)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c
Yes, it's 30secs..and yes, changing that changes how fast the test completes with PHP_4_3, HEAD, and HEAD without the patch. --Jani On Thu, 5 Feb 2004, Wez Furlong wrote: It should be more like 4.2.x and return in a very short time; it returns immediately for me using php5 + my patch. Is your default_socket_timeout set to 30 seconds? --Wez. - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: Wez Furlong [EMAIL PROTECTED]; [EMAIL PROTECTED] Sent: Thursday, February 05, 2004 1:31 AM Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c I'm propably missing the point..but that test completes without any errors in ~30 secs with latest builds of both PHP_4_3 and HEAD. (HEAD without your patch does exactly same..) (propably irrelevant, but with 4.2.3 it completes in less than a second, also without any errors) --Jani On Thu, 5 Feb 2004, Wez Furlong wrote: Possibly :) I found the code hanging around in my tree after being there for a week or more; I can't remember what I was working towards when I wrote it, and I'm a little too busy to check into it right now. Try this with php4.3: php -r '$fp = pfsockopen(localhost,80); $fp = pfsockopen(localhost,80);' the patch needs MFH'ing if that takes ~60 seconds to complete with no error message; I'll merge it if it needs doing (it won't be simple since the guts have changed from 4.3 to 5). --Wez. - Original Message - From: Jani Taskinen [EMAIL PROTECTED] To: Wez Furlong [EMAIL PROTECTED] Cc: [EMAIL PROTECTED] Sent: Thursday, February 05, 2004 12:53 AM Subject: Re: [PHP-CVS] cvs: php-src /main/streams streams.c transports.c xp_socket.c Does this fix have possibly anything to do with bug #26863 ?? And how about doing a nice little MFH? -- https://www.paypal.com/xclick/[EMAIL PROTECTED]no_note=1tax=0currency_code=EUR -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Wed Feb 4 23:06:44 2004 EDT Modified files: /CVSROOTavail Log: pecl karma for Justin Hannus http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.824r2=1.825ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.824 CVSROOT/avail:1.825 --- CVSROOT/avail:1.824 Wed Feb 4 10:33:25 2004 +++ CVSROOT/avail Wed Feb 4 23:06:43 2004 @@ -62,7 +62,7 @@ avail|pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon|peclweb,pecl # General pecl -avail|csilles,t2k269|pecl +avail|csilles,t2k269,jhannus|pecl # the pearbot module is for a bot for irc on the #pear channel on efnet. avail|meebey,imajes|pearbot -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
