[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jan 31 01:31:29 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2943r2=1.2944diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2943 php-src/ChangeLog:1.2944 --- php-src/ChangeLog:1.2943Wed Jan 30 01:31:29 2008 +++ php-src/ChangeLog Thu Jan 31 01:31:28 2008 @@ -1,3 +1,625 @@ +2008-01-30 Marcus Boerger [EMAIL PROTECTED] + +* ext/spl/spl_directory.c + ext/spl/spl_directory.h: + - MFB SplDirectoryIterator/glob:// stream integration + +* (PHP_5_3) + ext/spl/spl_directory.c: + - WS + +* main/streams/glob_wrapper.c: + - Get rid of overoptimization + +* (PHP_5_3) + ext/spl/spl_directory.c: + - Sub path may be NULL + +* (PHP_5_3) + NEWS + ext/spl/spl_directory.c + ext/spl/spl_directory.h: + - Fixed glob:// stream handling in (Recursive)DirectoryIterator. + +2008-01-30 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/gmp/gmp.c: + + MFB: Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st + argument) + +* ext/gmp/gmp.c: + + MFB: Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st + argument) + +* (PHP_5_3) + ext/gmp/gmp.c: + + Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st argument) + +2008-01-30 Zoe Slattery [EMAIL PROTECTED] + +* ext/standard/tests/math/acos_error.phpt + ext/standard/tests/math/acos_error.phpt + ext/standard/tests/math/acos_error.phpt + ext/standard/tests/math/acosh_error.phpt + ext/standard/tests/math/acosh_error.phpt + ext/standard/tests/math/acosh_error.phpt + ext/standard/tests/math/asin_error.phpt + ext/standard/tests/math/asin_error.phpt + ext/standard/tests/math/asin_error.phpt + ext/standard/tests/math/asinh_error.phpt + ext/standard/tests/math/asinh_error.phpt + ext/standard/tests/math/asinh_error.phpt + ext/standard/tests/math/atan_error.phpt + ext/standard/tests/math/atan_error.phpt + ext/standard/tests/math/atan_error.phpt + ext/standard/tests/math/atanh_error.phpt + ext/standard/tests/math/atanh_error.phpt + ext/standard/tests/math/atanh_error.phpt + ext/standard/tests/math/cos_error.phpt + ext/standard/tests/math/cos_error.phpt + ext/standard/tests/math/cos_error.phpt + ext/standard/tests/math/cosh_error.phpt + ext/standard/tests/math/cosh_error.phpt + ext/standard/tests/math/cosh_error.phpt + ext/standard/tests/math/sin_error.phpt + ext/standard/tests/math/sin_error.phpt + ext/standard/tests/math/sin_error.phpt + ext/standard/tests/math/sinh_error.phpt + ext/standard/tests/math/sinh_error.phpt + ext/standard/tests/math/sinh_error.phpt + ext/standard/tests/math/tan_error.phpt + ext/standard/tests/math/tan_error.phpt + ext/standard/tests/math/tan_error.phpt + ext/standard/tests/math/tanh_error.phpt + ext/standard/tests/math/tanh_error.phpt + ext/standard/tests/math/tanh_error.phpt: + Removing superfluous --INI-- section + +2008-01-30 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/libxml/libxml.c + ext/libxml/libxml.c: + MFH: fix bug #41562 (SimpleXML memory issue) + +* ext/libxml/libxml.c: + fix bug #41562 (SimpleXML memory issue) + +2008-01-30 Felipe Pena [EMAIL PROTECTED] + +* ext/reflection/tests/bug43926.phpt + ext/reflection/tests/bug43926.phpt + ext/reflection/tests/reflectionClass_isInstance_basic.phpt + ext/reflection/tests/reflectionObject_isInstance_basic.phpt: + Fix test + +* (PHP_5_3) + ext/reflection/php_reflection.c: + Revert + +2008-01-30 Robin Fernandes [EMAIL PROTECTED] + +* tests/classes/__call_003.phpt + tests/classes/autoload_007.phpt + tests/classes/autoload_008.phpt + tests/classes/autoload_009.phpt + tests/classes/autoload_010.phpt + tests/classes/autoload_011.phpt + tests/classes/autoload_012.phpt + tests/classes/autoload_013.phpt + tests/classes/autoload_014.phpt + tests/classes/autoload_015.phpt + tests/classes/autoload_016.phpt + tests/classes/autoload_017.phpt + tests/classes/autoload_018.phpt + tests/classes/autoload_019.phpt + tests/classes/autoload_020.phpt + tests/classes/constants_basic_001.phpt + tests/classes/constants_basic_002.phpt + tests/classes/constants_basic_003.inc + tests/classes/constants_basic_003.phpt + tests/classes/constants_basic_004.phpt + tests/classes/constants_basic_005.phpt + tests/classes/constants_basic_006.phpt + tests/classes/constants_error_001.phpt + tests/classes/constants_error_002.phpt + tests/classes/constants_error_003.phpt +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Jan 31 01:31:31 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1229r2=1.1230diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1229 ZendEngine2/ChangeLog:1.1230 --- ZendEngine2/ChangeLog:1.1229Wed Jan 30 01:31:32 2008 +++ ZendEngine2/ChangeLog Thu Jan 31 01:31:31 2008 @@ -1,3 +1,22 @@ +2008-01-30 Antony Dovgal [EMAIL PROTECTED] + +* zend_execute_API.c: + fix #43973 (__autoload called with wrong classname when triggered by static + callback) + the issue was present only in HEAD + patch by Felipe + +2008-01-30 Dmitry Stogov [EMAIL PROTECTED] + +* acconfig.h: + Imporoved PHP binary size and startup speed with GCC4 visibility control + (Nuno) + +* (PHP_5_3) + acconfig.h: + Improved PHP binary size and startup speed with GCC4 visibility control + (Nuno) + 2008-01-29 Dmitry Stogov [EMAIL PROTECTED] * zend_builtin_functions.c: @@ -21042,7 +21061,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1229 2008/01/30 01:31:32 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1230 2008/01/31 01:31:31 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -22766,7 +22785,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1229 2008/01/30 01:31:32 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1230 2008/01/31 01:31:31 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/json json.c
dmitry Wed Jan 30 08:10:28 2008 UTC
Modified files:
/php-src/ext/json json.c
Log:
ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.34 php-src/ext/json/json.c:1.35
--- php-src/ext/json/json.c:1.34Wed Jan 30 03:21:30 2008
+++ php-src/ext/json/json.c Wed Jan 30 08:10:28 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.34 2008/01/30 03:21:30 stas Exp $ */
+/* $Id: json.c,v 1.35 2008/01/30 08:10:28 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -97,7 +97,7 @@
/* }}} */
static void json_encode_r(smart_str *buf, zval *val, int options TSRMLS_DC);
-static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar
type, int options);
+static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar
type, int options TSRMLS_DC);
static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
{
@@ -205,7 +205,7 @@
need_comma = 1;
}
- json_escape_string(buf, key,
key_len - 1, (i==HASH_KEY_IS_UNICODE)?IS_UNICODE:IS_STRING, options);
+ json_escape_string(buf, key,
key_len - 1, (i==HASH_KEY_IS_UNICODE)?IS_UNICODE:IS_STRING, options TSRMLS_CC);
smart_str_appendc(buf, ':');
json_encode_r(buf, *data,
options TSRMLS_CC);
@@ -245,7 +245,7 @@
#define REVERSE16(us) (((us 0xf) 12) | (((us 4) 0xf) 8) | (((us
8) 0xf) 4) | ((us 12) 0xf))
-static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar
type, int options) /* {{{ */
+static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar
type, int options TSRMLS_DC) /* {{{ */
{
int pos = 0;
unsigned short us;
@@ -437,7 +437,7 @@
break;
case IS_STRING:
case IS_UNICODE:
- json_escape_string(buf, Z_UNIVAL_P(val),
Z_UNILEN_P(val), Z_TYPE_P(val), options);
+ json_escape_string(buf, Z_UNIVAL_P(val),
Z_UNILEN_P(val), Z_TYPE_P(val), options TSRMLS_CC);
break;
case IS_ARRAY:
case IS_OBJECT:
--
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/xml xml.c
rasmus Wed Jan 30 08:50:02 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xmlxml.c
Log:
Copy-paste typo
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.157.2.4.2.7r2=1.157.2.4.2.8diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.157.2.4.2.7 php-src/ext/xml/xml.c:1.157.2.4.2.8
--- php-src/ext/xml/xml.c:1.157.2.4.2.7 Tue Jan 29 23:21:20 2008
+++ php-src/ext/xml/xml.c Wed Jan 30 08:50:02 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.157.2.4.2.7 2008/01/29 23:21:20 rasmus Exp $ */
+/* $Id: xml.c,v 1.157.2.4.2.8 2008/01/30 08:50:02 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -595,7 +595,7 @@
s += 3;
pos -= 3;
} else if (c = 0xc0) { /* two bytes encoded, 11 bits */
- if(pos-3 = 0) {
+ if(pos-2 = 0) {
c = ((s[0]63)6) | (s[1]63);
} else {
c = '?';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xml xml.c
rasmus Wed Jan 30 08:52:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xmlxml.c
Log:
fix typo
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.157.2.4.2.5.2.3r2=1.157.2.4.2.5.2.4diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.157.2.4.2.5.2.3
php-src/ext/xml/xml.c:1.157.2.4.2.5.2.4
--- php-src/ext/xml/xml.c:1.157.2.4.2.5.2.3 Tue Jan 29 23:21:10 2008
+++ php-src/ext/xml/xml.c Wed Jan 30 08:52:17 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.157.2.4.2.5.2.3 2008/01/29 23:21:10 rasmus Exp $ */
+/* $Id: xml.c,v 1.157.2.4.2.5.2.4 2008/01/30 08:52:17 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -595,7 +595,7 @@
s += 3;
pos -= 3;
} else if (c = 0xc0) { /* two bytes encoded, 11 bits */
- if(pos-3 = 0) {
+ if(pos-2 = 0) {
c = ((s[0]63)6) | (s[1]63);
} else {
c = '?';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml xml.c
rasmus Wed Jan 30 08:52:56 2008 UTC
Modified files:
/php-src/ext/xmlxml.c
Log:
Fix typo
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/xml.c?r1=1.175r2=1.176diff_format=u
Index: php-src/ext/xml/xml.c
diff -u php-src/ext/xml/xml.c:1.175 php-src/ext/xml/xml.c:1.176
--- php-src/ext/xml/xml.c:1.175 Tue Jan 29 23:29:04 2008
+++ php-src/ext/xml/xml.c Wed Jan 30 08:52:55 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: xml.c,v 1.175 2008/01/29 23:29:04 rasmus Exp $ */
+/* $Id: xml.c,v 1.176 2008/01/30 08:52:55 rasmus Exp $ */
#define IS_EXT_MODULE
@@ -607,7 +607,7 @@
s += 3;
pos -= 3;
} else if (c = 0xc0) { /* two bytes encoded, 11 bits */
- if(pos-3 = 0) {
+ if(pos-2 = 0) {
c = ((s[0]63)6) | (s[1]63);
} else {
c = '?';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite config.m4
tony2001Wed Jan 30 09:11:08 2008 UTC Modified files: /php-src/ext/sqlite config.m4 Log: both pdo spl dependencies are optional http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/config.m4?r1=1.44r2=1.45diff_format=u Index: php-src/ext/sqlite/config.m4 diff -u php-src/ext/sqlite/config.m4:1.44 php-src/ext/sqlite/config.m4:1.45 --- php-src/ext/sqlite/config.m4:1.44 Tue Jul 3 17:24:37 2007 +++ php-src/ext/sqlite/config.m4Wed Jan 30 09:11:08 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.44 2007/07/03 17:24:37 sniper Exp $ +dnl $Id: config.m4,v 1.45 2008/01/30 09:11:08 tony2001 Exp $ dnl config.m4 for extension sqlite dnl vim:et:ts=2:sw=2 @@ -103,16 +103,15 @@ libsqlite/src/vacuum.c libsqlite/src/copy.c \ libsqlite/src/vdbeaux.c libsqlite/src/date.c \ libsqlite/src/where.c libsqlite/src/trigger.c - -PHP_ADD_EXTENSION_DEP(sqlite, spl) -PHP_ADD_EXTENSION_DEP(sqlite, pdo) fi - dnl dnl Common for both bundled/external dnl sqlite_sources=sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS) + PHP_ADD_EXTENSION_DEP(sqlite, spl, true) + PHP_ADD_EXTENSION_DEP(sqlite, pdo, true) + PHP_ADD_MAKEFILE_FRAGMENT PHP_SUBST(SQLITE_SHARED_LIBADD) PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/json json.c utf8_to_utf16.c /ext/json/tests bug43941.phpt
Hello Stanislav,
Wednesday, January 30, 2008, 4:17:57 AM, you wrote:
stasWed Jan 30 03:17:57 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/json/tests bug43941.phpt
Modified files:
/php-src/ext/json json.c utf8_to_utf16.c
Log:
fix #43941: invalid utf-8 not accepted
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.4r2=1.9.2.19.2.5diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.4
php-src/ext/json/json.c:1.9.2.19.2.5
--- php-src/ext/json/json.c:1.9.2.19.2.4Mon Dec 31 07:17:09 2007
+++ php-src/ext/json/json.c Wed Jan 30 03:17:57 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.19.2.4 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.5 2008/01/30 03:17:57 stas Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -269,8 +269,14 @@
{
efree(utf16);
}
-
-smart_str_appendl(buf, \\, 2);
+ if(len 0) {
+ if(!PG(display_errors)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Invalid UTF-8 sequence in
argument);
+ }
+ smart_str_appendl(buf, null, 4);
+ } else {
+ smart_str_appendl(buf, \\, 2);
+ }
Funny whitespace :-)
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /ext/bz2 php_bz2.h /ext/dom xml_common.h /ext/gd php_gd.h /ext/hash php_hash.h /ext/iconv php_iconv.h /ext/libxml php_libxml.h /ext/mbstring mbstring.h /e
dmitry Wed Jan 30 09:56:22 2008 UTC Modified files: /php-srcconfigure.in /TSRM TSRM.h tsrm_virtual_cwd.h /ZendEngine2acconfig.h /php-src/ext/bz2php_bz2.h /php-src/ext/domxml_common.h /php-src/ext/gd php_gd.h /php-src/ext/hash php_hash.h /php-src/ext/iconv php_iconv.h /php-src/ext/libxml php_libxml.h /php-src/ext/mbstring mbstring.h /php-src/ext/mysqli php_mysqli_structs.h /php-src/ext/pdophp_pdo.h /php-src/ext/pgsql php_pgsql.h /php-src/ext/skeleton php_skeleton.h /php-src/ext/splphp_spl.h /php-src/ext/unicodephp_unicode.h /php-src/ext/zip/libzip.h /php-src/main SAPI.h php.h /php-src/sapi/apache2filter php_apache.h /php-src/sapi/apache2handlerphp_apache.h /php-src/sapi/apache_hooks mod_php5.h /php-src/sapi/pi3webpi3web_sapi.h Log: Imporoved PHP binary size and startup speed with GCC4 visibility control (Nuno) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.643r2=1.644diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.643 php-src/configure.in:1.644 --- php-src/configure.in:1.643 Tue Jan 22 09:29:29 2008 +++ php-src/configure.inWed Jan 30 09:56:21 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.643 2008/01/22 09:29:29 dmitry Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.644 2008/01/30 09:56:21 dmitry Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -165,6 +165,14 @@ ;; esac +dnl activate some gcc specific optimizations for gcc = 4 +if test $GCC = yes; then + GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'` + if test $GCC_MAJOR_VERSION -ge 4; then +CFLAGS=$CFLAGS -fvisibility=hidden + fi +fi + case $host_alias in *solaris*) CPPFLAGS=$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS http://cvs.php.net/viewvc.cgi/TSRM/TSRM.h?r1=1.57r2=1.58diff_format=u Index: TSRM/TSRM.h diff -u TSRM/TSRM.h:1.57 TSRM/TSRM.h:1.58 --- TSRM/TSRM.h:1.57Mon Dec 31 07:12:06 2007 +++ TSRM/TSRM.h Wed Jan 30 09:56:21 2008 @@ -22,10 +22,12 @@ #ifdef TSRM_WIN32 # ifdef TSRM_EXPORTS -# define TSRM_API __declspec(dllexport) +# define TSRM_API __declspec(dllexport) # else -# define TSRM_API __declspec(dllimport) +# define TSRM_API __declspec(dllimport) # endif +#elif defined(__GNUC__) __GNUC__ = 4 +# define TSRM_API __attribute__ ((visibility(default))) #else # define TSRM_API #endif http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.64r2=1.65diff_format=u Index: TSRM/tsrm_virtual_cwd.h diff -u TSRM/tsrm_virtual_cwd.h:1.64 TSRM/tsrm_virtual_cwd.h:1.65 --- TSRM/tsrm_virtual_cwd.h:1.64Mon Dec 31 07:12:06 2007 +++ TSRM/tsrm_virtual_cwd.h Wed Jan 30 09:56:21 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: tsrm_virtual_cwd.h,v 1.64 2007/12/31 07:12:06 sebastian Exp $ */ +/* $Id: tsrm_virtual_cwd.h,v 1.65 2008/01/30 09:56:21 dmitry Exp $ */ #ifndef VIRTUAL_CWD_H #define VIRTUAL_CWD_H @@ -134,13 +134,15 @@ #endif #ifdef TSRM_WIN32 -# ifdef CWD_EXPORTS -# define CWD_API __declspec(dllexport) -# else -# define CWD_API __declspec(dllimport) -# endif +# ifdef CWD_EXPORTS +# define CWD_API __declspec(dllexport) +# else +# define CWD_API __declspec(dllimport) +# endif +#elif defined(__GNUC__) __GNUC__ = 4 +# define CWD_API __attribute__ ((visibility(default))) #else -#define CWD_API +# define CWD_API #endif #ifdef TSRM_WIN32 http://cvs.php.net/viewvc.cgi/ZendEngine2/acconfig.h?r1=1.43r2=1.44diff_format=u Index: ZendEngine2/acconfig.h diff -u ZendEngine2/acconfig.h:1.43 ZendEngine2/acconfig.h:1.44 --- ZendEngine2/acconfig.h:1.43 Mon Dec 31 07:12:06 2007 +++ ZendEngine2/acconfig.h Wed Jan 30 09:56:21 2008 @@ -17,10 +17,16 @@ +--+ */ -/* $Id: acconfig.h,v 1.43 2007/12/31 07:12:06 sebastian Exp $ */ +/* $Id: acconfig.h,v 1.44 2008/01/30 09:56:21 dmitry Exp $ */ + +#if defined(__GNUC__) __GNUC__ = 4 +# define ZEND_API __attribute__ ((visibility(default))) +# define ZEND_DLEXPORT __attribute__ ((visibility(default))) +#else +# define ZEND_API +# define ZEND_DLEXPORT +#endif -#define ZEND_API -#define ZEND_DLEXPORT #define ZEND_DLIMPORT @TOP@ http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/php_bz2.h?r1=1.13r2=1.14diff_format=u Index: php-src/ext/bz2/php_bz2.h diff -u php-src/ext/bz2/php_bz2.h:1.13 php-src/ext/bz2/php_bz2.h:1.14 --- php-src/ext/bz2/php_bz2.h:1.13 Mon Dec 31 07:12:07 2007 +++ php-src/ext/bz2/php_bz2.h Wed Jan 30 09:56:21 2008 @@ -16,7 +16,7 @@
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/reflection php_reflection.c /ext/reflection/tests bug43926.phpt
felipe Wed Jan 30 10:27:30 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/reflection/tests bug43926.phpt Modified files: /php-src/ext/reflection php_reflection.c /php-srcNEWS Log: Fixed Bug#43926 (isInstance() isn't equivalent to instanceof operator) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.7r2=1.164.2.33.2.45.2.8diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.7 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.8 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.7 Wed Jan 16 14:21:07 2008 +++ php-src/ext/reflection/php_reflection.c Wed Jan 30 10:27:28 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.7 2008/01/16 14:21:07 helly Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.8 2008/01/30 10:27:28 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -3402,7 +3402,7 @@ return; } GET_REFLECTION_OBJECT_PTR(ce); - RETURN_BOOL(ce == Z_OBJCE_P(object)); + RETURN_BOOL(HAS_CLASS_ENTRY(*object) instanceof_function(Z_OBJCE_P(object), ce)); } /* }}} */ @@ -4913,7 +4913,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.45.2.7 2008/01/16 14:21:07 helly Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.45.2.8 2008/01/30 10:27:28 felipe Exp $); php_info_print_table_end(); } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.100r2=1.2027.2.547.2.965.2.101diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.100 php-src/NEWS:1.2027.2.547.2.965.2.101 --- php-src/NEWS:1.2027.2.547.2.965.2.100 Wed Jan 30 09:41:11 2008 +++ php-src/NEWSWed Jan 30 10:27:28 2008 @@ -240,6 +240,7 @@ - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory already exists). (Pierre) +- Fixed bug #43926 (isInstance() isn't equivalent to instanceof operator). (Marcus) - Fixed bug #42368 (Incorrect error message displayed by pg_escape_string). (Ilia) - Fixed bug #42365 (glob() crashes and/or accepts way too many flags). http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug43926.phpt?view=markuprev=1.1 Index: php-src/ext/reflection/tests/bug43926.phpt +++ php-src/ext/reflection/tests/bug43926.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests bug43926.phpt
felipe Wed Jan 30 10:54:41 2008 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src/ext/reflection/tests bug43926.phpt
Log:
Fixed Bug #43926 (isInstance() isn't equivalent to instanceof operator)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.290r2=1.291diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.290
php-src/ext/reflection/php_reflection.c:1.291
--- php-src/ext/reflection/php_reflection.c:1.290 Wed Jan 16 14:19:07 2008
+++ php-src/ext/reflection/php_reflection.c Wed Jan 30 10:54:41 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.290 2008/01/16 14:19:07 helly Exp $ */
+/* $Id: php_reflection.c,v 1.291 2008/01/30 10:54:41 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3481,7 +3481,7 @@
return;
}
GET_REFLECTION_OBJECT_PTR(ce);
- RETURN_BOOL(ce == Z_OBJCE_P(object));
+ RETURN_BOOL(HAS_CLASS_ENTRY(*object)
instanceof_function(Z_OBJCE_P(object), ce));
}
/* }}} */
@@ -5032,7 +5032,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.290
2008/01/16 14:19:07 helly Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.291
2008/01/30 10:54:41 felipe Exp $);
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug43926.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/reflection/tests/bug43926.phpt
diff -u /dev/null php-src/ext/reflection/tests/bug43926.phpt:1.2
--- /dev/null Wed Jan 30 10:54:41 2008
+++ php-src/ext/reflection/tests/bug43926.phpt Wed Jan 30 10:54:41 2008
@@ -0,0 +1,37 @@
+--TEST--
+Bug#43926 - isInstance() isn't equivalent to instanceof operator
+--FILE--
+?php
+
+class E {
+}
+class D extends E {
+}
+
+class A extends D {
+}
+
+class C extends A {
+}
+
+$ra = new ReflectionClass('A');
+$rc = new ReflectionClass('C');
+$rd = new ReflectionClass('D');
+$re = new ReflectionClass('E');
+
+$ca = $ra-newInstance();
+$cc = $rc-newInstance();
+$cd = $rd-newInstance();
+$ce = $re-newInstance();
+
+print(Is? A . ($ra-isInstance($ca) ? 'true' : 'false') ., instanceof: .
(($ca instanceof A) ? 'true' : 'false') .\n);
+print(Is? C . ($ra-isInstance($cc) ? 'true' : 'false') ., instanceof: .
(($ca instanceof C) ? 'true' : 'false') .\n);
+print(Is? D . ($ra-isInstance($cd) ? 'true' : 'false') ., instanceof: .
(($ca instanceof D) ? 'true' : 'false') .\n);
+print(Is? E . ($ra-isInstance($ce) ? 'true' : 'false') ., instanceof: .
(($ca instanceof E) ? 'true' : 'false') .\n);
+
+?
+--EXPECT--
+Is? A true, instanceof: true
+Is? C false, instanceof: false
+Is? D true, instanceof: true
+Is? E true, instanceof: true
\ 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: CVSROOT / avail
helly Wed Jan 30 11:49:39 2008 UTC Modified files: /CVSROOTavail Log: - Add robinf to allow him to submit tests http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1352r2=1.1353diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1352 CVSROOT/avail:1.1353 --- CVSROOT/avail:1.1352Tue Jan 29 17:21:04 2008 +++ CVSROOT/avail Wed Jan 30 11:49:39 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjor! i,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,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,phpdoc-ca,phpdoc-no +avail|dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv,bjor! i,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,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,phpdoc-ca,phpdoc-no # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection/tests reflectionClass_isInstance_basic.phpt reflectionObject_isInstance_basic.phpt
felipe Wed Jan 30 11:43:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/reflection/tests reflectionObject_isInstance_basic.phpt reflectionClass_isInstance_basic.phpt Log: Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt diff -u php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.1.2.1 php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.1.2.1.2.1 --- php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.1.2.1 Thu Jul 12 21:03:39 2007 +++ php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt Wed Jan 30 11:43:10 2008 @@ -25,7 +25,7 @@ is myA a A? bool(true) is myB a A? bool(false) is myX a A? bool(false) -is myA a B? bool(false) +is myA a B? bool(true) is myB a B? bool(true) is myX a B? bool(false) is myA a X? bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt diff -u php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.1.2.1 php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.1.2.1.2.1 --- php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.1.2.1 Wed Jul 11 20:11:34 2007 +++ php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt Wed Jan 30 11:43:10 2008 @@ -33,7 +33,7 @@ is myB a A? bool(false) is myC a A? bool(false) is myX a A? bool(false) -is myA a B? bool(false) +is myA a B? bool(true) is myB a B? bool(true) is myC a B? bool(false) is myX a B? bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection/tests bug43926.phpt reflectionClass_isInstance_basic.phpt reflectionObject_isInstance_basic.phpt
felipe Wed Jan 30 11:56:34 2008 UTC Modified files: /php-src/ext/reflection/tests reflectionObject_isInstance_basic.phpt reflectionClass_isInstance_basic.phpt bug43926.phpt Log: Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt diff -u php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.2 php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.3 --- php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.2 Thu Jul 12 21:08:02 2007 +++ php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt Wed Jan 30 11:56:34 2008 @@ -23,7 +23,7 @@ ? --EXPECTF-- is myA a A? bool(true) -is myB a A? bool(false) +is myB a A? bool(true) is myX a A? bool(false) is myA a B? bool(false) is myB a B? bool(true) @@ -33,7 +33,7 @@ is myX a X? bool(true) --UEXPECTF-- is myA a A? bool(true) -is myB a A? bool(false) +is myB a A? bool(true) is myX a A? bool(false) is myA a B? bool(false) is myB a B? bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt diff -u php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.2 php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.3 --- php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.2 Wed Jul 11 20:16:43 2007 +++ php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt Wed Jan 30 11:56:34 2008 @@ -30,7 +30,7 @@ ? --EXPECTF-- is myA a A? bool(true) -is myB a A? bool(false) +is myB a A? bool(true) is myC a A? bool(false) is myX a A? bool(false) is myA a B? bool(false) @@ -43,7 +43,7 @@ is myX a C? bool(false) is myA a I? bool(false) is myB a I? bool(false) -is myC a I? bool(false) +is myC a I? bool(true) is myX a I? bool(false) is myA a X? bool(false) is myB a X? bool(false) @@ -51,7 +51,7 @@ is myX a X? bool(true) --UEXPECTF-- is myA a A? bool(true) -is myB a A? bool(false) +is myB a A? bool(true) is myC a A? bool(false) is myX a A? bool(false) is myA a B? bool(false) @@ -64,7 +64,7 @@ is myX a C? bool(false) is myA a I? bool(false) is myB a I? bool(false) -is myC a I? bool(false) +is myC a I? bool(true) is myX a I? bool(false) is myA a X? bool(false) is myB a X? bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug43926.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/reflection/tests/bug43926.phpt diff -u php-src/ext/reflection/tests/bug43926.phpt:1.2 php-src/ext/reflection/tests/bug43926.phpt:1.3 --- php-src/ext/reflection/tests/bug43926.phpt:1.2 Wed Jan 30 10:54:41 2008 +++ php-src/ext/reflection/tests/bug43926.phpt Wed Jan 30 11:56:34 2008 @@ -34,4 +34,9 @@ Is? A true, instanceof: true Is? C false, instanceof: false Is? D true, instanceof: true +Is? E true, instanceof: true +--UEXPECT-- +Is? A true, instanceof: true +Is? C false, instanceof: false +Is? D true, instanceof: true Is? E true, instanceof: true \ 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(PHP_5_3) /ext/reflection php_reflection.c
felipe Wed Jan 30 13:42:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/reflection php_reflection.c Log: Fix the fix (isInstance - order of parameters) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.9r2=1.164.2.33.2.45.2.10diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.9 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.10 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.9 Wed Jan 30 12:50:59 2008 +++ php-src/ext/reflection/php_reflection.c Wed Jan 30 13:42:01 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.9 2008/01/30 12:50:59 tony2001 Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.10 2008/01/30 13:42:01 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -3402,7 +3402,7 @@ return; } GET_REFLECTION_OBJECT_PTR(ce); - RETURN_BOOL(HAS_CLASS_ENTRY(*object) instanceof_function(Z_OBJCE_P(object), ce TSRMLS_CC)); + RETURN_BOOL(HAS_CLASS_ENTRY(*object) instanceof_function(ce, Z_OBJCE_P(object) TSRMLS_CC)); } /* }}} */ @@ -4913,7 +4913,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.45.2.9 2008/01/30 12:50:59 tony2001 Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.45.2.10 2008/01/30 13:42:01 felipe Exp $); 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: php-src(PHP_5_3) /tests/classes __call_003.phpt autoload_007.phpt autoload_008.phpt autoload_009.phpt autoload_010.phpt autoload_011.phpt autoload_012.phpt autoload_013.phpt autoload_01
robinf Wed Jan 30 14:25:43 2008 UTC Added files: (Branch: PHP_5_3) /php-src/tests/classes property_override_protected_private.phpt constants_error_004.phpt property_override_publicStatic_publicStatic.phpt property_override_publicStatic_protected.phpt constants_basic_004.phpt autoload_012.phpt autoload_017.phpt property_override_public_protectedStatic.phpt autoload_008.phpt final_ctor3.phpt autoload_009.phpt autoload_013.phpt property_override_public_private.phpt property_override_private_protectedStatic.phpt constants_error_002.phpt constants_basic_002.phpt autoload_015.phpt autoload_007.phpt property_override_protectedStatic_protectedStatic.phpt constants_error_005.phpt property_override_public_public.phpt autoload_010.phpt property_override_publicStatic_private.phpt autoload_020.phpt property_override_private_public.phpt property_override_publicStatic_protectedStatic.phpt property_override_public_publicStatic.phpt property_override_privateStatic_privateStatic.phpt property_override_privateStatic_public.phpt property_override_protectedStatic_private.phpt property_override_publicStatic_public.phpt property_override_privateStatic_protectedStatic.phpt constants_error_006.phpt property_override_public_privateStatic.phpt autoload_014.phpt property_override_privateStatic_protected.phpt property_override_private_privateStatic.phpt property_override_protected_publicStatic.phpt constants_basic_003.inc property_override_protected_privateStatic.phpt constants_basic_006.phpt property_override_protectedStatic_public.phpt inheritance_005.phpt property_override_private_publicStatic.phpt constants_error_001.phpt property_override_privateStatic_private.phpt autoload_018.phpt new_001.phpt property_override_protectedStatic_publicStatic.phpt property_override_privateStatic_publicStatic.phpt constants_basic_001.phpt property_override_private_protected.phpt property_override_protectedStatic_protected.phpt property_override_private_private.phpt constants_basic_003.phpt __call_003.phpt autoload_011.phpt method_call_variation_001.phpt property_override_protectedStatic_privateStatic.phpt constants_error_007.phpt property_override_public_protected.phpt property_override_protected_protectedStatic.phpt constants_error_003.phpt constants_basic_005.phpt autoload_019.phpt type_hinting_004.phpt property_override_protected_protected.phpt property_override_publicStatic_privateStatic.phpt property_override_protected_public.phpt autoload_016.phpt Log: Adding tests for class features, including __autoload(), property inheritance rules and class constants. http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protected_private.phpt?view=markuprev=1.1 Index: php-src/tests/classes/property_override_protected_private.phpt +++ php-src/tests/classes/property_override_protected_private.phpt
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c
felipe Wed Jan 30 14:45:20 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/reflection php_reflection.c Log: Revert http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.10r2=1.164.2.33.2.45.2.11diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.10 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.11 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.10Wed Jan 30 13:42:01 2008 +++ php-src/ext/reflection/php_reflection.c Wed Jan 30 14:45:20 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.10 2008/01/30 13:42:01 felipe Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.11 2008/01/30 14:45:20 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -3402,7 +3402,7 @@ return; } GET_REFLECTION_OBJECT_PTR(ce); - RETURN_BOOL(HAS_CLASS_ENTRY(*object) instanceof_function(ce, Z_OBJCE_P(object) TSRMLS_CC)); + RETURN_BOOL(HAS_CLASS_ENTRY(*object) instanceof_function(Z_OBJCE_P(object), ce TSRMLS_CC)); } /* }}} */ @@ -4913,7 +4913,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Reflection, enabled); - php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.45.2.10 2008/01/30 13:42:01 felipe Exp $); + php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.164.2.33.2.45.2.11 2008/01/30 14:45:20 felipe Exp $); 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: php-src(PHP_5_2) /tests/classes __call_003.phpt autoload_007.phpt autoload_008.phpt autoload_009.phpt autoload_010.phpt autoload_011.phpt autoload_012.phpt autoload_013.phpt autoload_01
robinf Wed Jan 30 14:24:47 2008 UTC Added files: (Branch: PHP_5_2) /php-src/tests/classes property_override_protected_publicStatic.phpt property_override_protected_privateStatic.phpt property_override_private_protectedStatic.phpt property_override_privateStatic_protectedStatic.phpt property_override_privateStatic_privateStatic.phpt property_override_protected_protectedStatic.phpt constants_basic_003.inc property_override_privateStatic_private.phpt property_override_public_privateStatic.phpt property_override_protected_protected.phpt final_ctor3.phpt property_override_private_privateStatic.phpt autoload_017.phpt property_override_private_protected.phpt autoload_019.phpt property_override_public_protected.phpt constants_basic_001.phpt autoload_018.phpt constants_error_006.phpt property_override_protectedStatic_private.phpt method_call_variation_001.phpt property_override_public_protectedStatic.phpt constants_error_005.phpt property_override_publicStatic_privateStatic.phpt property_override_publicStatic_protected.phpt property_override_private_private.phpt autoload_020.phpt __call_003.phpt property_override_protected_public.phpt constants_basic_004.phpt constants_error_001.phpt property_override_publicStatic_protectedStatic.phpt constants_basic_003.phpt autoload_011.phpt inheritance_005.phpt property_override_private_publicStatic.phpt property_override_publicStatic_publicStatic.phpt property_override_public_private.phpt property_override_publicStatic_public.phpt constants_error_002.phpt constants_error_007.phpt property_override_private_public.phpt autoload_015.phpt constants_basic_005.phpt autoload_009.phpt constants_basic_002.phpt autoload_013.phpt new_001.phpt constants_error_003.phpt autoload_010.phpt autoload_012.phpt autoload_014.phpt property_override_privateStatic_public.phpt property_override_protectedStatic_privateStatic.phpt autoload_016.phpt property_override_protected_private.phpt property_override_public_publicStatic.phpt property_override_protectedStatic_publicStatic.phpt type_hinting_004.phpt property_override_privateStatic_protected.phpt property_override_protectedStatic_protected.phpt property_override_public_public.phpt autoload_007.phpt constants_error_004.phpt property_override_publicStatic_private.phpt property_override_protectedStatic_public.phpt constants_basic_006.phpt autoload_008.phpt property_override_privateStatic_publicStatic.phpt property_override_protectedStatic_protectedStatic.phpt Log: Adding tests for class features, including __autoload(), property inheritance rules and class constants. http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protected_publicStatic.phpt?view=markuprev=1.1 Index: php-src/tests/classes/property_override_protected_publicStatic.phpt +++ php-src/tests/classes/property_override_protected_publicStatic.phpt http://cvs.php.net/viewvc.cgi/php-src/tests/classes/property_override_protected_privateStatic.phpt?view=markuprev=1.1 Index:
[PHP-CVS] cvs: php-src /ext/reflection/tests bug43926.phpt
felipe Wed Jan 30 15:23:41 2008 UTC Modified files: /php-src/ext/reflection/tests bug43926.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/bug43926.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/reflection/tests/bug43926.phpt diff -u php-src/ext/reflection/tests/bug43926.phpt:1.3 php-src/ext/reflection/tests/bug43926.phpt:1.4 --- php-src/ext/reflection/tests/bug43926.phpt:1.3 Wed Jan 30 11:56:34 2008 +++ php-src/ext/reflection/tests/bug43926.phpt Wed Jan 30 15:23:41 2008 @@ -25,9 +25,24 @@ $ce = $re-newInstance(); print(Is? A . ($ra-isInstance($ca) ? 'true' : 'false') ., instanceof: . (($ca instanceof A) ? 'true' : 'false') .\n); -print(Is? C . ($ra-isInstance($cc) ? 'true' : 'false') ., instanceof: . (($ca instanceof C) ? 'true' : 'false') .\n); -print(Is? D . ($ra-isInstance($cd) ? 'true' : 'false') ., instanceof: . (($ca instanceof D) ? 'true' : 'false') .\n); -print(Is? E . ($ra-isInstance($ce) ? 'true' : 'false') ., instanceof: . (($ca instanceof E) ? 'true' : 'false') .\n); +print(Is? C . ($rc-isInstance($ca) ? 'true' : 'false') ., instanceof: . (($ca instanceof C) ? 'true' : 'false') .\n); +print(Is? D . ($rd-isInstance($ca) ? 'true' : 'false') ., instanceof: . (($ca instanceof D) ? 'true' : 'false') .\n); +print(Is? E . ($re-isInstance($ca) ? 'true' : 'false') ., instanceof: . (($ca instanceof E) ? 'true' : 'false') .\n); +print -\n; +print(Is? A . ($ra-isInstance($cc) ? 'true' : 'false') ., instanceof: . (($cc instanceof A) ? 'true' : 'false') .\n); +print(Is? C . ($rc-isInstance($cc) ? 'true' : 'false') ., instanceof: . (($cc instanceof C) ? 'true' : 'false') .\n); +print(Is? D . ($rd-isInstance($cc) ? 'true' : 'false') ., instanceof: . (($cc instanceof D) ? 'true' : 'false') .\n); +print(Is? E . ($re-isInstance($cc) ? 'true' : 'false') ., instanceof: . (($cc instanceof E) ? 'true' : 'false') .\n); +print -\n; +print(Is? A . ($ra-isInstance($cd) ? 'true' : 'false') ., instanceof: . (($cd instanceof A) ? 'true' : 'false') .\n); +print(Is? C . ($rc-isInstance($cd) ? 'true' : 'false') ., instanceof: . (($cd instanceof C) ? 'true' : 'false') .\n); +print(Is? D . ($rd-isInstance($cd) ? 'true' : 'false') ., instanceof: . (($cd instanceof D) ? 'true' : 'false') .\n); +print(Is? E . ($re-isInstance($cd) ? 'true' : 'false') ., instanceof: . (($cd instanceof E) ? 'true' : 'false') .\n); +print -\n; +print(Is? A . ($ra-isInstance($ce) ? 'true' : 'false') ., instanceof: . (($ce instanceof A) ? 'true' : 'false') .\n); +print(Is? C . ($rc-isInstance($ce) ? 'true' : 'false') ., instanceof: . (($ce instanceof C) ? 'true' : 'false') .\n); +print(Is? D . ($rd-isInstance($ce) ? 'true' : 'false') ., instanceof: . (($ce instanceof D) ? 'true' : 'false') .\n); +print(Is? E . ($re-isInstance($ce) ? 'true' : 'false') ., instanceof: . (($ce instanceof E) ? 'true' : 'false') .\n); ? --EXPECT-- @@ -35,8 +50,38 @@ Is? C false, instanceof: false Is? D true, instanceof: true Is? E true, instanceof: true +- +Is? A true, instanceof: true +Is? C true, instanceof: true +Is? D true, instanceof: true +Is? E true, instanceof: true +- +Is? A false, instanceof: false +Is? C false, instanceof: false +Is? D true, instanceof: true +Is? E true, instanceof: true +- +Is? A false, instanceof: false +Is? C false, instanceof: false +Is? D false, instanceof: false +Is? E true, instanceof: true --UEXPECT-- Is? A true, instanceof: true Is? C false, instanceof: false Is? D true, instanceof: true -Is? E true, instanceof: true \ No newline at end of file +Is? E true, instanceof: true +- +Is? A true, instanceof: true +Is? C true, instanceof: true +Is? D true, instanceof: true +Is? E true, instanceof: true +- +Is? A false, instanceof: false +Is? C false, instanceof: false +Is? D true, instanceof: true +Is? E true, instanceof: true +- +Is? A false, instanceof: false +Is? C false, instanceof: false +Is? D false, instanceof: false +Is? E true, instanceof: true -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rrichards Wed Jan 30 15:28:10 2008 UTC
Modified files:
/php-src/ext/libxml libxml.c
Log:
fix bug #41562 (SimpleXML memory issue)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.66r2=1.67diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.66 php-src/ext/libxml/libxml.c:1.67
--- php-src/ext/libxml/libxml.c:1.66Mon Dec 31 07:12:11 2007
+++ php-src/ext/libxml/libxml.c Wed Jan 30 15:28:09 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.66 2007/12/31 07:12:11 sebastian Exp $ */
+/* $Id: libxml.c,v 1.67 2008/01/30 15:28:09 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -141,24 +141,6 @@
/* }}} */
/* {{{ internal functions for interoperability */
-static int php_libxml_dec_node(php_libxml_node_ptr *nodeptr)
-{
- int ret_refcount;
-
- ret_refcount = --nodeptr-refcount;
- if (ret_refcount == 0) {
- if (nodeptr-node != NULL nodeptr-node-type !=
XML_DOCUMENT_NODE) {
- nodeptr-node-_private = NULL;
- }
- /* node is destroyed by another object. reset ret_refcount to 1
and node to NULL
- so the php_libxml_node_ptr is detroyed when the object is
destroyed */
- nodeptr-refcount = 1;
- nodeptr-node = NULL;
- }
-
- return ret_refcount;
-}
-
static int php_libxml_clear_object(php_libxml_node_object *object TSRMLS_DC)
{
if (object-properties) {
@@ -179,7 +161,10 @@
if (wrapper) {
php_libxml_clear_object(wrapper TSRMLS_CC);
} else {
- php_libxml_dec_node(nodeptr);
+ if (nodeptr-node != NULL nodeptr-node-type !=
XML_DOCUMENT_NODE) {
+ nodeptr-node-_private = NULL;
+ }
+ nodeptr-node = NULL;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/libxml libxml.c
rrichards Wed Jan 30 15:28:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/libxml libxml.c
Log:
MFH: fix bug #41562 (SimpleXML memory issue)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.15.2.3r2=1.32.2.7.2.15.2.4diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.3
php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.4
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.3 Mon Dec 31 07:17:09 2007
+++ php-src/ext/libxml/libxml.c Wed Jan 30 15:28:46 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.15.2.3 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.15.2.4 2008/01/30 15:28:46 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -141,24 +141,6 @@
/* }}} */
/* {{{ internal functions for interoperability */
-static int php_libxml_dec_node(php_libxml_node_ptr *nodeptr)
-{
- int ret_refcount;
-
- ret_refcount = --nodeptr-refcount;
- if (ret_refcount == 0) {
- if (nodeptr-node != NULL nodeptr-node-type !=
XML_DOCUMENT_NODE) {
- nodeptr-node-_private = NULL;
- }
- /* node is destroyed by another object. reset ret_refcount to 1
and node to NULL
- so the php_libxml_node_ptr is detroyed when the object is
destroyed */
- nodeptr-refcount = 1;
- nodeptr-node = NULL;
- }
-
- return ret_refcount;
-}
-
static int php_libxml_clear_object(php_libxml_node_object *object TSRMLS_DC)
{
if (object-properties) {
@@ -179,7 +161,10 @@
if (wrapper) {
php_libxml_clear_object(wrapper TSRMLS_CC);
} else {
- php_libxml_dec_node(nodeptr);
+ if (nodeptr-node != NULL nodeptr-node-type !=
XML_DOCUMENT_NODE) {
+ nodeptr-node-_private = NULL;
+ }
+ nodeptr-node = NULL;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/libxml libxml.c
rrichards Wed Jan 30 15:29:51 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c
Log:
MFH: fix bug #41562 (SimpleXML memory issue)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.16r2=1.32.2.7.2.17diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.16
php-src/ext/libxml/libxml.c:1.32.2.7.2.17
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.16 Mon Dec 31 07:20:07 2007
+++ php-src/ext/libxml/libxml.c Wed Jan 30 15:29:51 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.16 2007/12/31 07:20:07 sebastian Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.17 2008/01/30 15:29:51 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -141,24 +141,6 @@
/* }}} */
/* {{{ internal functions for interoperability */
-static int php_libxml_dec_node(php_libxml_node_ptr *nodeptr)
-{
- int ret_refcount;
-
- ret_refcount = --nodeptr-refcount;
- if (ret_refcount == 0) {
- if (nodeptr-node != NULL nodeptr-node-type !=
XML_DOCUMENT_NODE) {
- nodeptr-node-_private = NULL;
- }
- /* node is destroyed by another object. reset ret_refcount to 1
and node to NULL
- so the php_libxml_node_ptr is detroyed when the object is
destroyed */
- nodeptr-refcount = 1;
- nodeptr-node = NULL;
- }
-
- return ret_refcount;
-}
-
static int php_libxml_clear_object(php_libxml_node_object *object TSRMLS_DC)
{
if (object-properties) {
@@ -179,7 +161,10 @@
if (wrapper) {
php_libxml_clear_object(wrapper TSRMLS_CC);
} else {
- php_libxml_dec_node(nodeptr);
+ if (nodeptr-node != NULL nodeptr-node-type !=
XML_DOCUMENT_NODE) {
+ nodeptr-node-_private = NULL;
+ }
+ nodeptr-node = NULL;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
rrichards Wed Jan 30 15:30:44 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1066r2=1.2027.2.547.2.1067diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1066 php-src/NEWS:1.2027.2.547.2.1067 --- php-src/NEWS:1.2027.2.547.2.1066Tue Jan 29 20:25:47 2008 +++ php-src/NEWSWed Jan 30 15:30:44 2008 @@ -103,6 +103,7 @@ DateTimeZone). (Derick) - Fixed bug #41941 (oci8 extension not lib64 savvy). (Chris) - Fixed bug #41599 (setTime() fails after modify() is used). (Derick) +- Fixed bug #41562 (SimpleXML memory issue). (Rob) - Fixed bug #38468 (Unexpected creation of cycle). (Dmitry) 08 Nov 2007, PHP 5.2.5 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection/tests reflectionClass_isInstance_basic.phpt reflectionObject_isInstance_basic.phpt
felipe Wed Jan 30 16:06:44 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/reflection/tests reflectionObject_isInstance_basic.phpt reflectionClass_isInstance_basic.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u Index: php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt diff -u php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.1.2.1.2.1 php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.1.2.1.2.2 --- php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt:1.1.2.1.2.1 Wed Jan 30 11:43:10 2008 +++ php-src/ext/reflection/tests/reflectionObject_isInstance_basic.phpt Wed Jan 30 16:06:44 2008 @@ -23,9 +23,9 @@ ? --EXPECTF-- is myA a A? bool(true) -is myB a A? bool(false) +is myB a A? bool(true) is myX a A? bool(false) -is myA a B? bool(true) +is myA a B? bool(false) is myB a B? bool(true) is myX a B? bool(false) is myA a X? bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u Index: php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt diff -u php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.1.2.1.2.1 php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.1.2.1.2.2 --- php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt:1.1.2.1.2.1 Wed Jan 30 11:43:10 2008 +++ php-src/ext/reflection/tests/reflectionClass_isInstance_basic.phpt Wed Jan 30 16:06:44 2008 @@ -30,10 +30,10 @@ ? --EXPECTF-- is myA a A? bool(true) -is myB a A? bool(false) +is myB a A? bool(true) is myC a A? bool(false) is myX a A? bool(false) -is myA a B? bool(true) +is myA a B? bool(false) is myB a B? bool(true) is myC a B? bool(false) is myX a B? bool(false) @@ -43,7 +43,7 @@ is myX a C? bool(false) is myA a I? bool(false) is myB a I? bool(false) -is myC a I? bool(false) +is myC a I? bool(true) is myX a I? bool(false) is myA a X? bool(false) is myB a X? bool(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/standard/tests/math acos_error.phpt acosh_error.phpt asin_error.phpt asinh_error.phpt atan_error.phpt atanh_error.phpt cos_error.phpt cosh_error.phpt sin_error.php
zoe Wed Jan 30 17:44:54 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/mathsinh_error.phpt atan_error.phpt tan_error.phpt cosh_error.phpt asinh_error.phpt acosh_error.phpt acos_error.phpt tanh_error.phpt cos_error.phpt asin_error.phpt sin_error.phpt atanh_error.phpt Log: Removing superfluous --INI-- section http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/sinh_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/sinh_error.phpt diff -u php-src/ext/standard/tests/math/sinh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/sinh_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/sinh_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/sinh_error.phpt Wed Jan 30 17:44:54 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for sinh() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/atan_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/atan_error.phpt diff -u php-src/ext/standard/tests/math/atan_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/atan_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/atan_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/atan_error.phpt Wed Jan 30 17:44:54 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for atan() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/tan_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/tan_error.phpt diff -u php-src/ext/standard/tests/math/tan_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/tan_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/tan_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/tan_error.phpt Wed Jan 30 17:44:54 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for tan() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/cosh_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/cosh_error.phpt diff -u php-src/ext/standard/tests/math/cosh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/cosh_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/cosh_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/cosh_error.phpt Wed Jan 30 17:44:54 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for cosh() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/asinh_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/asinh_error.phpt diff -u php-src/ext/standard/tests/math/asinh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/asinh_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/asinh_error.phpt:1.1.2.1Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/asinh_error.phptWed Jan 30 17:44:54 2008 @@ -5,7 +5,6 @@ if(substr(PHP_OS, 0, 3) == WIN ) die (skip - function not supported on Windows); ? ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/acosh_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/acosh_error.phpt diff -u php-src/ext/standard/tests/math/acosh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/acosh_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/acosh_error.phpt:1.1.2.1Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/acosh_error.phptWed Jan 30 17:44:54 2008 @@ -5,7 +5,6 @@ if(substr(PHP_OS, 0, 3) == WIN ) die (skip - function not supported on Windows); ? ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/acos_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/acos_error.phpt diff -u php-src/ext/standard/tests/math/acos_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/acos_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/acos_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/acos_error.phpt Wed Jan 30 17:44:54 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for acos() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/tanh_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/math/tanh_error.phpt diff -u php-src/ext/standard/tests/math/tanh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/tanh_error.phpt:1.1.2.2 --- php-src/ext/standard/tests/math/tanh_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/math acos_error.phpt acosh_error.phpt asin_error.phpt asinh_error.phpt atan_error.phpt atanh_error.phpt cos_error.phpt cosh_error.phpt sin_error.php
zoe Wed Jan 30 17:50:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/mathtan_error.phpt asinh_error.phpt acosh_error.phpt acos_error.phpt tanh_error.phpt asin_error.phpt cos_error.phpt sin_error.phpt atanh_error.phpt sinh_error.phpt atan_error.phpt cosh_error.phpt Log: Removing superfluous --INI-- section http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/tan_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/tan_error.phpt diff -u php-src/ext/standard/tests/math/tan_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/tan_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/tan_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/tan_error.phpt Wed Jan 30 17:50:38 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for tan() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/asinh_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/asinh_error.phpt diff -u php-src/ext/standard/tests/math/asinh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/asinh_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/asinh_error.phpt:1.1.2.1Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/asinh_error.phptWed Jan 30 17:50:38 2008 @@ -5,7 +5,6 @@ if(substr(PHP_OS, 0, 3) == WIN ) die (skip - function not supported on Windows); ? ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/acosh_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/acosh_error.phpt diff -u php-src/ext/standard/tests/math/acosh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/acosh_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/acosh_error.phpt:1.1.2.1Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/acosh_error.phptWed Jan 30 17:50:38 2008 @@ -5,7 +5,6 @@ if(substr(PHP_OS, 0, 3) == WIN ) die (skip - function not supported on Windows); ? ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/acos_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/acos_error.phpt diff -u php-src/ext/standard/tests/math/acos_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/acos_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/acos_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/acos_error.phpt Wed Jan 30 17:50:38 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for acos() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/tanh_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/tanh_error.phpt diff -u php-src/ext/standard/tests/math/tanh_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/tanh_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/tanh_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/tanh_error.phpt Wed Jan 30 17:50:38 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for tanh() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/asin_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/asin_error.phpt diff -u php-src/ext/standard/tests/math/asin_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/asin_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/asin_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/asin_error.phpt Wed Jan 30 17:50:38 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for asin() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/cos_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/cos_error.phpt diff -u php-src/ext/standard/tests/math/cos_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/cos_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/cos_error.phpt:1.1.2.1 Tue Sep 4 09:01:02 2007 +++ php-src/ext/standard/tests/math/cos_error.phpt Wed Jan 30 17:50:38 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for cos() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/sin_error.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/math/sin_error.phpt diff -u php-src/ext/standard/tests/math/sin_error.phpt:1.1.2.1 php-src/ext/standard/tests/math/sin_error.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/math/sin_error.phpt:1.1.2.1 Tue Sep 4
[PHP-CVS] cvs: php-src /ext/standard/tests/math acos_error.phpt acosh_error.phpt asin_error.phpt asinh_error.phpt atan_error.phpt atanh_error.phpt cos_error.phpt cosh_error.phpt sin_error.phpt sinh_er
zoe Wed Jan 30 17:55:12 2008 UTC Modified files: /php-src/ext/standard/tests/mathcosh_error.phpt cos_error.phpt sin_error.phpt atanh_error.phpt acos_error.phpt tanh_error.phpt asin_error.phpt tan_error.phpt asinh_error.phpt sinh_error.phpt atan_error.phpt acosh_error.phpt Log: Removing superfluous --INI-- section http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/cosh_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/cosh_error.phpt diff -u php-src/ext/standard/tests/math/cosh_error.phpt:1.2 php-src/ext/standard/tests/math/cosh_error.phpt:1.3 --- php-src/ext/standard/tests/math/cosh_error.phpt:1.2 Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/cosh_error.phpt Wed Jan 30 17:55:12 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for cosh() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/cos_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/cos_error.phpt diff -u php-src/ext/standard/tests/math/cos_error.phpt:1.2 php-src/ext/standard/tests/math/cos_error.phpt:1.3 --- php-src/ext/standard/tests/math/cos_error.phpt:1.2 Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/cos_error.phpt Wed Jan 30 17:55:12 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for cos() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/sin_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/sin_error.phpt diff -u php-src/ext/standard/tests/math/sin_error.phpt:1.2 php-src/ext/standard/tests/math/sin_error.phpt:1.3 --- php-src/ext/standard/tests/math/sin_error.phpt:1.2 Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/sin_error.phpt Wed Jan 30 17:55:12 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for sin() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/atanh_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/atanh_error.phpt diff -u php-src/ext/standard/tests/math/atanh_error.phpt:1.2 php-src/ext/standard/tests/math/atanh_error.phpt:1.3 --- php-src/ext/standard/tests/math/atanh_error.phpt:1.2Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/atanh_error.phptWed Jan 30 17:55:12 2008 @@ -5,7 +5,6 @@ if(substr(PHP_OS, 0, 3) == WIN ) die (skip - function not supported on Windows); ? ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/acos_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/acos_error.phpt diff -u php-src/ext/standard/tests/math/acos_error.phpt:1.2 php-src/ext/standard/tests/math/acos_error.phpt:1.3 --- php-src/ext/standard/tests/math/acos_error.phpt:1.2 Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/acos_error.phpt Wed Jan 30 17:55:12 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for acos() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/tanh_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/tanh_error.phpt diff -u php-src/ext/standard/tests/math/tanh_error.phpt:1.2 php-src/ext/standard/tests/math/tanh_error.phpt:1.3 --- php-src/ext/standard/tests/math/tanh_error.phpt:1.2 Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/tanh_error.phpt Wed Jan 30 17:55:12 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for tanh() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/asin_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/asin_error.phpt diff -u php-src/ext/standard/tests/math/asin_error.phpt:1.2 php-src/ext/standard/tests/math/asin_error.phpt:1.3 --- php-src/ext/standard/tests/math/asin_error.phpt:1.2 Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/asin_error.phpt Wed Jan 30 17:55:12 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for asin() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/tan_error.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/math/tan_error.phpt diff -u php-src/ext/standard/tests/math/tan_error.phpt:1.2 php-src/ext/standard/tests/math/tan_error.phpt:1.3 --- php-src/ext/standard/tests/math/tan_error.phpt:1.2 Tue Sep 4 11:18:35 2007 +++ php-src/ext/standard/tests/math/tan_error.phpt Wed Jan 30 17:55:12 2008 @@ -1,6 +1,5 @@ --TEST-- Test wrong number of arguments for tan() ---INI-- --FILE-- ?php /* http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/asinh_error.phpt?r1=1.2r2=1.3diff_format=u Index:
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gmp gmp.c
iliaa Wed Jan 30 18:25:51 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gmpgmp.c
Log:
Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st argument)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.11.2.8r2=1.49.2.2.2.11.2.9diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.11.2.8
php-src/ext/gmp/gmp.c:1.49.2.2.2.11.2.9
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.11.2.8 Mon Dec 31 07:17:08 2007
+++ php-src/ext/gmp/gmp.c Wed Jan 30 18:25:51 2008
@@ -569,6 +569,9 @@
if (use_ui gmp_ui_op) {
if (allow_ui_return) {
long_result = gmp_ui_op(*gmpnum_result, *gmpnum_a,
(unsigned long)Z_LVAL_PP(b_arg));
+ if (mpz_sgn(*gmpnum_a) == -1) {
+ long_result = -long_result;
+ }
} else {
gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gmp gmp.c
iliaa Wed Jan 30 18:26:08 2008 UTC
Modified files:
/php-src/ext/gmpgmp.c
Log:
MFB: Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st argument)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.67r2=1.68diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.67 php-src/ext/gmp/gmp.c:1.68
--- php-src/ext/gmp/gmp.c:1.67 Mon Dec 31 07:12:10 2007
+++ php-src/ext/gmp/gmp.c Wed Jan 30 18:26:08 2008
@@ -577,6 +577,9 @@
if (use_ui gmp_ui_op) {
if (allow_ui_return) {
long_result = gmp_ui_op(*gmpnum_result, *gmpnum_a,
(unsigned long)Z_LVAL_PP(b_arg));
+ if (mpz_sgn(*gmpnum_a) == -1) {
+ long_result = -long_result;
+ }
} else {
gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
}
--
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/gmp gmp.c
iliaa Wed Jan 30 18:27:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gmpgmp.c
/php-srcNEWS
Log:
MFB: Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st
argument)
http://cvs.php.net/viewvc.cgi/php-src/ext/gmp/gmp.c?r1=1.49.2.2.2.12r2=1.49.2.2.2.13diff_format=u
Index: php-src/ext/gmp/gmp.c
diff -u php-src/ext/gmp/gmp.c:1.49.2.2.2.12 php-src/ext/gmp/gmp.c:1.49.2.2.2.13
--- php-src/ext/gmp/gmp.c:1.49.2.2.2.12 Mon Dec 31 07:20:06 2007
+++ php-src/ext/gmp/gmp.c Wed Jan 30 18:27:03 2008
@@ -552,6 +552,9 @@
if (use_ui gmp_ui_op) {
if (allow_ui_return) {
long_result = gmp_ui_op(*gmpnum_result, *gmpnum_a,
(unsigned long)Z_LVAL_PP(b_arg));
+ if (mpz_sgn(*gmpnum_a) == -1) {
+ long_result = -long_result;
+ }
} else {
gmp_ui_op(*gmpnum_result, *gmpnum_a, (unsigned
long)Z_LVAL_PP(b_arg));
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1067r2=1.2027.2.547.2.1068diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1067 php-src/NEWS:1.2027.2.547.2.1068
--- php-src/NEWS:1.2027.2.547.2.1067Wed Jan 30 15:30:44 2008
+++ php-src/NEWSWed Jan 30 18:27:03 2008
@@ -8,6 +8,8 @@
which to group by data is specified. (Ilia)
- Upgraded PCRE to version 7.6 (Nuno)
+- Fixed bug #43981 (gmp_div_r() does not preserve the sign of 1st argument).
+ (Ilia)
- Fixed bug #43954 (Memory leak when sending the same HTTP status code
multiple times). (Scott)
- Fixed bug #43927 (koi8r is missing from html_entity_decode()).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c
helly Wed Jan 30 23:08:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_directory.c
Log:
- Sub path may be NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.8r2=1.45.2.27.2.23.2.9diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.8
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.9
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.8 Wed Jan 30 20:31:06 2008
+++ php-src/ext/spl/spl_directory.c Wed Jan 30 23:08:13 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.8 2008/01/30 20:31:06 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.9 2008/01/30 23:08:13 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -511,7 +511,11 @@
}
efree(pnstr);
pnstr =
spl_gen_private_prop_name(spl_ce_RecursiveDirectoryIterator, subPathName,
sizeof(subPathName)-1, pnlen TSRMLS_CC);
- add_assoc_stringl_ex(zrv, pnstr, pnlen+1,
intern-u.dir.sub_path, intern-u.dir.sub_path_len, 1);
+ if (intern-u.dir.sub_path) {
+ add_assoc_stringl_ex(zrv, pnstr, pnlen+1,
intern-u.dir.sub_path, intern-u.dir.sub_path_len, 1);
+ } else {
+ add_assoc_stringl_ex(zrv, pnstr, pnlen+1, , 0, 1);
+ }
efree(pnstr);
}
if (intern-type == SPL_FS_FILE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams glob_wrapper.c
helly Wed Jan 30 23:43:05 2008 UTC
Modified files:
/php-src/main/streams glob_wrapper.c
Log:
- Get rid of overoptimization
http://cvs.php.net/viewvc.cgi/php-src/main/streams/glob_wrapper.c?r1=1.7r2=1.8diff_format=u
Index: php-src/main/streams/glob_wrapper.c
diff -u php-src/main/streams/glob_wrapper.c:1.7
php-src/main/streams/glob_wrapper.c:1.8
--- php-src/main/streams/glob_wrapper.c:1.7 Mon Dec 31 07:12:18 2007
+++ php-src/main/streams/glob_wrapper.c Wed Jan 30 23:43:05 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: glob_wrapper.c,v 1.7 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: glob_wrapper.c,v 1.8 2008/01/30 23:43:05 helly Exp $ */
#include php.h
#include php_streams_int.h
@@ -49,7 +49,7 @@
PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, int *plen
STREAMS_DC TSRMLS_DC) /* {{{ */
{
glob_s_t *pglob = (glob_s_t *)stream-abstract;
-
+
if (pglob pglob-path) {
if (plen) {
*plen = pglob-path_len;
@@ -251,9 +251,7 @@
pglob-pattern_len = strlen(pos);
pglob-pattern = estrndup(pos, pglob-pattern_len);
- if (strcspn(path, *?[) (path_len - pglob-pattern_len)) {
- pglob-flags |= GLOB_APPEND;
- }
+ pglob-flags |= GLOB_APPEND;
if (pglob-glob.gl_pathc) {
php_glob_stream_path_split(pglob, pglob-glob.gl_pathv[0], 1,
tmp TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main/streams glob_wrapper.c
helly Wed Jan 30 23:43:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams glob_wrapper.c
Log:
- MFH Get rid of overoptimization
http://cvs.php.net/viewvc.cgi/php-src/main/streams/glob_wrapper.c?r1=1.6.2.3r2=1.6.2.4diff_format=u
Index: php-src/main/streams/glob_wrapper.c
diff -u php-src/main/streams/glob_wrapper.c:1.6.2.3
php-src/main/streams/glob_wrapper.c:1.6.2.4
--- php-src/main/streams/glob_wrapper.c:1.6.2.3 Mon Dec 31 07:17:17 2007
+++ php-src/main/streams/glob_wrapper.c Wed Jan 30 23:43:13 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: glob_wrapper.c,v 1.6.2.3 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: glob_wrapper.c,v 1.6.2.4 2008/01/30 23:43:13 helly Exp $ */
#include php.h
#include php_streams_int.h
@@ -49,7 +49,7 @@
PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, int *plen
STREAMS_DC TSRMLS_DC) /* {{{ */
{
glob_s_t *pglob = (glob_s_t *)stream-abstract;
-
+
if (pglob pglob-path) {
if (plen) {
*plen = pglob-path_len;
@@ -251,9 +251,7 @@
pglob-pattern_len = strlen(pos);
pglob-pattern = estrndup(pos, pglob-pattern_len);
- if (strcspn(path, *?[) (path_len - pglob-pattern_len)) {
- pglob-flags |= GLOB_APPEND;
- }
+ pglob-flags |= GLOB_APPEND;
if (pglob-glob.gl_pathc) {
php_glob_stream_path_split(pglob, pglob-glob.gl_pathv[0], 1,
tmp TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c
helly Wed Jan 30 23:45:13 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_directory.c
Log:
- WS
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.9r2=1.45.2.27.2.23.2.10diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.9
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.10
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.9 Wed Jan 30 23:08:13 2008
+++ php-src/ext/spl/spl_directory.c Wed Jan 30 23:45:12 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.9 2008/01/30 23:08:13 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.10 2008/01/30 23:45:12 helly Exp $
*/
#ifdef HAVE_CONFIG_H
# include config.h
@@ -640,7 +640,7 @@
char *path;
int path_len;
- path = spl_filesystem_object_get_path(intern, path_len TSRMLS_CC);
+ path = spl_filesystem_object_get_path(intern, path_len TSRMLS_CC);
RETURN_STRINGL(path, path_len, 1);
}
/* }}} */
@@ -652,7 +652,7 @@
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
int path_len;
- spl_filesystem_object_get_path(intern, path_len TSRMLS_CC);
+ spl_filesystem_object_get_path(intern, path_len TSRMLS_CC);
if (path_len path_len intern-file_name_len) {
RETURN_STRINGL(intern-file_name + path_len + 1,
intern-file_name_len - (path_len + 1), 1);
@@ -685,7 +685,7 @@
return;
}
- spl_filesystem_object_get_path(intern, path_len TSRMLS_CC);
+ spl_filesystem_object_get_path(intern, path_len TSRMLS_CC);
if (path_len path_len intern-file_name_len) {
fname = intern-file_name + path_len + 1;
@@ -1034,7 +1034,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |C, ce) ==
SUCCESS) {
int path_len;
-char *path = spl_filesystem_object_get_path(intern, path_len TSRMLS_CC);
+ char *path = spl_filesystem_object_get_path(intern, path_len
TSRMLS_CC);
spl_filesystem_object_create_info(intern, path, path_len, 1,
ce, return_value TSRMLS_CC);
}
--
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 spl_directory.h
helly Wed Jan 30 23:49:49 2008 UTC
Modified files:
/php-src/ext/splspl_directory.c spl_directory.h
Log:
- MFB SplDirectoryIterator/glob:// stream integration
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.140r2=1.141diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.140
php-src/ext/spl/spl_directory.c:1.141
--- php-src/ext/spl/spl_directory.c:1.140 Mon Dec 31 07:12:15 2007
+++ php-src/ext/spl/spl_directory.c Wed Jan 30 23:49:49 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.140 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: spl_directory.c,v 1.141 2008/01/30 23:49:49 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -85,8 +85,8 @@
zend_object_std_dtor(intern-std TSRMLS_CC);
- if (intern-path.v) {
- efree(intern-path.v);
+ if (intern-_path.v) {
+ efree(intern-_path.v);
}
if (intern-file_name.v) {
efree(intern-file_name.v);
@@ -164,8 +164,31 @@
}
/* }}} */
+PHPAPI zstr spl_filesystem_object_get_path(spl_filesystem_object *intern, int
*len, zend_uchar *type TSRMLS_DC) /* {{{ */
+{
+ if (intern-type == SPL_FS_DIR) {
+ if (php_stream_is(intern-u.dir.dirp ,php_glob_stream_ops)) {
+ if (type) {
+ *type = IS_STRING;
+ }
+ zstr ret;
+ ret.s = php_glob_stream_get_path(intern-u.dir.dirp, 0,
len);
+ return ret;
+ }
+ }
+ if (len) {
+ *len = intern-_path_len;
+ }
+ if (type) {
+ *type = intern-_path_type;
+ }
+ return intern-_path;
+} /* }}} */
+
static inline void spl_filesystem_object_get_file_name(spl_filesystem_object
*intern TSRMLS_DC) /* {{{ */
{
+ zstr path;
+ zend_uchar path_type;
if (!intern-file_name.v) {
switch (intern-type) {
case SPL_FS_INFO:
@@ -173,8 +196,9 @@
php_error_docref(NULL TSRMLS_CC, E_ERROR, Object not
initialized);
break;
case SPL_FS_DIR:
- intern-file_name_len = zspprintf(intern-path_type,
intern-file_name, 0, %R%c%s, intern-path_type, intern-path,
DEFAULT_SLASH, intern-u.dir.entry.d_name);
- intern-file_name_type = intern-path_type;
+ path = spl_filesystem_object_get_path(intern, NULL,
path_type TSRMLS_CC);
+ intern-file_name_len = zspprintf(path_type,
intern-file_name, 0, %R%c%s, path_type, path, DEFAULT_SLASH,
intern-u.dir.entry.d_name);
+ intern-file_name_type = path_type;
break;
}
}
@@ -189,10 +213,11 @@
return 0;
} else {
if (intern-flags SPL_FILE_DIR_GLOB_REFETCH_PATH) {
- if (intern-path.v) {
- efree(intern-path.v);
+ if (intern-_path.v) {
+ efree(intern-_path.v);
}
- intern-path.s =
php_glob_stream_get_path(intern-u.dir.dirp, 1, intern-path_len);
+ intern-_path.s =
php_glob_stream_get_path(intern-u.dir.dirp, 1, intern-_path_len);
+ intern-_path_type = IS_STRING;
}
return 1;
}
@@ -210,13 +235,13 @@
}
intern-type = SPL_FS_DIR;
- intern-path_type= type;
- intern-path_len = path_len;
+ intern-_path_type= type;
+ intern-_path_len = path_len;
intern-u.dir.dirp = php_stream_u_opendir(type, path, path_len,
options, NULL);
if (intern-u.dir.dirp php_stream_is(intern-u.dir.dirp,
php_glob_stream_ops)) {
- intern-path.s = php_glob_stream_get_path(intern-u.dir.dirp,
1, intern-path_len);
- intern-path_type = IS_STRING;
+ intern-_path.s = php_glob_stream_get_path(intern-u.dir.dirp,
1, intern-_path_len);
+ intern-_path_type = IS_STRING;
intern-flags |= SPL_FILE_DIR_GLOB_USE;
php_glob_stream_get_count(intern-u.dir.dirp, flags);
if (flags GLOB_APPEND) {
@@ -224,11 +249,11 @@
} else {
intern-flags = ~SPL_FILE_DIR_GLOB_REFETCH_PATH;
}
- } else if (intern-path_len IS_SLASH_AT(type, path,
intern-path_len-1)) {
- intern-path = ezstrndup(type, path, --intern-path_len);
+ } else if (intern-_path_len IS_SLASH_AT(type, path,
intern-_path_len-1)) {
+ intern-_path = ezstrndup(type, path, --intern-_path_len);
intern-flags =
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/oci8 oci8_statement.c /ext/oci8/tests bug42841.phpt
sixdThu Jan 31 00:26:44 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/oci8/tests bug42841.phpt
Modified files:
/php-src/ext/oci8 oci8_statement.c
Log:
Fixed bug #42841 (REF CURSOR and oci_new_cursor PHP crash)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.14.2.30r2=1.7.2.14.2.31diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.30
php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.31
--- php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.30 Mon Dec 31 07:20:09 2007
+++ php-src/ext/oci8/oci8_statement.c Thu Jan 31 00:26:43 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_statement.c,v 1.7.2.14.2.30 2007/12/31 07:20:09 sebastian Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.14.2.31 2008/01/31 00:26:43 sixd Exp $ */
#ifdef HAVE_CONFIG_H
@@ -1174,6 +1174,14 @@
}
if (Z_TYPE_P(val) == IS_RESOURCE) {
+ /* Processing for ref-cursor out binds */
+ if (phpbind-statement != NULL) {
+ *bufpp = phpbind-statement;
+ *alenpp = phpbind-dummy_len;
+ *piecep = OCI_ONE_PIECE;
+ *rcodepp = phpbind-retcode;
+ *indpp = phpbind-indicator;
+ }
retval = OCI_CONTINUE;
} else if (Z_TYPE_P(val) == IS_OBJECT) {
if (!phpbind-descriptor) {
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/bug42841.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/bug42841.phpt
+++ php-src/ext/oci8/tests/bug42841.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c
auroraeosrose Thu Jan 31 02:35:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_directory.c
Log:
Fix windows build
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.10r2=1.45.2.27.2.23.2.11diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.10
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.11
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.10 Wed Jan 30 23:45:12 2008
+++ php-src/ext/spl/spl_directory.c Thu Jan 31 02:35:44 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.10 2008/01/30 23:45:12 helly Exp $
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.11 2008/01/31 02:35:44
auroraeosrose Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -194,7 +194,7 @@
if (intern-_path_len (path[intern-_path_len-1] == '/'
#if defined(PHP_WIN32) || defined(NETWARE)
- || path[intern-path_len-1] == '\\'
+ || path[intern-_path_len-1] == '\\'
#endif
)) {
intern-_path = estrndup(path, --intern-_path_len);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests dit_001.phpt
helly Thu Jan 31 07:43:49 2008 UTC
Modified files:
/php-src/ext/spl/tests dit_001.phpt
Log:
- Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_001.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/spl/tests/dit_001.phpt
diff -u php-src/ext/spl/tests/dit_001.phpt:1.4
php-src/ext/spl/tests/dit_001.phpt:1.5
--- php-src/ext/spl/tests/dit_001.phpt:1.4 Sat Jan 20 16:19:20 2007
+++ php-src/ext/spl/tests/dit_001.phpt Thu Jan 31 07:43:49 2008
@@ -12,9 +12,13 @@
?
===DONE===
--EXPECTF--
-object(DirectoryIterator)#%d (1) {
+object(DirectoryIterator)#%d (3) {
%spathName%sSplFileInfo:private]=
%s(1) .
+ %sglob%sRecursiveDirectoryIterator:private]=
+ bool(false)
+ %ssubPathName%sRecursiveDirectoryIterator:private]=
+ %s(0)
}
bool(false)
bool(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_3) /ext/spl/tests dit_001.phpt
helly Thu Jan 31 07:44:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl/tests dit_001.phpt
Log:
- MFH Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_001.phpt?r1=1.3.6.1r2=1.3.6.2diff_format=u
Index: php-src/ext/spl/tests/dit_001.phpt
diff -u php-src/ext/spl/tests/dit_001.phpt:1.3.6.1
php-src/ext/spl/tests/dit_001.phpt:1.3.6.2
--- php-src/ext/spl/tests/dit_001.phpt:1.3.6.1 Fri Nov 2 19:41:10 2007
+++ php-src/ext/spl/tests/dit_001.phpt Thu Jan 31 07:44:01 2008
@@ -12,9 +12,13 @@
?
===DONE===
--EXPECTF--
-object(DirectoryIterator)#%d (1) {
+object(DirectoryIterator)#%d (3) {
%spathName%sSplFileInfo:private]=
%s(1) .
+ %sglob%sRecursiveDirectoryIterator:private]=
+ bool(false)
+ %ssubPathName%sRecursiveDirectoryIterator:private]=
+ %s(0)
}
bool(false)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
