[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Aug 8 01:30:49 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2415r2=1.2416diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2415 php-src/ChangeLog:1.2416 --- php-src/ChangeLog:1.2415Mon Aug 7 01:30:56 2006 +++ php-src/ChangeLog Tue Aug 8 01:30:48 2006 @@ -1,3 +1,151 @@ +2006-08-07 Marcus Boerger [EMAIL PROTECTED] + +* ext/json/tests/fail001.phpt + ext/json/tests/pass001.1.phpt + ext/json/tests/pass001.phpt + ext/json/tests/pass002.phpt + ext/json/tests/pass003.phpt: + - MFB Test name must not be more than a single line + +* (PHP_5_2) + ext/json/tests/fail001.phpt + ext/json/tests/pass001.1.phpt + ext/json/tests/pass001.phpt + ext/json/tests/pass002.phpt + ext/json/tests/pass003.phpt: + - Test name must not be more than a single line + +* (PHP_5_2) + NEWS + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + tests/classes/ctor_visibility.phpt: + - MFH Fixed Bug #38064 ignored constructor visibility + +* ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + - Fixed Bug #38064 ignored constructor visibility + +* tests/classes/ctor_visibility.phpt + tests/classes/ctor_visibility.phpt: + + - Add new test + +2006-08-07 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/tests/strings/basename.phpt: + fix test in unicode mode + +* ext/json/tests/001.phpt: + add missing UEXPECTF section + +* ext/exif/tests/exif001.phpt + ext/standard/tests/strings/bin2hex.phpt + ext/standard/tests/strings/bug24098.phpt + ext/wddx/tests/001.phpt: + fix test + +* ext/date/tests/date_constants.phpt + ext/date/tests/oo_001.phpt: + fix tests + +* run-tests.php + run-tests.php: + suppress errors from date() if no date.timezone set + don't try to look for libtool if $sys_libtool_path is empty + +* ext/date/tests/date_create-3.phpt: + fix test - class Date has been renamed + the test still fails, though... + +2006-08-07 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/zip/lib/zip.h.orig + ext/zip/lib/zip.h.orig: + - should not have been commited + +2006-08-07 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ext/dom/node.c: + fix types of the variables + +* ext/dom/node.c: + fix types, add missing parentheses + +2006-08-07 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/pdo/pdo_dbh.c: + MFB: Fixed memory leak with persistent connections + +* (PHP_5_2) + ext/pdo/pdo_dbh.c: + Fixed memory leak with persistent connections + +* ext/filter/filter.c + ext/filter/filter.c: + Removed extra byte + +2006-08-07 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/tests/bug38287.phpt + ZendEngine2/tests/bug38287.phpt: + + file bug38287.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + NEWS + ZendEngine2/zend.h + ZendEngine2/zend.h + ZendEngine2/zend_objects_API.c + ZendEngine2/zend_objects_API.c + ZendEngine2/zend_objects_API.h + ZendEngine2/zend_objects_API.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/tests/bug38287.phpt: + Fixed bug #38287 (static variables mess up global vars) + +2006-08-07 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + ext/simplexml/simplexml.c: + should be RETURN_ not RETVAL_ + +* ext/simplexml/php_simplexml.h + ext/simplexml/simplexml.c: + MFB: asXML() needs to return bool when serializing doc and filename is + passed in + do not copy the content of the outputbuffer twice in asXML() + fix compiler warnings + +* (PHP_5_2) + ext/simplexml/php_simplexml.h + ext/simplexml/simplexml.c: + asXML() needs to return bool when serializing doc and filename is passed in + do not copy the content of the outputbuffer twice in asXML() + fix compiler warnings + +2006-08-07 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ext/spl/php_spl.c: + nuke unused variable + +2006-08-07 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + README.UPDATE_5_2: + - Update + +* (PHP_5_2) + NEWS + ext/dba/config.m4 + ext/dba/config.m4: + - Fix bug #38290 + 2006-08-06 Antony Dovgal [EMAIL PROTECTED] * configure.in
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Aug 8 01:30:51 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.960r2=1.961diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.960 ZendEngine2/ChangeLog:1.961 --- ZendEngine2/ChangeLog:1.960 Sat Aug 5 01:31:02 2006 +++ ZendEngine2/ChangeLog Tue Aug 8 01:30:51 2006 @@ -1,3 +1,34 @@ +2006-08-07 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + zend_vm_def.h + zend_vm_execute.h: + - MFH Fixed Bug #38064 ignored constructor visibility + +* zend_vm_def.h + zend_vm_execute.h: + - Fixed Bug #38064 ignored constructor visibility + +2006-08-07 Dmitry Stogov [EMAIL PROTECTED] + +* zend.h + zend.h + zend_objects_API.c + zend_objects_API.c + zend_objects_API.h + zend_objects_API.h + zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h + tests/bug38287.phpt: + Fixed bug #38287 (static variables mess up global vars) + +* tests/bug38287.phpt + tests/bug38287.phpt: + + file bug38287.phpt was initially added on branch PHP_5_2. + 2006-08-04 Andrei Zmievski [EMAIL PROTECTED] * zend_API.c @@ -14839,7 +14870,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.960 2006/08/05 01:31:02 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.961 2006/08/08 01:30:51 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -16563,7 +16594,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.960 2006/08/05 01:31:02 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.961 2006/08/08 01:30:51 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/dba config.m4
helly Mon Aug 7 07:54:58 2006 UTC Modified files: /php-src/ext/dbaconfig.m4 Log: - Fix bug #38290 http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.71r2=1.72diff_format=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.71 php-src/ext/dba/config.m4:1.72 --- php-src/ext/dba/config.m4:1.71 Mon Aug 22 19:59:19 2005 +++ php-src/ext/dba/config.m4 Mon Aug 7 07:54:58 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.71 2005/08/22 19:59:19 iliaa Exp $ +dnl $Id: config.m4,v 1.72 2006/08/07 07:54:58 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -493,7 +493,7 @@ PHP_DBA_STD_ATTACH fi ],[ - if test $PHP_DBA != no -o $HAVE_DBA = 1; then + if test $PHP_DBA != no test $HAVE_DBA = 1; then PHP_DBA_BUILTIN_CDB fi ]) @@ -511,7 +511,7 @@ PHP_DBA_BUILTIN_INI fi ],[ - if test $PHP_DBA != no -o $HAVE_DBA = 1; then + if test $PHP_DBA != no test $HAVE_DBA = 1; then PHP_DBA_BUILTIN_INI fi ]) @@ -532,7 +532,7 @@ PHP_DBA_BUILTIN_FLATFILE fi ],[ - if test $PHP_DBA != no -o $HAVE_DBA = 1; then + if test $PHP_DBA != no test $HAVE_DBA = 1; then PHP_DBA_BUILTIN_FLATFILE fi ]) -- 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/dba config.m4
helly Mon Aug 7 07:57:12 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/dbaconfig.m4 /php-srcNEWS Log: - Fix bug #38290 http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.70.2.2r2=1.70.2.2.2.1diff_format=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.70.2.2 php-src/ext/dba/config.m4:1.70.2.2.2.1 --- php-src/ext/dba/config.m4:1.70.2.2 Tue Nov 29 18:25:58 2005 +++ php-src/ext/dba/config.m4 Mon Aug 7 07:57:12 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.70.2.2 2005/11/29 18:25:58 tony2001 Exp $ +dnl $Id: config.m4,v 1.70.2.2.2.1 2006/08/07 07:57:12 helly Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -493,7 +493,7 @@ PHP_DBA_STD_ATTACH fi ],[ - if test $PHP_DBA != no || test $HAVE_DBA = 1; then + if test $PHP_DBA != no test $HAVE_DBA = 1; then PHP_DBA_BUILTIN_CDB fi ]) @@ -511,7 +511,7 @@ PHP_DBA_BUILTIN_INI fi ],[ - if test $PHP_DBA != no || test $HAVE_DBA = 1; then + if test $PHP_DBA != no test $HAVE_DBA = 1; then PHP_DBA_BUILTIN_INI fi ]) @@ -532,7 +532,7 @@ PHP_DBA_BUILTIN_FLATFILE fi ],[ - if test $PHP_DBA != no || test $HAVE_DBA = 1; then + if test $PHP_DBA != no test $HAVE_DBA = 1; then PHP_DBA_BUILTIN_FLATFILE fi ]) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.185r2=1.2027.2.547.2.186diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.185 php-src/NEWS:1.2027.2.547.2.186 --- php-src/NEWS:1.2027.2.547.2.185 Sun Aug 6 19:38:45 2006 +++ php-src/NEWSMon Aug 7 07:57:12 2006 @@ -37,6 +37,8 @@ execution). (Tony) - Fixed bug #38303 (spl_autoload_register() supress all errors silently). (Ilia) +- Fixed bug #38290 (configure script ignores --without-cdb,inifile,flatfile). + (Marcus) - Fixed bug #38289 (segfault in session_decode() when _SESSION is NULL). (Tony) - Fixed bug #38278 (session_cache_expire()'s value does not match phpinfo's -- 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) / README.UPDATE_5_2
helly Mon Aug 7 08:34:41 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcREADME.UPDATE_5_2 Log: - Update http://cvs.php.net/viewvc.cgi/php-src/README.UPDATE_5_2?r1=1.1.2.7r2=1.1.2.8diff_format=u Index: php-src/README.UPDATE_5_2 diff -u php-src/README.UPDATE_5_2:1.1.2.7 php-src/README.UPDATE_5_2:1.1.2.8 --- php-src/README.UPDATE_5_2:1.1.2.7 Mon Jul 24 12:15:28 2006 +++ php-src/README.UPDATE_5_2 Mon Aug 7 08:34:40 2006 @@ -28,10 +28,14 @@ The magic object method __toString() is now called whenever an object is used as a string. The function must not throw an exception or the script will be - terminated. The PHP 5.0/%51 fallback to return a string containing the object + terminated. The PHP 5.0/5.1 fallback to return a string containing the object idetifier has been dropped. Note that the object identifier is never unique. That measn that if you have used this feature your application has been flawed. Nonetheless it will now be a catchable fatal error (see above). + + Even with __toString objects cannot be used as keys to arrays. We might add + built-in hash support for this. But for 5.2 you would need to either provide + your own hashing or use new function spl_object_hash() - Added RFC2397 (data: stream) support. (Marcus) @@ -49,3 +53,8 @@ PHP-5.2 it is now possible to allow standard file operations while dissalowing inclusion of remote files, which will also be the default configuration. + +- Dropped abstract static class functions. (Marcus) + + Due to an oversight PHP 5.0, 5.1 allowed abstract static functions. In PHP + 5.2 only interfaces can have abstract static functions. -- 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 php_spl.c
tony2001Mon Aug 7 09:49:53 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splphp_spl.c
Log:
nuke unused variable
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.5r2=1.52.2.28.2.6diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.5
php-src/ext/spl/php_spl.c:1.52.2.28.2.6
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.5 Thu Aug 3 14:49:11 2006
+++ php-src/ext/spl/php_spl.c Mon Aug 7 09:49:53 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.28.2.5 2006/08/03 14:49:11 iliaa Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.6 2006/08/07 09:49:53 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -275,7 +275,6 @@
zend_op **original_opline_ptr = EG(opline_ptr);
zend_op_array *original_active_op_array = EG(active_op_array);
zend_function_state *original_function_state_ptr =
EG(function_state_ptr);
- zval err_mode;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s,
class_name, class_name_len, file_exts, file_exts_len) == FAILURE) {
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c
rrichards Mon Aug 7 10:15:12 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
Log:
should be RETURN_ not RETVAL_
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.12r2=1.151.2.22.2.13diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.12
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.13
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.12 Mon Aug 7 10:09:52 2006
+++ php-src/ext/simplexml/simplexml.c Mon Aug 7 10:15:12 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.12 2006/08/07 10:09:52 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.13 2006/08/07 10:15:12 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1200,9 +1200,9 @@
int bytes;
bytes = xmlSaveFile(filename, (xmlDocPtr)
sxe-document-ptr);
if (bytes == -1) {
- RETVAL_FALSE;
+ RETURN_FALSE;
} else {
- RETVAL_TRUE;
+ RETURN_TRUE;
}
} else {
outbuf =
xmlOutputBufferCreateFilename(filename, NULL, 0);
@@ -2316,7 +2316,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.12 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.13 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml php_simplexml.h simplexml.c
rrichards Mon Aug 7 10:09:52 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c php_simplexml.h
Log:
asXML() needs to return bool when serializing doc and filename is passed in
do not copy the content of the outputbuffer twice in asXML()
fix compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.11r2=1.151.2.22.2.12diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.11
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.12
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.11 Sun Aug 6 19:38:45 2006
+++ php-src/ext/simplexml/simplexml.c Mon Aug 7 10:09:52 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.11 2006/08/06 19:38:45 chregu Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.12 2006/08/07 10:09:52 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -59,7 +59,7 @@
/* {{{ _node_as_zval()
*/
-static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value,
SXE_ITER itertype, char *name, char *nsprefix, int isprefix TSRMLS_DC)
+static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value,
SXE_ITER itertype, char *name, xmlChar *nsprefix, int isprefix TSRMLS_DC)
{
php_sxe_object *subnode;
@@ -68,10 +68,10 @@
subnode-document-refcount++;
subnode-iter.type = itertype;
if (name) {
- subnode-iter.name = xmlStrdup(name);
+ subnode-iter.name = xmlStrdup((xmlChar *)name);
}
if (nsprefix *nsprefix) {
- subnode-iter.nsprefix = xmlStrdup(nsprefix);
+ subnode-iter.nsprefix = xmlStrdup((xmlChar *)nsprefix);
subnode-iter.isprefix = isprefix;
}
@@ -162,7 +162,7 @@
}
/* }}} */
-static xmlNodePtr sxe_find_element_by_name(php_sxe_object *sxe, xmlNodePtr
node, char *name TSRMLS_DC) /* {{{ */
+static xmlNodePtr sxe_find_element_by_name(php_sxe_object *sxe, xmlNodePtr
node, xmlChar *name TSRMLS_DC) /* {{{ */
{
while (node) {
SKIP_TEXT(node)
@@ -204,7 +204,7 @@
while (node) {
SKIP_TEXT(node)
if (node-type == XML_ELEMENT_NODE match_ns(sxe, node,
sxe-iter.nsprefix, sxe-iter.isprefix)) {
- if (!xmlStrcmp(node-name, *name)) {
+ if (!xmlStrcmp(node-name, (xmlChar *)*name)) {
if (1||retnode)
{
*type = SXE_ITER_ELEMENT;
@@ -292,7 +292,7 @@
}
} else {
while (attr) {
- if ((!test ||
!xmlStrcmp(attr-name, sxe-iter.name)) !xmlStrcmp(attr-name, name)
match_ns(sxe, (xmlNodePtr) attr, sxe-iter.nsprefix, sxe-iter.isprefix)) {
+ if ((!test ||
!xmlStrcmp(attr-name, sxe-iter.name)) !xmlStrcmp(attr-name, (xmlChar
*)name) match_ns(sxe, (xmlNodePtr) attr, sxe-iter.nsprefix,
sxe-iter.isprefix)) {
_node_as_zval(sxe,
(xmlNodePtr) attr, return_value, SXE_ITER_NONE, NULL, sxe-iter.nsprefix,
sxe-iter.isprefix TSRMLS_CC);
break;
}
@@ -369,7 +369,7 @@
if (!value)
{
- xmlNodeSetContentLen(node, , 0);
+ xmlNodeSetContentLen(node, (xmlChar *), 0);
return;
}
switch (Z_TYPE_P(value)) {
@@ -385,7 +385,7 @@
convert_to_string(value);
/* break missing intentionally */
case IS_STRING:
- xmlNodeSetContentLen(node, Z_STRVAL_P(value),
Z_STRLEN_P(value));
+ xmlNodeSetContentLen(node, (xmlChar
*)Z_STRVAL_P(value), Z_STRLEN_P(value));
if (value == value_copy) {
zval_dtor(value);
}
@@ -510,7 +510,7 @@
}
} else {
while (attr) {
- if ((!test || !xmlStrcmp(attr-name,
sxe-iter.name)) !xmlStrcmp(attr-name, name) match_ns(sxe, (xmlNodePtr)
attr, sxe-iter.nsprefix, sxe-iter.isprefix)) {
+ if ((!test || !xmlStrcmp(attr-name,
sxe-iter.name)) !xmlStrcmp(attr-name, (xmlChar *)name) match_ns(sxe,
(xmlNodePtr) attr, sxe-iter.nsprefix, sxe-iter.isprefix)) {
is_attr = 1;
++counter;
[PHP-CVS] cvs: php-src /ext/filter filter.c
iliaa Mon Aug 7 16:54:16 2006 UTC
Modified files:
/php-src/ext/filter filter.c
Log:
Removed extra byte
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.63r2=1.64diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.63 php-src/ext/filter/filter.c:1.64
--- php-src/ext/filter/filter.c:1.63Thu Aug 3 19:35:14 2006
+++ php-src/ext/filter/filter.c Mon Aug 7 16:54:16 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.63 2006/08/03 19:35:14 tony2001 Exp $ */
+/* $Id: filter.c,v 1.64 2006/08/07 16:54:16 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering,
enabled );
- php_info_print_table_row( 2, Revision, $Revision: 1.63 $);
+ php_info_print_table_row( 2, Revision, $Revision: 1.64 $);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -362,7 +362,7 @@
/* FIXME: Should not use php_register_variable_ex as that also
registers
* globals when register_globals is turned on */
Z_STRLEN(raw_var) = val_len;
- Z_STRVAL(raw_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(raw_var) = estrndup(*val, val_len);
Z_TYPE(raw_var) = IS_STRING;
php_register_variable_ex(var, raw_var, array_ptr TSRMLS_CC);
@@ -376,7 +376,7 @@
Z_TYPE(new_var) = IS_STRING;
if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
- Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(new_var) = estrndup(*val, val_len);
php_zval_filter(new_var, IF_G(default_filter),
IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC);
}
#if PHP_VERSION_ID6
@@ -385,7 +385,7 @@
}
#endif
else {
- Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(new_var) = estrndup(*val, val_len);
}
} else { /* empty string */
ZVAL_EMPTY_STRING(new_var);
@@ -404,7 +404,7 @@
}
efree(*val);
if (Z_STRLEN(new_var)) {
- *val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var) +
1);
+ *val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var));
} else {
*val = estrdup();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo pdo_dbh.c
iliaa Mon Aug 7 17:32:13 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdopdo_dbh.c
Log:
Fixed memory leak with persistent connections
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.5r2=1.82.2.31.2.6diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.5
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.6
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.5 Mon Jul 31 20:18:11 2006
+++ php-src/ext/pdo/pdo_dbh.c Mon Aug 7 17:32:13 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.5 2006/07/31 20:18:11 iliaa Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.6 2006/08/07 17:32:13 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -342,7 +342,9 @@
/* switch over to the persistent one */
dbh = pdbh;
zend_object_store_set_object(object, dbh TSRMLS_CC);
- dbh-refcount++;
+ if (!call_factory) {
+ dbh-refcount++;
+ }
}
if (hashkey) {
@@ -1399,6 +1401,10 @@
pefree(dbh-password, dbh-is_persistent);
}
+ if (dbh-persistent_id) {
+ pefree((char *)dbh-persistent_id, dbh-is_persistent);
+ }
+
if (dbh-def_stmt_ctor_args) {
zval_ptr_dtor(dbh-def_stmt_ctor_args);
}
--
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/filter filter.c
iliaa Mon Aug 7 16:53:12 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
Log:
Removed extra byte
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.10r2=1.52.2.11diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.10
php-src/ext/filter/filter.c:1.52.2.11
--- php-src/ext/filter/filter.c:1.52.2.10 Thu Aug 3 19:35:23 2006
+++ php-src/ext/filter/filter.c Mon Aug 7 16:53:12 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.52.2.10 2006/08/03 19:35:23 tony2001 Exp $ */
+/* $Id: filter.c,v 1.52.2.11 2006/08/07 16:53:12 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering,
enabled );
- php_info_print_table_row( 2, Revision, $Revision: 1.52.2.10 $);
+ php_info_print_table_row( 2, Revision, $Revision: 1.52.2.11 $);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -362,7 +362,7 @@
/* FIXME: Should not use php_register_variable_ex as that also
registers
* globals when register_globals is turned on */
Z_STRLEN(raw_var) = val_len;
- Z_STRVAL(raw_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(raw_var) = estrndup(*val, val_len);
Z_TYPE(raw_var) = IS_STRING;
php_register_variable_ex(var, raw_var, array_ptr TSRMLS_CC);
@@ -376,12 +376,12 @@
Z_TYPE(new_var) = IS_STRING;
if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
- Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(new_var) = estrndup(*val, val_len);
php_zval_filter(new_var, IF_G(default_filter),
IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC);
} else if (PG(magic_quotes_gpc)) {
Z_STRVAL(new_var) = php_addslashes(*val,
Z_STRLEN(new_var), Z_STRLEN(new_var), 0 TSRMLS_CC);
} else {
- Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
+ Z_STRVAL(new_var) = estrndup(*val, val_len);
}
} else { /* empty string */
ZVAL_EMPTY_STRING(new_var);
@@ -400,7 +400,7 @@
}
efree(*val);
if (Z_STRLEN(new_var)) {
- *val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var) +
1);
+ *val = estrndup(Z_STRVAL(new_var), Z_STRLEN(new_var));
} else {
*val = estrdup();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_dbh.c
iliaa Mon Aug 7 17:33:21 2006 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c
Log:
MFB: Fixed memory leak with persistent connections
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.133r2=1.134diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.133 php-src/ext/pdo/pdo_dbh.c:1.134
--- php-src/ext/pdo/pdo_dbh.c:1.133 Tue Aug 1 16:37:11 2006
+++ php-src/ext/pdo/pdo_dbh.c Mon Aug 7 17:33:20 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.133 2006/08/01 16:37:11 iliaa Exp $ */
+/* $Id: pdo_dbh.c,v 1.134 2006/08/07 17:33:20 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -342,7 +342,9 @@
/* switch over to the persistent one */
dbh = pdbh;
zend_object_store_set_object(object, dbh TSRMLS_CC);
- dbh-refcount++;
+ if (!call_factory) {
+ dbh-refcount++;
+ }
}
if (hashkey) {
@@ -1378,6 +1380,10 @@
pefree(dbh-password, dbh-is_persistent);
}
+ if (dbh-persistent_id) {
+ pefree((char *)dbh-persistent_id, dbh-is_persistent);
+ }
+
if (dbh-def_stmt_ctor_args) {
zval_ptr_dtor(dbh-def_stmt_ctor_args);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom node.c
tony2001Mon Aug 7 20:22:33 2006 UTC
Modified files:
/php-src/ext/domnode.c
Log:
fix types, add missing parentheses
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.47r2=1.48diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.47 php-src/ext/dom/node.c:1.48
--- php-src/ext/dom/node.c:1.47 Fri Aug 4 18:11:27 2006
+++ php-src/ext/dom/node.c Mon Aug 7 20:22:33 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: node.c,v 1.47 2006/08/04 18:11:27 rrichards Exp $ */
+/* $Id: node.c,v 1.48 2006/08/07 20:22:33 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1684,11 +1684,11 @@
xmlDocPtr docp;
xmlNodeSetPtr nodeset = NULL;
dom_object *intern;
- long exclusive=0, with_comments=0, file_len=0;
+ zend_bool exclusive=0, with_comments=0;
xmlChar **inclusive_ns_prefixes = NULL;
char *file = NULL;
-int ret = -1;
-xmlOutputBufferPtr buf;
+ int ret = -1, file_len = 0;
+ xmlOutputBufferPtr buf;
xmlXPathContextPtr ctxp=NULL;
xmlXPathObjectPtr xpathobjp=NULL;
zend_uchar file_type = IS_STRING;
@@ -1750,7 +1750,7 @@
int xquery_len;
if (zend_hash_find(ht, query, sizeof(query), (void**)tmp)
== SUCCESS
- Z_TYPE_PP(tmp) == IS_STRING || Z_TYPE_PP(tmp) ==
IS_UNICODE) {
+ (Z_TYPE_PP(tmp) == IS_STRING || Z_TYPE_PP(tmp) ==
IS_UNICODE)) {
zxquery = tmp;
/*
if (Z_TYPE_PP(tmp) == IS_STRING) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom node.c
tony2001Mon Aug 7 20:23:35 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/domnode.c Log: fix types of the variables http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.3r2=1.37.2.3.2.4diff_format=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.37.2.3.2.3 php-src/ext/dom/node.c:1.37.2.3.2.4 --- php-src/ext/dom/node.c:1.37.2.3.2.3 Sun Jul 16 16:04:09 2006 +++ php-src/ext/dom/node.c Mon Aug 7 20:23:35 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: node.c,v 1.37.2.3.2.3 2006/07/16 16:04:09 chregu Exp $ */ +/* $Id: node.c,v 1.37.2.3.2.4 2006/08/07 20:23:35 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1682,11 +1682,11 @@ xmlDocPtr docp; xmlNodeSetPtr nodeset = NULL; dom_object *intern; - long exclusive=0, with_comments=0, file_len=0; + zend_bool exclusive=0, with_comments=0; xmlChar **inclusive_ns_prefixes = NULL; char *file = NULL; -int ret = -1; -xmlOutputBufferPtr buf; + int ret = -1, file_len = 0; + xmlOutputBufferPtr buf; xmlXPathContextPtr ctxp=NULL; xmlXPathObjectPtr xpathobjp=NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip/lib zip.h.orig
pajoye Mon Aug 7 20:27:49 2006 UTC Removed files: /php-src/ext/zip/libzip.h.orig Log: - should not have been commited -- 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/zip/lib zip.h.orig
pajoye Mon Aug 7 20:28:03 2006 UTC Removed files: (Branch: PHP_5_2) /php-src/ext/zip/libzip.h.orig Log: - should not have been commited -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests date_create-3.phpt
tony2001Mon Aug 7 21:06:22 2006 UTC Modified files: /php-src/ext/date/tests date_create-3.phpt Log: fix test - class Date has been renamed the test still fails, though... http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_create-3.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/date/tests/date_create-3.phpt diff -u php-src/ext/date/tests/date_create-3.phpt:1.3 php-src/ext/date/tests/date_create-3.phpt:1.4 --- php-src/ext/date/tests/date_create-3.phpt:1.3 Wed Dec 7 14:39:07 2005 +++ php-src/ext/date/tests/date_create-3.phpt Mon Aug 7 21:06:21 2006 @@ -5,8 +5,8 @@ --FILE-- ?php date_default_timezone_set(GMT); -echo date_format(date_create(Dec31 2005 +0100), date::ISO8601), \n; -echo date(date::ISO8601, strtotime(Dec31 2005 +0100)), \n; +echo date_format(date_create(Dec31 2005 +0100), DateTime::ISO8601), \n; +echo date(DateTime::ISO8601, strtotime(Dec31 2005 +0100)), \n; ? --EXPECT-- 2005-12-31T00:00:00+0100 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
tony2001Mon Aug 7 21:27:32 2006 UTC
Modified files:
/php-srcrun-tests.php
Log:
suppress errors from date() if no date.timezone set
don't try to look for libtool if $sys_libtool_path is empty
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.300r2=1.301diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.300 php-src/run-tests.php:1.301
--- php-src/run-tests.php:1.300 Fri Jul 28 12:58:42 2006
+++ php-src/run-tests.php Mon Aug 7 21:27:32 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.300 2006/07/28 12:58:42 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.301 2006/08/07 21:27:32 tony2001 Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -227,7 +227,7 @@
$pass_options = '';
$compression = 0;
-$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
+$output_file = $CUR_DIR . '/php_test_results_' . @date('Ymd_Hi') . '.txt';
if ($compression) {
$output_file = 'compress.zlib://' . $output_file . '.gz';
}
@@ -400,7 +400,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.300 $'.\n;
+ echo '$Revision: 1.301 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -714,7 +714,9 @@
/* Use shtool to find out if there is glibtool present
(MacOSX) */
$sys_libtool_path = shell_exec(dirname(__FILE__) .
'/build/shtool path glibtool libtool');
- $sys_libtool = shell_exec(str_replace(\n, ,
$sys_libtool_path) . ' --version');
+ if ($sys_libtool_path) {
+ $sys_libtool = shell_exec(str_replace(\n, ,
$sys_libtool_path) . ' --version');
+ }
/* Try the most common flags for 'version' */
$flags = array('-v', '-V', '--version');
@@ -1860,10 +1862,10 @@
if ($html_output)
{
- fwrite($html_file, h2Time Start: . date('Y-m-d H:i:s',
$start_time) . /h2\n);
+ fwrite($html_file, h2Time Start: . @date('Y-m-d H:i:s',
$start_time) . /h2\n);
fwrite($html_file, table\n);
}
- echo TIME START . date('Y-m-d H:i:s', $start_time) .
\n=\n;
+ echo TIME START . @date('Y-m-d H:i:s', $start_time) .
\n=\n;
}
function show_end($end_time)
@@ -1873,9 +1875,9 @@
if ($html_output)
{
fwrite($html_file, /table\n);
- fwrite($html_file, h2Time End: . date('Y-m-d H:i:s',
$end_time) . /h2\n);
+ fwrite($html_file, h2Time End: . @date('Y-m-d H:i:s',
$end_time) . /h2\n);
}
- echo
=\nTIME
END . date('Y-m-d H:i:s', $end_time) . \n;
+ echo
=\nTIME
END . @date('Y-m-d H:i:s', $end_time) . \n;
}
function show_summary()
--
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) / run-tests.php
tony2001Mon Aug 7 21:27:41 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
suppress errors from date() if no date.timezone set
don't try to look for libtool if $sys_libtool_path is empty
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.9r2=1.226.2.37.2.10diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.9
php-src/run-tests.php:1.226.2.37.2.10
--- php-src/run-tests.php:1.226.2.37.2.9Fri Jul 28 12:58:59 2006
+++ php-src/run-tests.php Mon Aug 7 21:27:40 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.9 2006/07/28 12:58:59 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.10 2006/08/07 21:27:40 tony2001 Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -239,7 +239,7 @@
$pass_options = '';
$compression = 0;
-$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
+$output_file = $CUR_DIR . '/php_test_results_' . @date('Ymd_Hi') . '.txt';
if ($compression) {
$output_file = 'compress.zlib://' . $output_file . '.gz';
}
@@ -397,7 +397,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.9 $'.\n;
+ echo '$Revision: 1.226.2.37.2.10
$'.\n;
exit(1);
default:
echo Illegal switch '$switch'
specified!\n;
@@ -710,7 +710,9 @@
/* Use shtool to find out if there is glibtool present
(MacOSX) */
$sys_libtool_path = shell_exec(dirname(__FILE__) .
'/build/shtool path glibtool libtool');
- $sys_libtool = shell_exec(str_replace(\n, ,
$sys_libtool_path) . ' --version');
+ if ($sys_libtool_path) {
+ $sys_libtool = shell_exec(str_replace(\n, ,
$sys_libtool_path) . ' --version');
+ }
/* Try the most common flags for 'version' */
$flags = array('-v', '-V', '--version');
@@ -1802,10 +1804,10 @@
if ($html_output)
{
- fwrite($html_file, h2Time Start: . date('Y-m-d H:i:s',
$start_time) . /h2\n);
+ fwrite($html_file, h2Time Start: . @date('Y-m-d H:i:s',
$start_time) . /h2\n);
fwrite($html_file, table\n);
}
- echo TIME START . date('Y-m-d H:i:s', $start_time) .
\n=\n;
+ echo TIME START . @date('Y-m-d H:i:s', $start_time) .
\n=\n;
}
function show_end($end_time)
@@ -1815,9 +1817,9 @@
if ($html_output)
{
fwrite($html_file, /table\n);
- fwrite($html_file, h2Time End: . date('Y-m-d H:i:s',
$end_time) . /h2\n);
+ fwrite($html_file, h2Time End: . @date('Y-m-d H:i:s',
$end_time) . /h2\n);
}
- echo
=\nTIME
END . date('Y-m-d H:i:s', $end_time) . \n;
+ echo
=\nTIME
END . @date('Y-m-d H:i:s', $end_time) . \n;
}
function show_summary()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif/tests exif001.phpt
tony2001Mon Aug 7 21:44:49 2006 UTC Modified files: /php-src/ext/exif/tests exif001.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/exif/tests/exif001.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/exif/tests/exif001.phpt diff -u php-src/ext/exif/tests/exif001.phpt:1.3 php-src/ext/exif/tests/exif001.phpt:1.4 --- php-src/ext/exif/tests/exif001.phpt:1.3 Fri Jun 2 22:22:42 2006 +++ php-src/ext/exif/tests/exif001.phpt Mon Aug 7 21:44:49 2006 @@ -89,7 +89,7 @@ [uFileName]= string(9) test2.jpg [uFileDateTime]= -int(1115993416) +int(%d) [uFileSize]= int(1240) [uFileType]= -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json/tests 001.phpt
tony2001Mon Aug 7 21:51:06 2006 UTC
Modified files:
/php-src/ext/json/tests 001.phpt
Log:
add missing UEXPECTF section
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/001.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/json/tests/001.phpt
diff -u php-src/ext/json/tests/001.phpt:1.2 php-src/ext/json/tests/001.phpt:1.3
--- php-src/ext/json/tests/001.phpt:1.2 Thu Jul 20 08:56:24 2006
+++ php-src/ext/json/tests/001.phpt Mon Aug 7 21:51:06 2006
@@ -69,3 +69,47 @@
NULL
NULL
Done
+--UEXPECTF--
+Warning: json_decode() expects at least 1 parameter, 0 given in %s on line %d
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+object(stdClass)#1 (1) {
+ [utest]=
+ object(stdClass)#2 (1) {
+[ufoo]=
+string(3) bar
+ }
+}
+object(stdClass)#1 (1) {
+ [utest]=
+ object(stdClass)#2 (1) {
+[ufoo]=
+string(0)
+ }
+}
+object(stdClass)#1 (1) {
+ [u_empty_]=
+ object(stdClass)#2 (1) {
+[ufoo]=
+string(0)
+ }
+}
+object(stdClass)#1 (1) {
+ [u_empty_]=
+ object(stdClass)#2 (1) {
+[u_empty_]=
+string(0)
+ }
+}
+NULL
+NULL
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings bin2hex.phpt
tony2001Mon Aug 7 22:13:24 2006 UTC
Modified files:
/php-src/ext/standard/tests/strings bin2hex.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bin2hex.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/strings/bin2hex.phpt
diff -u php-src/ext/standard/tests/strings/bin2hex.phpt:1.2
php-src/ext/standard/tests/strings/bin2hex.phpt:1.3
--- php-src/ext/standard/tests/strings/bin2hex.phpt:1.2 Wed May 19 08:45:23 2004
+++ php-src/ext/standard/tests/strings/bin2hex.phpt Mon Aug 7 22:13:24 2006
@@ -6,8 +6,8 @@
for($i=0; $i256; $i++) {
$s .= chr($i);
}
-echo bin2hex($s).\n;
-echo bin2hex(abc).\n;
+echo bin2hex((binary)$s).\n;
+echo bin2hex(babc).\n;
?
--EXPECT--
000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings bug24098.phpt
tony2001Mon Aug 7 22:14:15 2006 UTC Modified files: /php-src/ext/standard/tests/strings bug24098.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug24098.phpt?r1=1.5r2=1.6diff_format=u Index: php-src/ext/standard/tests/strings/bug24098.phpt diff -u php-src/ext/standard/tests/strings/bug24098.phpt:1.5 php-src/ext/standard/tests/strings/bug24098.phpt:1.6 --- php-src/ext/standard/tests/strings/bug24098.phpt:1.5Sun Jul 16 15:59:02 2006 +++ php-src/ext/standard/tests/strings/bug24098.phptMon Aug 7 22:14:15 2006 @@ -26,5 +26,5 @@ [uextension]= unicode(3) asa [ufilename]= - string(4) dsds + unicode(4) dsds } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings basename.phpt
tony2001Mon Aug 7 22:16:10 2006 UTC Modified files: /php-src/ext/standard/tests/strings basename.phpt Log: fix test in unicode mode http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/basename.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/basename.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/wddx/tests 001.phpt
tony2001Mon Aug 7 22:19:45 2006 UTC
Modified files:
/php-src/ext/wddx/tests 001.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/001.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/wddx/tests/001.phpt
diff -u php-src/ext/wddx/tests/001.phpt:1.7 php-src/ext/wddx/tests/001.phpt:1.8
--- php-src/ext/wddx/tests/001.phpt:1.7 Wed Dec 21 11:43:24 2005
+++ php-src/ext/wddx/tests/001.phpt Mon Aug 7 22:19:45 2006
@@ -57,3 +57,53 @@
}
}
}
+--UEXPECT--
+array(11) {
+ [uaNull]=
+ NULL
+ [uaString]=
+ string(8) a string
+ [uaNumber]=
+ float(-12.456)
+ [uaDateTime]=
+ int(897625932)
+ [uaDateTime2]=
+ int(329632332)
+ [uaDateTime3]=
+ string(22) 2040-06-12T04:32:12+00
+ [uaBoolean]=
+ bool(true)
+ [uanArray]=
+ array(2) {
+[0]=
+int(10)
+[1]=
+string(14) second element
+ }
+ [uaBinary]=
+ string(11) binary data
+ [uanObject]=
+ array(2) {
+[us]=
+string(8) a string
+[un]=
+float(-12.456)
+ }
+ [uaRecordset]=
+ array(2) {
+[uNAME]=
+array(2) {
+ [0]=
+ string(8) John Doe
+ [1]=
+ string(8) Jane Doe
+}
+[uAGE]=
+array(2) {
+ [0]=
+ int(34)
+ [1]=
+ int(31)
+}
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests date_constants.phpt oo_001.phpt
tony2001Mon Aug 7 21:42:27 2006 UTC Modified files: /php-src/ext/date/tests date_constants.phpt oo_001.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_constants.phpt?r1=1.6r2=1.7diff_format=u Index: php-src/ext/date/tests/date_constants.phpt diff -u php-src/ext/date/tests/date_constants.phpt:1.6 php-src/ext/date/tests/date_constants.phpt:1.7 --- php-src/ext/date/tests/date_constants.phpt:1.6 Fri Jul 28 16:32:54 2006 +++ php-src/ext/date/tests/date_constants.phpt Mon Aug 7 21:42:27 2006 @@ -90,7 +90,21 @@ unicode(31) Tue, 30 May 2006 14:32:13 +0200 unicode(31) Sat, 01 Jul 2006 14:27:30 +0200 unicode(31) Tue, 30 May 2006 14:32:13 +0200 +unicode(25) 2006-07-01T14:27:30+02:00 +unicode(25) 2006-05-30T14:32:13+02:00 unicode(31) Sat, 01 Jul 2006 14:27:30 +0200 unicode(31) Tue, 30 May 2006 14:32:13 +0200 unicode(25) 2006-07-01T14:27:30+02:00 unicode(25) 2006-05-30T14:32:13+02:00 + +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/oo_001.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/date/tests/oo_001.phpt diff -u php-src/ext/date/tests/oo_001.phpt:1.3 php-src/ext/date/tests/oo_001.phpt:1.4 --- php-src/ext/date/tests/oo_001.phpt:1.3 Wed Aug 2 23:29:09 2006 +++ php-src/ext/date/tests/oo_001.phpt Mon Aug 7 21:42:27 2006 @@ -51,3 +51,16 @@ bool(false) DateTimeZone::__construct(): Unknown or bad timezone (GottaFindThisOne) DONE +--UEXPECTF-- +unicode(19) %d-%d-%d %d:%d:%d + +Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %soo_001.php on line %d +bool(false) +DateTime::__construct(): Failed to parse time string (1am todax) at position 4 (t): The timezone could not be found in the database +string(3) UTC + +Warning: DateTimeZone::getName(): The DateTimeZone object has not been correctly initialized by its constructor in %soo_001.php on line %d +bool(false) +DateTimeZone::__construct(): Unknown or bad timezone (GottaFindThisOne) +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_visibility.phpt
helly Mon Aug 7 23:12:59 2006 UTC
Added files:
/php-src/tests/classes ctor_visibility.phpt
Log:
- Add new test
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/ctor_visibility.phpt?view=markuprev=1.1
Index: php-src/tests/classes/ctor_visibility.phpt
+++ php-src/tests/classes/ctor_visibility.phpt
--TEST--
ZE2 A private constructor cannot be called
--FILE--
?php
class Test
{
function __construct()
{
echo __METHOD__ . ()\n;
}
}
class Derived extends Test
{
function __construct()
{
echo __METHOD__ . ()\n;
parent::__construct();
}
static function f()
{
new Derived;
}
}
Derived::f();
class TestPriv
{
private function __construct()
{
echo __METHOD__ . ()\n;
}
static function f()
{
new TestPriv;
}
}
TestPriv::f();
class DerivedPriv extends TestPriv
{
function __construct()
{
echo __METHOD__ . ()\n;
parent::__construct();
}
static function f()
{
new DerivedPriv;
}
}
DerivedPriv::f();
?
===DONE===
--EXPECTF--
Derived::__construct()
Test::__construct()
TestPriv::__construct()
DerivedPriv::__construct()
Fatal error: Cannot call private TestPriv::__constrcut() in
%sctor_visibility.php 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(PHP_5_2) /ext/json/tests fail001.phpt pass001.1.phpt pass001.phpt pass002.phpt pass003.phpt
helly Mon Aug 7 23:28:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json/tests fail001.phpt pass001.1.phpt pass001.phpt
pass002.phpt pass003.phpt
Log:
- Test name must not be more than a single line
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/fail001.phpt?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/json/tests/fail001.phpt
diff -u php-src/ext/json/tests/fail001.phpt:1.1
php-src/ext/json/tests/fail001.phpt:1.1.2.1
--- php-src/ext/json/tests/fail001.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/fail001.phpt Mon Aug 7 23:28:05 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern fail1 - fail24
-http://www.crockford.com/JSON/JSON_checker/test/fail*.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/fail*.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass001.1.phpt?r1=1.3r2=1.3.2.1diff_format=u
Index: php-src/ext/json/tests/pass001.1.phpt
diff -u php-src/ext/json/tests/pass001.1.phpt:1.3
php-src/ext/json/tests/pass001.1.phpt:1.3.2.1
--- php-src/ext/json/tests/pass001.1.phpt:1.3 Sat Mar 4 15:31:27 2006
+++ php-src/ext/json/tests/pass001.1.phpt Mon Aug 7 23:28:05 2006
@@ -1,16 +1,16 @@
--TEST--
-JSON Test Pattern pass1.1
-Modified to test unescaped UNICODE as keys and values.
-Modified to test numbers with exponents without a decimal point.
-Modified to test empty string values.
-Modified to test a mix of integers and strings as keys.
-http://www.crockford.com/JSON/JSON_checker/test/pass1.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
?
--FILE--
?php
+/* Modified to test unescaped UNICODE as keys and values.
+ * Modified to test numbers with exponents without a decimal point.
+ * Modified to test empty string values.
+ * Modified to test a mix of integers and strings as keys.
+ */
// Expect warnings about INF.
ini_set(error_reporting, E_ALL ~E_WARNING);
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass001.phpt?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/json/tests/pass001.phpt
diff -u php-src/ext/json/tests/pass001.phpt:1.1
php-src/ext/json/tests/pass001.phpt:1.1.2.1
--- php-src/ext/json/tests/pass001.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/pass001.phpt Mon Aug 7 23:28:05 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern pass1
-http://www.crockford.com/JSON/JSON_checker/test/pass1.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass002.phpt?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/json/tests/pass002.phpt
diff -u php-src/ext/json/tests/pass002.phpt:1.1
php-src/ext/json/tests/pass002.phpt:1.1.2.1
--- php-src/ext/json/tests/pass002.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/pass002.phpt Mon Aug 7 23:28:05 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern pass2
-http://www.crockford.com/JSON/JSON_checker/test/pass2.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass2.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass003.phpt?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/json/tests/pass003.phpt
diff -u php-src/ext/json/tests/pass003.phpt:1.1
php-src/ext/json/tests/pass003.phpt:1.1.2.1
--- php-src/ext/json/tests/pass003.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/pass003.phpt Mon Aug 7 23:28:05 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern pass3
-http://www.crockford.com/JSON/JSON_checker/test/pass3.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass3.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json/tests fail001.phpt pass001.1.phpt pass001.phpt pass002.phpt pass003.phpt
helly Mon Aug 7 23:33:57 2006 UTC
Modified files:
/php-src/ext/json/tests fail001.phpt pass001.1.phpt pass001.phpt
pass002.phpt pass003.phpt
Log:
- MFB Test name must not be more than a single line
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/fail001.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/json/tests/fail001.phpt
diff -u php-src/ext/json/tests/fail001.phpt:1.1
php-src/ext/json/tests/fail001.phpt:1.2
--- php-src/ext/json/tests/fail001.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/fail001.phpt Mon Aug 7 23:33:57 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern fail1 - fail24
-http://www.crockford.com/JSON/JSON_checker/test/fail*.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/fail*.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass001.1.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/json/tests/pass001.1.phpt
diff -u php-src/ext/json/tests/pass001.1.phpt:1.3
php-src/ext/json/tests/pass001.1.phpt:1.4
--- php-src/ext/json/tests/pass001.1.phpt:1.3 Sat Mar 4 15:31:27 2006
+++ php-src/ext/json/tests/pass001.1.phpt Mon Aug 7 23:33:57 2006
@@ -1,16 +1,16 @@
--TEST--
-JSON Test Pattern pass1.1
-Modified to test unescaped UNICODE as keys and values.
-Modified to test numbers with exponents without a decimal point.
-Modified to test empty string values.
-Modified to test a mix of integers and strings as keys.
-http://www.crockford.com/JSON/JSON_checker/test/pass1.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
?
--FILE--
?php
+/* Modified to test unescaped UNICODE as keys and values.
+ * Modified to test numbers with exponents without a decimal point.
+ * Modified to test empty string values.
+ * Modified to test a mix of integers and strings as keys.
+ */
// Expect warnings about INF.
ini_set(error_reporting, E_ALL ~E_WARNING);
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass001.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/json/tests/pass001.phpt
diff -u php-src/ext/json/tests/pass001.phpt:1.1
php-src/ext/json/tests/pass001.phpt:1.2
--- php-src/ext/json/tests/pass001.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/pass001.phpt Mon Aug 7 23:33:57 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern pass1
-http://www.crockford.com/JSON/JSON_checker/test/pass1.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass1.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass002.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/json/tests/pass002.phpt
diff -u php-src/ext/json/tests/pass002.phpt:1.1
php-src/ext/json/tests/pass002.phpt:1.2
--- php-src/ext/json/tests/pass002.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/pass002.phpt Mon Aug 7 23:33:57 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern pass2
-http://www.crockford.com/JSON/JSON_checker/test/pass2.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass2.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/pass003.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/json/tests/pass003.phpt
diff -u php-src/ext/json/tests/pass003.phpt:1.1
php-src/ext/json/tests/pass003.phpt:1.2
--- php-src/ext/json/tests/pass003.phpt:1.1 Tue Jan 31 09:00:14 2006
+++ php-src/ext/json/tests/pass003.phpt Mon Aug 7 23:33:57 2006
@@ -1,6 +1,5 @@
--TEST--
-JSON Test Pattern pass3
-http://www.crockford.com/JSON/JSON_checker/test/pass3.json
+JSON (http://www.crockford.com/JSON/JSON_checker/test/pass3.json)
--SKIPIF--
?php
if (!extension_loaded('json')) die('skip: json extension not available');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
