[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Mar 5 01:31:02 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2619r2=1.2620diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2619 php-src/ChangeLog:1.2620 --- php-src/ChangeLog:1.2619Sun Mar 4 01:31:00 2007 +++ php-src/ChangeLog Mon Mar 5 01:31:01 2007 @@ -1,3 +1,101 @@ +2007-03-04 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/xmlrpc/libxmlrpc/base64.c + ext/xmlrpc/libxmlrpc/base64.h + ext/xmlrpc/libxmlrpc/xml_to_dandarpc.c + ext/xmlrpc/libxmlrpc/xml_to_soap.c + ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c: + + Fixed bug #40703 (Resolved a possible namespace conflict between libxmlrpc + and MySQL's NDB table handler). + +* ext/standard/tests/array/bug40709.phpt + ext/standard/tests/array/bug40709.phpt: + + file bug40709.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + NEWS + ext/standard/array.c: + + Fixed bug #40709 (array_reduce() behaves strange with one item stored + arrays). + +2007-03-04 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_language_parser.y: + - Implement '?:' + [DOC] expr1 ?: expr1 is a shortcut for: expr1 ? expr1 : expr2 as +exists in gcc and discussed some time back. Note that this is not +an implementation ifsetor($var, default). While ifsetor would not +generate any message for non existing variables or array indices +the ternary shortcut does. Also the ternary shortcut does a boolean +evaluation rather then checking for isset(). That way ther ternary +shortcut can work on any expression while ifsetor can only work on +variables. Also to be silent one has do do: @$expr1 ?: $expr2. + +* (PHP_5_2) + ext/spl/spl_directory.c + ext/spl/spl_iterators.c: + - Fix copy'n'paste issues + +* (PHP_5_2) + ext/spl/spl_directory.c + ext/spl/spl_iterators.c + ext/spl/internal/parentiterator.inc: + - MFH simplify, synch docu/implementation + +* ext/spl/spl_directory.c: + - Missed one is-dot check + +* ext/spl/spl_iterators.c + ext/spl/internal/parentiterator.inc: + - Match docu with implementation + - RecursiveFilterIterator::accept() needs to be abstract + +* ext/spl/spl_directory.c + ext/spl/spl_iterators.c: + - Simplify + +2007-03-04 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_5_2) + ext/wddx/wddx.c: + ik, make it memcpy + +* (PHP_5_2) + ext/wddx/wddx.c: + fix wrong code + +2007-03-04 Marcus Boerger [EMAIL PROTECTED] + +* ext/spl/spl_directory.c + ext/spl/spl_directory.h: + - And finally use prefix style names for consistency sake + +2007-03-04 Edin Kadribasic [EMAIL PROTECTED] + +* win32/build/Makefile: + MFB: Check that manifest file exists before trying to embed it + +* (PHP_5_2) + win32/build/Makefile: + Check that manifest file exists before trying to embed it + +2007-03-04 Marcus Boerger [EMAIL PROTECTED] + +* ext/spl/spl_directory.c + ext/spl/spl_directory.h: + - Reverting glob on child logic makes globbing work better with the example +code + +* ext/spl/spl_directory.c + ext/spl/spl_directory.h: + - Fix a minor issue with glob support - forgot to set length of string + - Add ability to not use glob on subdirs + 2007-03-03 Marcus Boerger [EMAIL PROTECTED] * main/streams/glob_wrapper.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Mar 5 01:31:05 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1076r2=1.1077diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1076 ZendEngine2/ChangeLog:1.1077 --- ZendEngine2/ChangeLog:1.1076Sun Mar 4 01:31:04 2007 +++ ZendEngine2/ChangeLog Mon Mar 5 01:31:05 2007 @@ -1,3 +1,16 @@ +2007-03-04 Marcus Boerger [EMAIL PROTECTED] + +* zend_language_parser.y: + - Implement '?:' + [DOC] expr1 ?: expr1 is a shortcut for: expr1 ? expr1 : expr2 as +exists in gcc and discussed some time back. Note that this is not +an implementation ifsetor($var, default). While ifsetor would not +generate any message for non existing variables or array indices +the ternary shortcut does. Also the ternary shortcut does a boolean +evaluation rather then checking for isset(). That way ther ternary +shortcut can work on any expression while ifsetor can only work on +variables. Also to be silent one has do do: @$expr1 ?: $expr2. + 2007-03-03 Marcus Boerger [EMAIL PROTECTED] * zend_execute_API.c @@ -16988,7 +17001,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1076 2007/03/04 01:31:04 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1077 2007/03/05 01:31:05 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -18712,7 +18725,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1076 2007/03/04 01:31:04 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1077 2007/03/05 01:31:05 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c spl_iterators.c
helly Sun Mar 4 12:02:16 2007 UTC
Modified files:
/php-src/ext/splspl_directory.c spl_iterators.c
Log:
- Simplify
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.130r2=1.131diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.130
php-src/ext/spl/spl_directory.c:1.131
--- php-src/ext/spl/spl_directory.c:1.130 Sun Mar 4 00:42:30 2007
+++ php-src/ext/spl/spl_directory.c Sun Mar 4 12:02:16 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.130 2007/03/04 00:42:30 helly Exp $ */
+/* $Id: spl_directory.c,v 1.131 2007/03/04 12:02:16 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -508,6 +508,18 @@
return NULL;
} /* }}} */
+static inline int spl_filesystem_is_dot(const char * d_name) /* {{{ */
+{
+ return !strcmp(d_name, .) || !strcmp(d_name, ..);
+}
+/* }}} */
+
+static int spl_filesystem_is_invalid_or_dot(const char * d_name) /* {{{ */
+{
+ return d_name[0] == '\0' || spl_filesystem_is_dot(d_name);
+}
+/* }}} */
+
static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp
TSRMLS_DC) /* */
{
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(obj TSRMLS_CC);
@@ -1149,7 +1161,7 @@
}
do {
spl_filesystem_dir_read(intern TSRMLS_CC);
- } while (!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
}
/* }}} */
@@ -1162,7 +1174,7 @@
intern-u.dir.index++;
do {
spl_filesystem_dir_read(intern TSRMLS_CC);
- } while (!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
if (intern-file_name.v) {
efree(intern-file_name.v);
intern-file_name = NULL_ZSTR;
@@ -1177,7 +1189,7 @@
zend_bool allow_links = 0;
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..)) {
+ if (spl_filesystem_is_invalid_or_dot(intern-u.dir.entry.d_name)) {
RETURN_FALSE;
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b,
allow_links) == FAILURE) {
@@ -1443,7 +1455,7 @@
object-u.dir.index++;
do {
spl_filesystem_dir_read(object TSRMLS_CC);
- } while (!strcmp(object-u.dir.entry.d_name, .) ||
!strcmp(object-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(object-u.dir.entry.d_name));
if (object-file_name.v) {
efree(object-file_name.v);
object-file_name = NULL_ZSTR;
@@ -1467,7 +1479,7 @@
}
do {
spl_filesystem_dir_read(object TSRMLS_CC);
- } while (!strcmp(object-u.dir.entry.d_name, .) ||
!strcmp(object-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(object-u.dir.entry.d_name));
if (iterator-current) {
zval_ptr_dtor(iterator-current);
iterator-current = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.158r2=1.159diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.158
php-src/ext/spl/spl_iterators.c:1.159
--- php-src/ext/spl/spl_iterators.c:1.158 Thu Feb 8 20:13:49 2007
+++ php-src/ext/spl/spl_iterators.c Sun Mar 4 12:02:16 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.158 2007/02/08 20:13:49 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.159 2007/03/04 12:02:16 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1349,41 +1349,6 @@
spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_ParentIterator, spl_ce_RecursiveIterator, DIT_ParentIterator);
} /* }}} */
-/* {{{ proto bool ParentIterator::hasChildren() U
- Check whether the inner iterator's current element has children */
-SPL_METHOD(ParentIterator, hasChildren)
-{
- spl_dual_it_object *intern;
- zval *retval;
-
- intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
-
- zend_call_method_with_0_params(intern-inner.zobject,
intern-inner.ce, NULL, haschildren, retval);
- if (retval) {
- RETURN_ZVAL(retval, 0, 1);
- } else {
- RETURN_FALSE;
- }
-} /* }}} */
-
-/* {{{ proto ParentIterator ParentIterator::getChildren() U
- Return the inner iterator's children contained in a ParentIterator */
-SPL_METHOD(ParentIterator, getChildren)
-{
- spl_dual_it_object *intern;
-
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c /ext/spl/internal parentiterator.inc
helly Sun Mar 4 12:06:55 2007 UTC
Modified files:
/php-src/ext/splspl_iterators.c
/php-src/ext/spl/internal parentiterator.inc
Log:
- Match docu with implementation
- RecursiveFilterIterator::accept() needs to be abstract
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.159r2=1.160diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.159
php-src/ext/spl/spl_iterators.c:1.160
--- php-src/ext/spl/spl_iterators.c:1.159 Sun Mar 4 12:02:16 2007
+++ php-src/ext/spl/spl_iterators.c Sun Mar 4 12:06:55 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.159 2007/03/04 12:02:16 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.160 2007/03/04 12:06:55 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1657,7 +1657,6 @@
static zend_function_entry spl_funcs_RecursiveFilterIterator[] = {
SPL_ME(RecursiveFilterIterator, __construct,
arginfo_parent_it___construct, ZEND_ACC_PUBLIC)
- SPL_MA(ParentIterator, accept, RecursiveFilterIterator, hasChildren,
NULL, ZEND_ACC_PUBLIC)
SPL_ME(RecursiveFilterIterator, hasChildren, NULL,
ZEND_ACC_PUBLIC)
SPL_ME(RecursiveFilterIterator, getChildren, NULL,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/internal/parentiterator.inc?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/spl/internal/parentiterator.inc
diff -u php-src/ext/spl/internal/parentiterator.inc:1.8
php-src/ext/spl/internal/parentiterator.inc:1.9
--- php-src/ext/spl/internal/parentiterator.inc:1.8 Tue Feb 21 23:21:53 2006
+++ php-src/ext/spl/internal/parentiterator.inc Sun Mar 4 12:06:55 2007
@@ -21,26 +21,12 @@
*/
class ParentIterator extends RecursiveFilterIterator
{
- /** @param $it the RecursiveIterator to filter
-*/
- function __construct(RecursiveIterator $it)
- {
- parent::__construct($it);
- }
-
/** @return whetehr the current element has children
*/
function accept()
{
return $this-it-hasChildren();
}
-
- /** @return the ParentIterator for the current elements children
-*/
- function getChildren()
- {
- return new ParentIterator($this-it-getChildren());
- }
}
?
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c
helly Sun Mar 4 12:13:20 2007 UTC
Modified files:
/php-src/ext/splspl_directory.c
Log:
- Missed one is-dot check
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.131r2=1.132diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.131
php-src/ext/spl/spl_directory.c:1.132
--- php-src/ext/spl/spl_directory.c:1.131 Sun Mar 4 12:02:16 2007
+++ php-src/ext/spl/spl_directory.c Sun Mar 4 12:13:20 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.131 2007/03/04 12:02:16 helly Exp $ */
+/* $Id: spl_directory.c,v 1.132 2007/03/04 12:13:20 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -839,7 +839,7 @@
{
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- RETURN_BOOL(!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..));
+ RETURN_BOOL(spl_filesystem_is_dot(intern-u.dir.entry.d_name));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_directory.c spl_iterators.c /ext/spl/internal parentiterator.inc
helly Sun Mar 4 12:18:02 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splspl_directory.c spl_iterators.c
/php-src/ext/spl/internal parentiterator.inc
Log:
- MFH simplify, synch docu/implementation
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.17r2=1.45.2.27.2.18diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.17
php-src/ext/spl/spl_directory.c:1.45.2.27.2.18
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.17 Sat Mar 3 15:08:59 2007
+++ php-src/ext/spl/spl_directory.c Sun Mar 4 12:18:02 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.17 2007/03/03 15:08:59 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.18 2007/03/04 12:18:02 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -448,6 +448,18 @@
return NULL;
} /* }}} */
+static inline int spl_filesystem_is_dot(const char * d_name) /* {{{ */
+{
+ return !strcmp(d_name, .) || !strcmp(d_name, ..);
+}
+/* }}} */
+
+static int spl_filesystem_is_invalid_or_dot(const char * d_name) /* {{{ */
+{
+ return d_name[0] == '\0' || spl_filesystem_is_dot(d_name);
+}
+/* }}} */
+
/* {{{ proto void DirectoryIterator::__construct(string path)
Cronstructs a new dir iterator from a path. */
SPL_METHOD(DirectoryIterator, __construct)
@@ -681,7 +693,7 @@
{
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- RETURN_BOOL(!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..));
+ RETURN_BOOL(spl_filesystem_is_dot(intern-u.dir.entry.d_name));
}
/* }}} */
@@ -972,7 +984,7 @@
if (!intern-u.dir.dirp ||
!php_stream_readdir(intern-u.dir.dirp, intern-u.dir.entry)) {
intern-u.dir.entry.d_name[0] = '\0';
}
- } while (!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
}
/* }}} */
@@ -987,7 +999,7 @@
if (!intern-u.dir.dirp ||
!php_stream_readdir(intern-u.dir.dirp, intern-u.dir.entry)) {
intern-u.dir.entry.d_name[0] = '\0';
}
- } while (!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
if (intern-file_name) {
efree(intern-file_name);
intern-file_name = NULL;
@@ -1002,7 +1014,7 @@
zend_bool allow_links = 0;
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- if (!strcmp(intern-u.dir.entry.d_name, .) ||
!strcmp(intern-u.dir.entry.d_name, ..)) {
+ if (spl_filesystem_is_invalid_or_dot(intern-u.dir.entry.d_name)) {
RETURN_BOOL(0);
} else {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b,
allow_links) == FAILURE) {
@@ -1274,7 +1286,7 @@
if (!object-u.dir.dirp ||
!php_stream_readdir(object-u.dir.dirp, object-u.dir.entry)) {
object-u.dir.entry.d_name[0] = '\0';
}
- } while (!strcmp(object-u.dir.entry.d_name, .) ||
!strcmp(object-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
if (object-file_name) {
efree(object-file_name);
object-file_name = NULL;
@@ -1300,7 +1312,7 @@
if (!object-u.dir.dirp ||
!php_stream_readdir(object-u.dir.dirp, object-u.dir.entry)) {
object-u.dir.entry.d_name[0] = '\0';
}
- } while (!strcmp(object-u.dir.entry.d_name, .) ||
!strcmp(object-u.dir.entry.d_name, ..));
+ } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
if (iterator-current) {
zval_ptr_dtor(iterator-current);
iterator-current = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.25r2=1.73.2.30.2.26diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.25
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.26
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.25 Tue Feb 27 03:28:16 2007
+++ php-src/ext/spl/spl_iterators.c Sun Mar 4 12:18:02 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.25 2007/02/27 03:28:16 iliaa Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.26 2007/03/04 12:18:02 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1336,41 +1336,6 @@
spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_ParentIterator,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_directory.c spl_iterators.c
helly Sun Mar 4 14:01:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splspl_directory.c spl_iterators.c
Log:
- Fix copy'n'paste issues
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.18r2=1.45.2.27.2.19diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.18
php-src/ext/spl/spl_directory.c:1.45.2.27.2.19
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.18 Sun Mar 4 12:18:02 2007
+++ php-src/ext/spl/spl_directory.c Sun Mar 4 14:01:06 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.18 2007/03/04 12:18:02 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.19 2007/03/04 14:01:06 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1286,7 +1286,7 @@
if (!object-u.dir.dirp ||
!php_stream_readdir(object-u.dir.dirp, object-u.dir.entry)) {
object-u.dir.entry.d_name[0] = '\0';
}
- } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
+ } while (spl_filesystem_is_dot(object-u.dir.entry.d_name));
if (object-file_name) {
efree(object-file_name);
object-file_name = NULL;
@@ -1312,7 +1312,7 @@
if (!object-u.dir.dirp ||
!php_stream_readdir(object-u.dir.dirp, object-u.dir.entry)) {
object-u.dir.entry.d_name[0] = '\0';
}
- } while (spl_filesystem_is_dot(intern-u.dir.entry.d_name));
+ } while (spl_filesystem_is_dot(object-u.dir.entry.d_name));
if (iterator-current) {
zval_ptr_dtor(iterator-current);
iterator-current = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.26r2=1.73.2.30.2.27diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.26
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.27
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.26 Sun Mar 4 12:18:02 2007
+++ php-src/ext/spl/spl_iterators.c Sun Mar 4 14:01:06 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.26 2007/03/04 12:18:02 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.27 2007/03/04 14:01:06 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1688,9 +1688,9 @@
ZEND_END_ARG_INFO();
static zend_function_entry spl_funcs_RecursiveRegexIterator[] = {
- SPL_ME(RecursiveRegexIterator, __construct,
arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC)
- SPL_ME(ParentIterator, hasChildren, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(RecursiveRegexIterator, getChildren, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(RecursiveRegexIterator, __construct,
arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC)
+ SPL_ME(RecursiveFilterIterator, hasChildren, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(RecursiveRegexIterator, getChildren, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard array.c /ext/standard/tests/array bug40709.phpt
iliaa Sun Mar 4 17:21:16 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/array bug40709.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #40709 (array_reduce() behaves strange with one item stored
arrays).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.570r2=1.2027.2.547.2.571diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.570 php-src/NEWS:1.2027.2.547.2.571
--- php-src/NEWS:1.2027.2.547.2.570 Sat Mar 3 23:10:16 2007
+++ php-src/NEWSSun Mar 4 17:21:15 2007
@@ -14,6 +14,8 @@
- Added --ri switch to CLI which allows to check extension information.
(Marcus)
- Added tidyNode::getParent() method (John, Nuno)
- Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
+- Fixed bug #40709 (array_reduce() behaves strange with one item stored
arrays).
+ (Ilia)
- Fixed bug #40678 (Cross compilation fails). (Tony)
- Fixed bug #40621 (Crash when constructor called inappropriately). (Tony)
- Fixed bug #40609 (Segfaults when using more than one SoapVar in a request).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.23r2=1.308.2.21.2.24diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.23
php-src/ext/standard/array.c:1.308.2.21.2.24
--- php-src/ext/standard/array.c:1.308.2.21.2.23Mon Jan 22 08:17:26 2007
+++ php-src/ext/standard/array.cSun Mar 4 17:21:16 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.23 2007/01/22 08:17:26 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.24 2007/03/04 17:21:16 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -4077,10 +4077,8 @@
while (zend_hash_get_current_data_ex(htbl, (void **)operand, pos) ==
SUCCESS) {
if (result) {
zend_fcall_info fci;
-
args[0] = result;
args[1] = operand;
-
fci.size = sizeof(fci);
fci.function_table = EG(function_table);
fci.function_name = *callback;
@@ -4106,7 +4104,7 @@
zend_hash_move_forward_ex(htbl, pos);
}
- RETVAL_ZVAL(result, 0, 1);
+ RETVAL_ZVAL(result, 1, 1);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug40709.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/array/bug40709.phpt
+++ php-src/ext/standard/tests/array/bug40709.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/domxml domxml.dsp
edink Sun Mar 4 18:40:30 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/domxml domxml.dsp Log: Fixed exslt build (#40665) http://cvs.php.net/viewvc.cgi/php-src/ext/domxml/domxml.dsp?r1=1.6.4.3r2=1.6.4.3.4.1diff_format=u Index: php-src/ext/domxml/domxml.dsp diff -u php-src/ext/domxml/domxml.dsp:1.6.4.3 php-src/ext/domxml/domxml.dsp:1.6.4.3.4.1 --- php-src/ext/domxml/domxml.dsp:1.6.4.3 Mon Dec 22 16:51:50 2003 +++ php-src/ext/domxml/domxml.dsp Sun Mar 4 18:40:29 2007 @@ -44,7 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\..\Zend /I ..\..\..\TSRM /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /D HAVE_DOMEXSLT=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 wsock32.lib php4ts.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_domxml.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 wsock32.lib php4ts.lib libxml2_a.lib libxslt_a.lib libexslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_domxml.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == domxml - Win32 Debug_TS @@ -72,7 +72,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MT /W3 /GX /O2 /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I mssql-70 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D COMPILE_DL_DOMXML /D ZTS=1 /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /FR /YX /FD /c +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I ..\.. /I ..\..\Zend /I ..\..\TSRM /I ..\..\main /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D DOMXML_EXPORTS /D COMPILE_DL_DOMXML /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_DOMXML=1 /D HAVE_DOMXSLT=1 /D LIBXML_STATIC=1 /D LIBXSLT_STATIC=1 /D LIBXML_THREAD_ENABLED /D HAVE_DOMEXSLT=1 /FR /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x406 /d NDEBUG @@ -82,7 +82,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts_debug.lib libxml2_a.lib libxslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_domxml.dll /libpath:..\..\Debug_TS /libpath:..\..\..\bindlib_w32\Release /libpath:..\..\..\php_build\lib\libxslt +# ADD LINK32 php4ts_debug.lib libxml2_a.lib libxslt_a.lib libexslt_a.lib iconv.lib resolv.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /debug /machine:I386 /nodefaultlib:msvcrt /out:..\..\Debug_TS/php_domxml.dll
