[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
lbarnaudFri May 22 11:23:22 2009 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.1517r2=1.2027.2.547.2.1518diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1517 php-src/NEWS:1.2027.2.547.2.1518 --- php-src/NEWS:1.2027.2.547.2.1517Thu May 21 16:05:10 2009 +++ php-src/NEWSFri May 22 11:23:21 2009 @@ -97,6 +97,8 @@ - Fixed bug #47254 (Wrong Reflection for extends class). (Felipe) - Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with different bit numbers). (Matt) +- Fixed bug #46812 (get_class_vars() does not include visible private variable + looking at subclass). (Arnaud) - Fixed bug #45997 (safe_mode bypass with exec/system/passthru (windows only)). (Pierre) - Fixed bug #45877 (Array key '2147483647' left as string). (Matt) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc/tests bug44996.phpt
felipe Fri May 22 12:38:32 2009 UTC
Added files:
/php-src/ext/xmlrpc/tests bug44996.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug44996.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug44996.phpt
+++ php-src/ext/xmlrpc/tests/bug44996.phpt
--TEST--
Bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime)
--FILE--
?php
function DecodeDatetime($datetime) {
print \nISO 8601 datetime $datetime\n;
$obj = xmlrpc_decode(?xml
version=\1.0\?methodResponseparamsparamvaluedateTime.iso8601$datetime/dateTime.iso8601/value/param/params/methodResponse);
print_r($obj);
}
DecodeDatetime(20010909T01:46:40Z);
DecodeDatetime(20010909T00:46:40-01);
DecodeDatetime(2001-09-09T08:46:40+07:00);
DecodeDatetime(2001-09-08T21:46:40-0400);
?
--EXPECT--
ISO 8601 datetime 20010909T01:46:40Z
stdClass Object
(
[scalar] = 20010909T01:46:40Z
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 20010909T00:46:40-01
stdClass Object
(
[scalar] = 20010909T00:46:40-01
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 2001-09-09T08:46:40+07:00
stdClass Object
(
[scalar] = 2001-09-09T08:46:40+07:00
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 2001-09-08T21:46:40-0400
stdClass Object
(
[scalar] = 2001-09-08T21:46:40-0400
[xmlrpc_type] = datetime
[timestamp] = 10
)
--
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/xmlrpc/tests bug44996.phpt
felipe Fri May 22 12:38:57 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/xmlrpc/tests bug44996.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug44996.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug44996.phpt
+++ php-src/ext/xmlrpc/tests/bug44996.phpt
--TEST--
Bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime)
--FILE--
?php
function DecodeDatetime($datetime) {
print \nISO 8601 datetime $datetime\n;
$obj = xmlrpc_decode(?xml
version=\1.0\?methodResponseparamsparamvaluedateTime.iso8601$datetime/dateTime.iso8601/value/param/params/methodResponse);
print_r($obj);
}
DecodeDatetime(20010909T01:46:40Z);
DecodeDatetime(20010909T00:46:40-01);
DecodeDatetime(2001-09-09T08:46:40+07:00);
DecodeDatetime(2001-09-08T21:46:40-0400);
?
--EXPECT--
ISO 8601 datetime 20010909T01:46:40Z
stdClass Object
(
[scalar] = 20010909T01:46:40Z
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 20010909T00:46:40-01
stdClass Object
(
[scalar] = 20010909T00:46:40-01
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 2001-09-09T08:46:40+07:00
stdClass Object
(
[scalar] = 2001-09-09T08:46:40+07:00
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 2001-09-08T21:46:40-0400
stdClass Object
(
[scalar] = 2001-09-08T21:46:40-0400
[xmlrpc_type] = datetime
[timestamp] = 10
)
--
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/xmlrpc/tests bug44996.phpt
felipe Fri May 22 12:39:14 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests bug44996.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug44996.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug44996.phpt
+++ php-src/ext/xmlrpc/tests/bug44996.phpt
--TEST--
Bug #44996 (xmlrpc_decode() ignores time zone on iso8601.datetime)
--FILE--
?php
function DecodeDatetime($datetime) {
print \nISO 8601 datetime $datetime\n;
$obj = xmlrpc_decode(?xml
version=\1.0\?methodResponseparamsparamvaluedateTime.iso8601$datetime/dateTime.iso8601/value/param/params/methodResponse);
print_r($obj);
}
DecodeDatetime(20010909T01:46:40Z);
DecodeDatetime(20010909T00:46:40-01);
DecodeDatetime(2001-09-09T08:46:40+07:00);
DecodeDatetime(2001-09-08T21:46:40-0400);
?
--EXPECT--
ISO 8601 datetime 20010909T01:46:40Z
stdClass Object
(
[scalar] = 20010909T01:46:40Z
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 20010909T00:46:40-01
stdClass Object
(
[scalar] = 20010909T00:46:40-01
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 2001-09-09T08:46:40+07:00
stdClass Object
(
[scalar] = 2001-09-09T08:46:40+07:00
[xmlrpc_type] = datetime
[timestamp] = 10
)
ISO 8601 datetime 2001-09-08T21:46:40-0400
stdClass Object
(
[scalar] = 2001-09-08T21:46:40-0400
[xmlrpc_type] = datetime
[timestamp] = 10
)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc xmlrpc-epi-php.c
felipe Fri May 22 12:49:22 2009 UTC
Modified files:
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
- Fixed invalid date checking
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.72r2=1.73diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.72
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.73
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.72Tue May 19 16:32:22 2009
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri May 22 12:49:22 2009
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.72 2009/05/19 16:32:22 kalle Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.73 2009/05/22 12:49:22 felipe Exp $ */
/**
* BUGS: *
@@ -1352,7 +1352,7 @@
XMLRPC_VALUE v =
XMLRPC_CreateValueDateTime_ISO8601(NULL, value-value.str.val);
if (v) {
time_t timestamp = (time_t)
php_parse_date((char *)XMLRPC_GetValueDateTime_ISO8601(v), NULL);
- if (timestamp) {
+ if (timestamp != -1) {
zval* ztimestamp;
MAKE_STD_ZVAL(ztimestamp);
--
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/xmlrpc xmlrpc-epi-php.c
felipe Fri May 22 12:49:41 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
- MFH: Fixed invalid date checking
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6.2.22r2=1.39.2.5.2.6.2.23diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.22
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.23
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.22 Thu May 14
12:29:47 2009
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri May 22 12:49:40 2009
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.22 2009/05/14 12:29:47 iliaa Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.23 2009/05/22 12:49:40 felipe Exp $
*/
/**
* BUGS: *
@@ -1346,7 +1346,7 @@
XMLRPC_VALUE v =
XMLRPC_CreateValueDateTime_ISO8601(NULL, value-value.str.val);
if (v) {
time_t timestamp = (time_t)
php_parse_date((char *)XMLRPC_GetValueDateTime_ISO8601(v), NULL);
- if (timestamp) {
+ if (timestamp != -1) {
zval* ztimestamp;
MAKE_STD_ZVAL(ztimestamp);
--
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/xmlrpc xmlrpc-epi-php.c
felipe Fri May 22 12:50:44 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
- MFH: Fixed invalid date checking
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.16r2=1.39.2.5.2.17diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.16
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.17
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.16 Thu May 14 12:36:19 2009
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri May 22 12:50:44 2009
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.16 2009/05/14 12:36:19 iliaa Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.17 2009/05/22 12:50:44 felipe Exp $ */
/**
* BUGS: *
@@ -1302,7 +1302,7 @@
XMLRPC_VALUE v =
XMLRPC_CreateValueDateTime_ISO8601(NULL, value-value.str.val);
if(v) {
time_t timestamp = (time_t)
php_parse_date((char *)XMLRPC_GetValueDateTime_ISO8601(v), NULL);
- if(timestamp) {
+ if (timestamp != -1) {
zval* ztimestamp;
MAKE_STD_ZVAL(ztimestamp);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3/tests sqlite3_open_empty_string.phpt
kalle Fri May 22 18:22:20 2009 UTC
Modified files:
/php-src/ext/sqlite3/tests sqlite3_open_empty_string.phpt
Log:
Added missing SKIPIF
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
diff -u php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt:1.1
php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt:1.2
--- php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt:1.1Sun May
17 16:51:22 2009
+++ php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phptFri May 22
18:22:15 2009
@@ -3,6 +3,8 @@
--CREDITS--
Thijs Feryn th...@feryn.eu
#TestFest PHPBelgium 2009
+--SKIPIF--
+?php require_once(dirname(__FILE__) . '/skipif.inc'); ?
--FILE--
?php
try{
--
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/sqlite3/tests sqlite3_open_empty_string.phpt
kalle Fri May 22 18:22:30 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3/tests sqlite3_open_empty_string.phpt
Log:
MFH: Added missing SKIPIF
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt
diff -u php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt:1.1.2.2
php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt:1.1.2.3
--- php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phpt:1.1.2.2Sun May
17 16:51:59 2009
+++ php-src/ext/sqlite3/tests/sqlite3_open_empty_string.phptFri May 22
18:22:30 2009
@@ -3,6 +3,8 @@
--CREDITS--
Thijs Feryn th...@feryn.eu
#TestFest PHPBelgium 2009
+--SKIPIF--
+?php require_once(dirname(__FILE__) . '/skipif.inc'); ?
--FILE--
?php
try{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3/tests sqlite3_21_security.phpt
kalle Fri May 22 18:27:27 2009 UTC Modified files: /php-src/ext/sqlite3/tests sqlite3_21_security.phpt Log: Fix test on Windows http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_21_security.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/sqlite3/tests/sqlite3_21_security.phpt diff -u php-src/ext/sqlite3/tests/sqlite3_21_security.phpt:1.3 php-src/ext/sqlite3/tests/sqlite3_21_security.phpt:1.4 --- php-src/ext/sqlite3/tests/sqlite3_21_security.phpt:1.3 Tue Feb 10 00:44:09 2009 +++ php-src/ext/sqlite3/tests/sqlite3_21_security.phpt Fri May 22 18:27:27 2009 @@ -31,6 +31,6 @@ bool(true) Above test directory -Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s/sqlite3_21_security.php on line %d +Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %ssqlite3_21_security.php on line %d open_basedir prohibits opening %s Done -- 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/sqlite3/tests sqlite3_21_security.phpt
kalle Fri May 22 18:27:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3/tests sqlite3_21_security.phpt
Log:
MFH: Fix test on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_21_security.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_21_security.phpt
diff -u php-src/ext/sqlite3/tests/sqlite3_21_security.phpt:1.1.2.3
php-src/ext/sqlite3/tests/sqlite3_21_security.phpt:1.1.2.4
--- php-src/ext/sqlite3/tests/sqlite3_21_security.phpt:1.1.2.3 Tue Feb 10
00:24:33 2009
+++ php-src/ext/sqlite3/tests/sqlite3_21_security.phpt Fri May 22 18:27:38 2009
@@ -31,9 +31,9 @@
bool(true)
Above test directory
-Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s)
is not within the allowed path(s): (.) in %s/sqlite3_21_security.php on line %d
-exception 'Exception' with message 'open_basedir prohibits opening %s' in
%s/sqlite3_21_security.php:%d
+Warning: SQLite3::__construct(): open_basedir restriction in effect. File(%s)
is not within the allowed path(s): (.) in %ssqlite3_21_security.php on line %d
+exception 'Exception' with message 'open_basedir prohibits opening %s' in
%ssqlite3_21_security.php:%d
Stack trace:
-#0 %s/sqlite3_21_security.php(%d): SQLite3-__construct('%s')
+#0 %ssqlite3_21_security.php(%d): SQLite3-__construct('%s')
#1 {main}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 config.w32
kalle Fri May 22 19:41:03 2009 UTC
Modified files:
/php-src/ext/sqlite3config.w32
Log:
Don't build SQLite threadsafe on NTS builds
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.3 php-src/ext/sqlite3/config.w32:1.4
--- php-src/ext/sqlite3/config.w32:1.3 Tue Aug 5 20:22:53 2008
+++ php-src/ext/sqlite3/config.w32 Fri May 22 19:41:03 2009
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.3 2008/08/05 20:22:53 auroraeosrose Exp $
+// $Id: config.w32,v 1.4 2009/05/22 19:41:03 kalle Exp $
// vim:ft=javascript
ARG_WITH(sqlite3, SQLite 3 support, no);
if (PHP_SQLITE3 != no) {
- ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE=1 /D
SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
+ ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS ? 1 :
0) + /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
EXTENSION(sqlite3, sqlite3.c, null, /I + configure_module_dirname
+ /libsqlite /I + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + /libsqlite, sqlite3.c,
sqlite3);
--
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/sqlite3 config.w32
kalle Fri May 22 19:41:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3config.w32
Log:
MFH: Don't build SQLite threadsafe on NTS builds
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.1.2.2
php-src/ext/sqlite3/config.w32:1.1.2.3
--- php-src/ext/sqlite3/config.w32:1.1.2.2 Tue Aug 5 20:16:21 2008
+++ php-src/ext/sqlite3/config.w32 Fri May 22 19:41:15 2009
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.1.2.2 2008/08/05 20:16:21 auroraeosrose Exp $
+// $Id: config.w32,v 1.1.2.3 2009/05/22 19:41:15 kalle Exp $
// vim:ft=javascript
ARG_WITH(sqlite3, SQLite 3 support, no);
if (PHP_SQLITE3 != no) {
- ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE=1 /D
SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
+ ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS ? 1 :
0) + /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
EXTENSION(sqlite3, sqlite3.c, null, /I + configure_module_dirname
+ /libsqlite /I + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + /libsqlite, sqlite3.c,
sqlite3);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 config.w32
kalle Fri May 22 19:46:53 2009 UTC
Modified files:
/php-src/ext/sqlite3config.w32
Log:
Previous commit was an old version of the patch, PHP_ZTS is not a boolean but
the behaviour is still correct
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.4 php-src/ext/sqlite3/config.w32:1.5
--- php-src/ext/sqlite3/config.w32:1.4 Fri May 22 19:41:03 2009
+++ php-src/ext/sqlite3/config.w32 Fri May 22 19:46:53 2009
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.4 2009/05/22 19:41:03 kalle Exp $
+// $Id: config.w32,v 1.5 2009/05/22 19:46:53 kalle Exp $
// vim:ft=javascript
ARG_WITH(sqlite3, SQLite 3 support, no);
if (PHP_SQLITE3 != no) {
- ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS ? 1 :
0) + /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
+ ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS == yes
? 1 : 0) + /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
EXTENSION(sqlite3, sqlite3.c, null, /I + configure_module_dirname
+ /libsqlite /I + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + /libsqlite, sqlite3.c,
sqlite3);
--
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/sqlite3 config.w32
kalle Fri May 22 19:47:15 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3config.w32
Log:
MFH: Previous commit was an old version of the patch, PHP_ZTS is not a
boolean but the behaviour is still correct
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.w32?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/sqlite3/config.w32
diff -u php-src/ext/sqlite3/config.w32:1.1.2.3
php-src/ext/sqlite3/config.w32:1.1.2.4
--- php-src/ext/sqlite3/config.w32:1.1.2.3 Fri May 22 19:41:15 2009
+++ php-src/ext/sqlite3/config.w32 Fri May 22 19:47:15 2009
@@ -1,10 +1,11 @@
-// $Id: config.w32,v 1.1.2.3 2009/05/22 19:41:15 kalle Exp $
+// $Id: config.w32,v 1.1.2.4 2009/05/22 19:47:15 kalle Exp $
// vim:ft=javascript
ARG_WITH(sqlite3, SQLite 3 support, no);
if (PHP_SQLITE3 != no) {
- ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS ? 1 :
0) + /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
+WARNING(PHP_ZTS);
+ ADD_FLAG(CFLAGS_SQLITE3, /D SQLITE_THREADSAFE= + (PHP_ZTS == yes
? 1 : 0) + /D SQLITE_ENABLE_FTS3=1 /D SQLITE_CORE=1 );
EXTENSION(sqlite3, sqlite3.c, null, /I + configure_module_dirname
+ /libsqlite /I + configure_module_dirname);
ADD_SOURCES(configure_module_dirname + /libsqlite, sqlite3.c,
sqlite3);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests DOMAttr_construct_error_001.phpt
ericstewart Sat May 23 01:32:57 2009 UTC
Added files:
/php-src/ext/dom/tests DOMAttr_construct_error_001.phpt
Log:
New test: DOMAttr __construct() with no arguments.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt
--TEST--
DOMAttr __construct() with no arguments.
--CREDITS--
Josh Sweeney jswee...@alt-invest.net
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr();
?
--EXPECTF--
Fatal error: Uncaught exception 'DOMException' with message
'DOMAttr::__construct() expects at least 1 parameter, 0 given' in %s:%d
Stack trace:
#0 %s(%d): DOMAttr-__construct()
#1 {main}
thrown in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom/tests DOMAttr_construct_error_001.phpt
ericstewart Sat May 23 01:33:40 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests DOMAttr_construct_error_001.phpt
Log:
New test: DOMAttr __construct() with no arguments.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt
--TEST--
DOMAttr __construct() with no arguments.
--CREDITS--
Josh Sweeney jswee...@alt-invest.net
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr();
?
--EXPECTF--
Fatal error: Uncaught exception 'DOMException' with message
'DOMAttr::__construct() expects at least 1 parameter, 0 given' in %s:%d
Stack trace:
#0 %s(%d): DOMAttr-__construct()
#1 {main}
thrown in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests DOMAttr_construct_error_001.phpt
ericstewart Sat May 23 01:34:05 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests DOMAttr_construct_error_001.phpt
Log:
New test: DOMAttr __construct() with no arguments.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_construct_error_001.phpt
--TEST--
DOMAttr __construct() with no arguments.
--CREDITS--
Josh Sweeney jswee...@alt-invest.net
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr();
?
--EXPECTF--
Fatal error: Uncaught exception 'DOMException' with message
'DOMAttr::__construct() expects at least 1 parameter, 0 given' in %s:%d
Stack trace:
#0 %s(%d): DOMAttr-__construct()
#1 {main}
thrown in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom/tests DOMAttr_name_basic_001.phpt DOMAttr_ownerElement_error_001.phpt DOMAttr_value_basic_002.phpt DOMCDATASection_construct_error_001.phpt DOMCharacterData_data_error_
ericstewart Sat May 23 01:41:27 2009 UTC
Added files:
/php-src/ext/dom/tests DOMAttr_name_basic_001.phpt
DOMAttr_ownerElement_error_001.phpt
DOMAttr_value_basic_002.phpt
DOMCDATASection_construct_error_001.phpt
DOMCharacterData_data_error_002.phpt
Log:
New test: DOMAttr read $name property.
New test: DOMAttr read $ownerElement with null parent.
New test: DOMAttr write non-string $value property
New test: DOMCDATASection __construct() with no arguments.
New test: DOMCharacterData - Invalid State Error when getting data out of
content.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt
--TEST--
DOMAttr read $name property.
--CREDITS--
Nic Rosental nicrosen...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr('category', 'books');
print $attr-name;
?
--EXPECT--
category
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
--TEST--
Read $ownerElement with null parent.
--CREDITS--
Travis Pew
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$document = new DOMDocument;
$root = $document-createElement('root');
$document-appendChild($root);
$attr = $root-setAttribute('category', 'books');
$document-removeChild($root);
$root = null;
var_dump($attr-ownerElement);
?
--EXPECTF--
Warning: Couldn't fetch DOMAttr. Node no longer exists in %s on line %d
Notice: Undefined property: DOMAttr::$ownerElement in %s on line %d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt
+++ php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt
--TEST--
Write non-string $value property
--CREDIT--
Eric Berg ehb...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr('category');
$attr-value = 1;
print $attr-value;
?
--EXPECTF--
1
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
+++ php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
--TEST--
__construct() with no arguments.
--CREDITS--
Nic Rosental nicrosen...@gmail.com
# TestFest Atlanta 2009-5-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
try
{
$section = new DOMCDataSection();
}
catch (Exception $e)
{
echo $e-getMessage();
}
?
--EXPECT--
DOMCdataSection::__construct() expects exactly 1 parameter, 0 given
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt
+++ php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt
--TEST--
Invalid State Error when getting data on DOMCharacterData out of content.
--CREDIT--
Eric Berg ehb...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$character_data = new DOMCharacterData();
print $character_data-data;
?
--EXPECTF--
Warning: main(): Invalid State Error in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom/tests DOMAttr_name_basic_001.phpt DOMAttr_ownerElement_error_001.phpt DOMAttr_value_basic_002.phpt DOMCDATASection_construct_error_001.phpt DOMCharacterData_da
ericstewart Sat May 23 01:42:37 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/dom/tests DOMAttr_name_basic_001.phpt
DOMAttr_ownerElement_error_001.phpt
DOMAttr_value_basic_002.phpt
DOMCDATASection_construct_error_001.phpt
DOMCharacterData_data_error_002.phpt
Log:
New test: DOMAttr read $name property.
New test: DOMAttr read $ownerElement with null parent.
New test: DOMAttr write non-string $value property
New test: DOMCDATASection __construct() with no arguments.
New test: DOMCharacterData - Invalid State Error when getting data out of
content.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt
--TEST--
DOMAttr read $name property.
--CREDITS--
Nic Rosental nicrosen...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr('category', 'books');
print $attr-name;
?
--EXPECT--
category
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
--TEST--
Read $ownerElement with null parent.
--CREDITS--
Travis Pew
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$document = new DOMDocument;
$root = $document-createElement('root');
$document-appendChild($root);
$attr = $root-setAttribute('category', 'books');
$document-removeChild($root);
$root = null;
var_dump($attr-ownerElement);
?
--EXPECTF--
Warning: Couldn't fetch DOMAttr. Node no longer exists in %s on line %d
Notice: Undefined property: DOMAttr::$ownerElement in %s on line %d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt
+++ php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt
--TEST--
Write non-string $value property
--CREDIT--
Eric Berg ehb...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr('category');
$attr-value = 1;
print $attr-value;
?
--EXPECTF--
1
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
+++ php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
--TEST--
__construct() with no arguments.
--CREDITS--
Nic Rosental nicrosen...@gmail.com
# TestFest Atlanta 2009-5-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
try
{
$section = new DOMCDataSection();
}
catch (Exception $e)
{
echo $e-getMessage();
}
?
--EXPECT--
DOMCdataSection::__construct() expects exactly 1 parameter, 0 given
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt
+++ php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt
--TEST--
Invalid State Error when getting data on DOMCharacterData out of content.
--CREDIT--
Eric Berg ehb...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$character_data = new DOMCharacterData();
print $character_data-data;
?
--EXPECTF--
Warning: main(): Invalid State Error in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom/tests DOMAttr_name_basic_001.phpt DOMAttr_ownerElement_error_001.phpt DOMAttr_value_basic_002.phpt DOMCDATASection_construct_error_001.phpt DOMCharacterData_da
ericstewart Sat May 23 01:43:48 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests DOMAttr_name_basic_001.phpt
DOMAttr_ownerElement_error_001.phpt
DOMAttr_value_basic_002.phpt
DOMCDATASection_construct_error_001.phpt
DOMCharacterData_data_error_002.phpt
Log:
New test: DOMAttr read $name property.
New test: DOMAttr read $ownerElement with null parent.
New test: DOMAttr write non-string $value property
New test: DOMCDATASection __construct() with no arguments.
New test: DOMCharacterData - Invalid State Error when getting data out of
content.
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_name_basic_001.phpt
--TEST--
DOMAttr read $name property.
--CREDITS--
Nic Rosental nicrosen...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr('category', 'books');
print $attr-name;
?
--EXPECT--
category
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
+++ php-src/ext/dom/tests/DOMAttr_ownerElement_error_001.phpt
--TEST--
Read $ownerElement with null parent.
--CREDITS--
Travis Pew
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$document = new DOMDocument;
$root = $document-createElement('root');
$document-appendChild($root);
$attr = $root-setAttribute('category', 'books');
$document-removeChild($root);
$root = null;
var_dump($attr-ownerElement);
?
--EXPECTF--
Warning: Couldn't fetch DOMAttr. Node no longer exists in %s on line %d
Notice: Undefined property: DOMAttr::$ownerElement in %s on line %d
NULL
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt
+++ php-src/ext/dom/tests/DOMAttr_value_basic_002.phpt
--TEST--
Write non-string $value property
--CREDIT--
Eric Berg ehb...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$attr = new DOMAttr('category');
$attr-value = 1;
print $attr-value;
?
--EXPECTF--
1
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
+++ php-src/ext/dom/tests/DOMCDATASection_construct_error_001.phpt
--TEST--
__construct() with no arguments.
--CREDITS--
Nic Rosental nicrosen...@gmail.com
# TestFest Atlanta 2009-5-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
try
{
$section = new DOMCDataSection();
}
catch (Exception $e)
{
echo $e-getMessage();
}
?
--EXPECT--
DOMCdataSection::__construct() expects exactly 1 parameter, 0 given
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt
+++ php-src/ext/dom/tests/DOMCharacterData_data_error_002.phpt
--TEST--
Invalid State Error when getting data on DOMCharacterData out of content.
--CREDIT--
Eric Berg ehb...@gmail.com
# TestFest Atlanta 2009-05-14
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
$character_data = new DOMCharacterData();
print $character_data-data;
?
--EXPECTF--
Warning: main(): Invalid State Error in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c
kalle Sat May 23 02:58:16 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli mysqli_api.c Log: Fixed compiler warning again, uint8_t is only available with mysqlnd. This is not affecting HEAD http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.26r2=1.118.2.22.2.16.2.27diff_format=u Index: php-src/ext/mysqli/mysqli_api.c diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.26 php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.27 --- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.26Wed May 20 13:10:49 2009 +++ php-src/ext/mysqli/mysqli_api.c Sat May 23 02:58:15 2009 @@ -17,7 +17,7 @@ | Ulf Wendel u...@php.net | +--+ - $Id: mysqli_api.c,v 1.118.2.22.2.16.2.26 2009/05/20 13:10:49 iliaa Exp $ + $Id: mysqli_api.c,v 1.118.2.22.2.16.2.27 2009/05/23 02:58:15 kalle Exp $ */ #ifdef HAVE_CONFIG_H @@ -2081,7 +2081,11 @@ return; } MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, mysql_link, mysqli_link, MYSQLI_STATUS_INITIALIZED); +#ifdef MYSQLI_USE_MYSQLND + RETURN_BOOL(!mysql_refresh(mysql-mysql, (uint8_t) options)); +#else RETURN_BOOL(!mysql_refresh(mysql-mysql, options)); +#endif } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
