[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacTue Jan 13 02:54:37 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.449&r2=1.2027.2.547.2.965.2.450&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.449 php-src/NEWS:1.2027.2.547.2.965.2.450 --- php-src/NEWS:1.2027.2.547.2.965.2.449 Mon Jan 12 22:24:31 2009 +++ php-src/NEWSTue Jan 13 02:54:37 2009 @@ -16,6 +16,7 @@ - Re-enabled socket_create_pair() on Windows. (Kalle) - Fixed building of pdo_sqlite without sqlite3. (Scott) +- Added table info to PDO::getColumnMeta() with SQLite. (Martin Jansen, Scott) - Added support for old style DNS functions. (Scott) - Added mail logging functionality that allows logging of mail sent via mail() function. (Ilia) -- 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/pdo_sqlite config.m4 sqlite_statement.c /ext/pdo_sqlite/tests bug_42589.phpt /ext/sqlite3 config0.m4
scottmacTue Jan 13 02:50:54 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/tests bug_42589.phpt
Modified files:
/php-src/ext/sqlite3config0.m4
/php-src/ext/pdo_sqlite config.m4 sqlite_statement.c
Log:
MFH Add table key to getColumnMeta() with SQLite
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config0.m4?r1=1.1.2.10&r2=1.1.2.11&diff_format=u
Index: php-src/ext/sqlite3/config0.m4
diff -u php-src/ext/sqlite3/config0.m4:1.1.2.10
php-src/ext/sqlite3/config0.m4:1.1.2.11
--- php-src/ext/sqlite3/config0.m4:1.1.2.10 Sat Jan 10 01:46:55 2009
+++ php-src/ext/sqlite3/config0.m4 Tue Jan 13 02:50:54 2009
@@ -1,4 +1,4 @@
-dnl $Id: config0.m4,v 1.1.2.10 2009/01/10 01:46:55 scottmac Exp $
+dnl $Id: config0.m4,v 1.1.2.11 2009/01/13 02:50:54 scottmac Exp $
dnl config.m4 for extension sqlite3
dnl vim:et:ts=2:sw=2
@@ -67,7 +67,7 @@
debug_flags="-DSQLITE_DEBUG=1"
fi
-other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1
-DSQLITE_ENABLE_COLUMN_METADATA=1"
dnl As long as intl is not shared we can have ICU support
if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.7&r2=1.26.2.9.2.7.2.8&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.7
php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.8
--- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.7 Mon Jan 12 19:03:07 2009
+++ php-src/ext/pdo_sqlite/config.m4Tue Jan 13 02:50:54 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26.2.9.2.7.2.7 2009/01/12 19:03:07 scottmac Exp $
+dnl $Id: config.m4,v 1.26.2.9.2.7.2.8 2009/01/13 02:50:54 scottmac Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -79,7 +79,12 @@
threadsafe_flags="-DSQLITE_THREADSAFE=0"
fi
- other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1
-DSQLITE_ENABLE_COLUMN_METADATA=1"
+
+ dnl As long as intl is not shared we can have ICU support
+ if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then
+other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
+ fi
if test "$PHP_SQLITE3" != "yes"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.18.2.4.2.3.2.3&r2=1.18.2.4.2.3.2.4&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.3
php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.4
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.18.2.4.2.3.2.3 Wed Dec 31
11:15:41 2008
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Tue Jan 13 02:50:54 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.3 2008/12/31 11:15:41 sebastian
Exp $ */
+/* $Id: sqlite_statement.c,v 1.18.2.4.2.3.2.4 2009/01/13 02:50:54 scottmac Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -323,6 +323,13 @@
add_assoc_string(return_value, "sqlite:decl_type", str, 1);
}
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
+ str = sqlite3_column_table_name(S->stmt, colno);
+ if (str) {
+ add_assoc_string(return_value, "table", str, 1);
+ }
+#endif
+
add_assoc_zval(return_value, "flags", flags);
return SUCCESS;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug_42589.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug_42589.phpt
+++ php-src/ext/pdo_sqlite/tests/bug_42589.phpt
--TEST--
PDO SQLite Feature Request #42589 (getColumnMeta() should also return table
name)
--SKIPIF--
--FILE--
exec('CREATE TABLE test (field1 VARCHAR(10))');
$db->exec('INSERT INTO test VALUES("test")');
$result = $db->query('SELECT * FROM test t1 LEFT JOIN test t2 ON t1.field1 =
t2.field1');
$meta1 = $result->getColumnMeta(0);
$meta2 = $result->getColumnMeta(1);
var_dump(!empty($meta1[b'table']) && $meta1[b'table'] == b'test');
var_dump(!empty($meta2[b'table']) && $meta2[b'table'] == b'test');
?>
--EXPECTF--
bool(true)
bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.m4 sqlite_statement.c /ext/pdo_sqlite/tests bug_42589.phpt /ext/sqlite3 config0.m4
scottmacTue Jan 13 02:50:23 2009 UTC
Added files:
/php-src/ext/pdo_sqlite/tests bug_42589.phpt
Modified files:
/php-src/ext/pdo_sqlite config.m4 sqlite_statement.c
/php-src/ext/sqlite3config0.m4
Log:
Add table key to getColumnMeta() with SQLite
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.41&r2=1.42&diff_format=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.41
php-src/ext/pdo_sqlite/config.m4:1.42
--- php-src/ext/pdo_sqlite/config.m4:1.41 Mon Jan 12 19:02:41 2009
+++ php-src/ext/pdo_sqlite/config.m4Tue Jan 13 02:50:22 2009
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.41 2009/01/12 19:02:41 scottmac Exp $
+dnl $Id: config.m4,v 1.42 2009/01/13 02:50:22 scottmac Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -79,7 +79,7 @@
threadsafe_flags="-DSQLITE_THREADSAFE=0"
fi
- other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1
-DSQLITE_ENABLE_COLUMN_METADATA=1"
if test "$PHP_SQLITE3" != "yes"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.27&r2=1.28&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.27
php-src/ext/pdo_sqlite/sqlite_statement.c:1.28
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.27 Wed Dec 31 11:12:34 2008
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Tue Jan 13 02:50:23 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite_statement.c,v 1.27 2008/12/31 11:12:34 sebastian Exp $ */
+/* $Id: sqlite_statement.c,v 1.28 2009/01/13 02:50:23 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -323,6 +323,13 @@
add_assoc_string(return_value, "sqlite:decl_type", str, 1);
}
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
+ str = sqlite3_column_table_name(S->stmt, colno);
+ if (str) {
+ add_assoc_string(return_value, "table", str, 1);
+ }
+#endif
+
add_assoc_zval(return_value, "flags", flags);
return SUCCESS;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config0.m4?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/sqlite3/config0.m4
diff -u php-src/ext/sqlite3/config0.m4:1.8 php-src/ext/sqlite3/config0.m4:1.9
--- php-src/ext/sqlite3/config0.m4:1.8 Mon Dec 22 16:42:34 2008
+++ php-src/ext/sqlite3/config0.m4 Tue Jan 13 02:50:23 2009
@@ -1,4 +1,4 @@
-dnl $Id: config0.m4,v 1.8 2008/12/22 16:42:34 scottmac Exp $
+dnl $Id: config0.m4,v 1.9 2009/01/13 02:50:23 scottmac Exp $
dnl config.m4 for extension sqlite3
dnl vim:et:ts=2:sw=2
@@ -67,7 +67,7 @@
debug_flags="-DSQLITE_DEBUG=1"
fi
-other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_ICU=1"
+other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_ICU=1
-DSQLITE_ENABLE_COLUMN_METADATA=1"
PHP_SQLITE3_CFLAGS="-...@ext_srcdir@/libsqlite
-...@ext_builddir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug_42589.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug_42589.phpt
+++ php-src/ext/pdo_sqlite/tests/bug_42589.phpt
--TEST--
PDO SQLite Feature Request #42589 (getColumnMeta() should also return table
name)
--SKIPIF--
--FILE--
exec('CREATE TABLE test (field1 VARCHAR(10))');
$db->exec('INSERT INTO test VALUES("test")');
$result = $db->query('SELECT * FROM test t1 LEFT JOIN test t2 ON t1.field1 =
t2.field1');
$meta1 = $result->getColumnMeta(0);
$meta2 = $result->getColumnMeta(1);
var_dump(!empty($meta1[b'table']) && $meta1[b'table'] == b'test');
var_dump(!empty($meta2[b'table']) && $meta2[b'table'] == b'test');
?>
--EXPECTF--
bool(true)
bool(true)
--
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) / NEWS
Pierre, I think it would be a rather a big pain for the RM to have to cull not- needed entries from a massive change list before the release. Its way simpler to avoid putting them in there all together. On 12-Jan-09, at 5:44 PM, Pierre Joye wrote: Hi Marcus, On Mon, Jan 12, 2009 at 11:33 PM, Marcus Boerger wrote: It was since the last 5.3 release. The RM will have to merge them, take #23. :) There is no merging here. It can only be dropping because there is only one entry necessary. And that is the one announcing namespaces in the first place. In the final 5.3, yes, in the meantime no. How do you trace the changes between two 5.3 releases (as an enduser)? It is not the 1st time we discussed that, do we really to do it on each NEWS addition (well, some only, as other seems to be fine ;)? Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Ilia Alshanetsky -- 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) / NEWS
Hi Marcus, On Mon, Jan 12, 2009 at 11:33 PM, Marcus Boerger wrote: >> It was since the last 5.3 release. The RM will have to merge them, take #23. >> :) > > There is no merging here. It can only be dropping because there is only one > entry necessary. And that is the one announcing namespaces in the first > place. In the final 5.3, yes, in the meantime no. How do you trace the changes between two 5.3 releases (as an enduser)? It is not the 1st time we discussed that, do we really to do it on each NEWS addition (well, some only, as other seems to be fine ;)? Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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) / NEWS
Hello Pierre, Monday, January 12, 2009, 11:21:32 PM, you wrote: > On Mon, Jan 12, 2009 at 11:05 PM, Marcus Boerger wrote: >> Hello Stanislav, >> >> Monday, January 12, 2009, 10:56:37 PM, you wrote: >> >>> stasMon Jan 12 21:56:37 2009 UTC >> >>> Modified files: (Branch: PHP_5_3) >>> /php-srcNEWS >>> Log: >>> report fix 46304 >>> >>> >>> http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.447&r2=1.2027.2.547.2.965.2.448&diff_format=u >>> Index: php-src/NEWS >>> diff -u php-src/NEWS:1.2027.2.547.2.965.2.447 >>> php-src/NEWS:1.2027.2.547.2.965.2.448 >>> --- php-src/NEWS:1.2027.2.547.2.965.2.447 Mon Jan 12 19:08:25 2009 >>> +++ php-src/NEWSMon Jan 12 21:56:36 2009 >>> @@ -46,6 +46,8 @@ >>> - Fixed bug #46653 (can't extend mysqli). (Johannes) >>> - Fixed bug #46646 (Restrict serialization on some internal classes like >>>Closure and SplFileInfo using exceptions). (Etienne) >>> +- Fixed bug #46304 (Defining namespaced constant using define() defines >>> + CASE SENSITIVE namespace). (Stas) >> >> This was a never released feature, so you do not need a NEWS entry. Please >> drop. >> > It was since the last 5.3 release. The RM will have to merge them, take #23. > :) There is no merging here. It can only be dropping because there is only one entry necessary. And that is the one announcing namespaces in the first place. Best regards, Marcus -- 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) / NEWS
hi, As it is nice to listen to Marcus, in this case it is wrong. How do we know what has been fixed between two test releases? Reading the commits? On Mon, Jan 12, 2009 at 11:24 PM, Stanislav Malyshev wrote: > stasMon Jan 12 22:24:31 2009 UTC > > Modified files: (Branch: PHP_5_3) >/php-srcNEWS > Log: > ns bugfix out > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.448&r2=1.2027.2.547.2.965.2.449&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.965.2.448 > php-src/NEWS:1.2027.2.547.2.965.2.449 > --- php-src/NEWS:1.2027.2.547.2.965.2.448 Mon Jan 12 21:56:36 2009 > +++ php-src/NEWSMon Jan 12 22:24:31 2009 > @@ -46,8 +46,6 @@ > - Fixed bug #46653 (can't extend mysqli). (Johannes) > - Fixed bug #46646 (Restrict serialization on some internal classes like > Closure and SplFileInfo using exceptions). (Etienne) > -- Fixed bug #46304 (Defining namespaced constant using define() defines > - CASE SENSITIVE namespace). (Stas) > - Fixed bug #46268 (DateTime::modify() does not reset relative time values). > (Derick) > - Fixed bug #46044 (Mysqli - wrong error message). (Johannes) > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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) / NEWS
stasMon Jan 12 22:24:31 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: ns bugfix out http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.448&r2=1.2027.2.547.2.965.2.449&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.448 php-src/NEWS:1.2027.2.547.2.965.2.449 --- php-src/NEWS:1.2027.2.547.2.965.2.448 Mon Jan 12 21:56:36 2009 +++ php-src/NEWSMon Jan 12 22:24:31 2009 @@ -46,8 +46,6 @@ - Fixed bug #46653 (can't extend mysqli). (Johannes) - Fixed bug #46646 (Restrict serialization on some internal classes like Closure and SplFileInfo using exceptions). (Etienne) -- Fixed bug #46304 (Defining namespaced constant using define() defines - CASE SENSITIVE namespace). (Stas) - Fixed bug #46268 (DateTime::modify() does not reset relative time values). (Derick) - Fixed bug #46044 (Mysqli - wrong error message). (Johannes) -- 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) / NEWS
Hi! This was a never released feature, so you do not need a NEWS entry. Please drop. Do you mean no namespace bugfixes should be in NEWS until 5.3 is released? -- Stanislav Malyshev, Zend Software Architect s...@zend.com http://www.zend.com/ (408)253-8829 MSN: s...@zend.com -- 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) / NEWS
On Mon, Jan 12, 2009 at 11:05 PM, Marcus Boerger wrote: > Hello Stanislav, > > Monday, January 12, 2009, 10:56:37 PM, you wrote: > >> stasMon Jan 12 21:56:37 2009 UTC > >> Modified files: (Branch: PHP_5_3) >> /php-srcNEWS >> Log: >> report fix 46304 >> >> >> http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.447&r2=1.2027.2.547.2.965.2.448&diff_format=u >> Index: php-src/NEWS >> diff -u php-src/NEWS:1.2027.2.547.2.965.2.447 >> php-src/NEWS:1.2027.2.547.2.965.2.448 >> --- php-src/NEWS:1.2027.2.547.2.965.2.447 Mon Jan 12 19:08:25 2009 >> +++ php-src/NEWSMon Jan 12 21:56:36 2009 >> @@ -46,6 +46,8 @@ >> - Fixed bug #46653 (can't extend mysqli). (Johannes) >> - Fixed bug #46646 (Restrict serialization on some internal classes like >>Closure and SplFileInfo using exceptions). (Etienne) >> +- Fixed bug #46304 (Defining namespaced constant using define() defines >> + CASE SENSITIVE namespace). (Stas) > > This was a never released feature, so you do not need a NEWS entry. Please > drop. > It was since the last 5.3 release. The RM will have to merge them, take #23. :) Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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) / NEWS
Hello Stanislav, Monday, January 12, 2009, 10:56:37 PM, you wrote: > stasMon Jan 12 21:56:37 2009 UTC > Modified files: (Branch: PHP_5_3) > /php-srcNEWS > Log: > report fix 46304 > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.447&r2=1.2027.2.547.2.965.2.448&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.965.2.447 > php-src/NEWS:1.2027.2.547.2.965.2.448 > --- php-src/NEWS:1.2027.2.547.2.965.2.447 Mon Jan 12 19:08:25 2009 > +++ php-src/NEWSMon Jan 12 21:56:36 2009 > @@ -46,6 +46,8 @@ > - Fixed bug #46653 (can't extend mysqli). (Johannes) > - Fixed bug #46646 (Restrict serialization on some internal classes like >Closure and SplFileInfo using exceptions). (Etienne) > +- Fixed bug #46304 (Defining namespaced constant using define() defines > + CASE SENSITIVE namespace). (Stas) This was a never released feature, so you do not need a NEWS entry. Please drop. > - Fixed bug #46268 (DateTime::modify() does not reset relative time values). >(Derick) > - Fixed bug #46044 (Mysqli - wrong error message). (Johannes) 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(PHP_5_3) / NEWS
stasMon Jan 12 21:56:37 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: report fix 46304 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.447&r2=1.2027.2.547.2.965.2.448&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.447 php-src/NEWS:1.2027.2.547.2.965.2.448 --- php-src/NEWS:1.2027.2.547.2.965.2.447 Mon Jan 12 19:08:25 2009 +++ php-src/NEWSMon Jan 12 21:56:36 2009 @@ -46,6 +46,8 @@ - Fixed bug #46653 (can't extend mysqli). (Johannes) - Fixed bug #46646 (Restrict serialization on some internal classes like Closure and SplFileInfo using exceptions). (Etienne) +- Fixed bug #46304 (Defining namespaced constant using define() defines + CASE SENSITIVE namespace). (Stas) - Fixed bug #46268 (DateTime::modify() does not reset relative time values). (Derick) - Fixed bug #46044 (Mysqli - wrong error message). (Johannes) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / .project
On Mon, Jan 12, 2009 at 19:11, andy wharmby wrote: > wharmby Mon Jan 12 18:11:32 2009 UTC > > Modified files: >/php-src.project > Log: > New math tests. Tested on Windows, Linux and Linux 64 bit Wait, say what? -Hannes -- 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/standard dns.c dns_win32.c
felipe Mon Jan 12 20:07:28 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c dns_win32.c
Log:
- Reverted my previous commit to avoid unnecessary BC.
[DOC] Added new entry to the array returned by dns_get_record(), 'entries',
which contains the separated value from TXT value. (so 'txt' kept the
concatenated version) (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.19&r2=1.70.2.7.2.5.2.20&diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.19
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.20
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.19Sun Jan 11 23:37:16 2009
+++ php-src/ext/standard/dns.c Mon Jan 12 20:07:28 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.19 2009/01/11 23:37:16 scottmac Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.20 2009/01/12 20:07:28 felipe Exp $ */
/* {{{ includes */
#include "php.h"
@@ -456,29 +456,26 @@
break;
case DNS_T_TXT:
{
- zval *txtarray = NULL;
int ll = 0;
- char *txt = NULL;
+ zval *entries = NULL;
add_assoc_string(*subarray, "type", "TXT", 1);
tp = emalloc(dlen + 1);
- MAKE_STD_ZVAL(txtarray);
- array_init(txtarray);
+ MAKE_STD_ZVAL(entries);
+ array_init(entries);
while (ll < dlen) {
- txt = tp + ll;
n = cp[ll];
- memcpy(txt, cp + ll + 1, n);
+ memcpy(tp + ll , cp + ll + 1, n);
+ add_next_index_stringl(entries, cp + ll
+ 1, n, 1);
ll = ll + n + 1;
- tp[ll] = '\0';
- add_next_index_stringl(txtarray, txt,
n, 1);
}
-
+ tp[dlen] = '\0';
cp += dlen;
- add_assoc_zval(*subarray, "txt", txtarray);
- efree(tp);
+ add_assoc_stringl(*subarray, "txt", tp, dlen -
1, 0);
+ add_assoc_zval(*subarray, "entries", entries);
}
break;
case DNS_T_SOA:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.1.2.5
php-src/ext/standard/dns_win32.c:1.1.2.6
--- php-src/ext/standard/dns_win32.c:1.1.2.5Sun Jan 11 18:47:17 2009
+++ php-src/ext/standard/dns_win32.cMon Jan 12 20:07:28 2009
@@ -194,24 +194,30 @@
int i = 0;
DNS_TXT_DATA *data_txt = &pRec->Data.TXT;
DWORD count = data_txt->dwStringCount;
- char *txt;
- long txt_len;
- zval *txtarray;
-
- MAKE_STD_ZVAL(txtarray);
- array_init(txtarray);
+ char *txt, *txt_dst;
+ long txt_len = 0;
+ zval *entries;
add_assoc_string(*subarray, "type", "TXT", 1);
+
+ ALLOC_INIT_ZVAL(entries);
+ array_init(entries);
+
+ for (i = 0; i < count; i++) {
+ txt_len +=
strlen(data_txt->pStringArray[i]) + 1;
+ }
+ txt = ecalloc(txt_len * 2, 1);
+ txt_dst = txt;
for (i = 0; i < count; i++) {
- txt_len =
strlen(data_txt->pStringArray[i]);
- txt = emalloc(txt_len + 1);
- memcpy(txt, data_txt->pStringArray[i],
txt_len);
- txt[txt_len] = '\0';
- add_next_index_stringl(txtarray, txt,
txt_len, 0);
+ int len =
strlen(data_txt->pStringArray[i]);
+
[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic magic.c
andrei Mon Jan 12 19:15:07 2009 UTC Modified files: /php-src/ext/fileinfo/libmagic magic.c Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/magic.c?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/fileinfo/libmagic/magic.c diff -u php-src/ext/fileinfo/libmagic/magic.c:1.6 php-src/ext/fileinfo/libmagic/magic.c:1.7 --- php-src/ext/fileinfo/libmagic/magic.c:1.6 Sun Nov 2 16:09:27 2008 +++ php-src/ext/fileinfo/libmagic/magic.c Mon Jan 12 19:15:07 2009 @@ -230,7 +230,7 @@ #elif defined(HAVE_UTIME_H) || defined(HAVE_SYS_UTIME_H) struct utimbuf utbuf; - (void)memset(utbuf, 0, sizeof(utbuf)); + (void)memset(&utbuf, 0, sizeof(utbuf)); utbuf.actime = sb->st_atime; utbuf.modtime = sb->st_mtime; (void) utime(name, &utbuf); /* don't care if loses */ -- 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/fileinfo/libmagic magic.c
andrei Mon Jan 12 19:09:34 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/fileinfo/libmagic magic.c Log: memset() requires a pointer. http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/magic.c?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: php-src/ext/fileinfo/libmagic/magic.c diff -u php-src/ext/fileinfo/libmagic/magic.c:1.1.2.6 php-src/ext/fileinfo/libmagic/magic.c:1.1.2.7 --- php-src/ext/fileinfo/libmagic/magic.c:1.1.2.6 Sun Nov 2 16:13:49 2008 +++ php-src/ext/fileinfo/libmagic/magic.c Mon Jan 12 19:09:34 2009 @@ -227,7 +227,7 @@ #elif defined(HAVE_UTIME_H) || defined(HAVE_SYS_UTIME_H) struct utimbuf utbuf; - (void)memset(utbuf, 0, sizeof(utbuf)); + (void)memset(&utbuf, 0, sizeof(utbuf)); utbuf.actime = sb->st_atime; utbuf.modtime = sb->st_mtime; (void) utime(name, &utbuf); /* don't care if loses */ -- 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) / NEWS
scottmacMon Jan 12 19:08:26 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.446&r2=1.2027.2.547.2.965.2.447&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.446 php-src/NEWS:1.2027.2.547.2.965.2.447 --- php-src/NEWS:1.2027.2.547.2.965.2.446 Mon Jan 12 17:13:21 2009 +++ php-src/NEWSMon Jan 12 19:08:25 2009 @@ -3,7 +3,7 @@ ?? ??? 2009, PHP 5.3.0 Alpha 4 - Changed __call() to be invoked on private/protected method access, similar to properties and __get(). (Andrei) -- Upgraded bundled sqlite to version 3.6.8. (Ilia) +- Upgraded bundled sqlite to version 3.6.8. (Scott, Ilia) - Deprecated session_register(), session_unregister() and session_is_registered(). (Hannes) @@ -14,6 +14,7 @@ argument is passed. (Sara) - Changed open_basedir to allow tightening in runtime contexts. (Sara) - Re-enabled socket_create_pair() on Windows. (Kalle) +- Fixed building of pdo_sqlite without sqlite3. (Scott) - Added support for old style DNS functions. (Scott) - Added mail logging functionality that allows logging of mail sent via -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
Sorry, never expected anyone else to be changing those. Scott On 12 Jan 2009, at 19:05, Ilia Alshanetsky wrote: Heh, I did that upgrade not an hour ago. On 12-Jan-09, at 1:46 PM, Scott MacVicar wrote: scottmacMon Jan 12 18:46:59 2009 UTC Modified files: /php-src/ext/sqlite3/libsqlitesqlite3.c sqlite3.h sqlite3ext.h Log: Update sqlite to 3.6.8 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
Heh, I did that upgrade not an hour ago. On 12-Jan-09, at 1:46 PM, Scott MacVicar wrote: scottmacMon Jan 12 18:46:59 2009 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Update sqlite to 3.6.8 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Ilia Alshanetsky -- 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/pdo_sqlite config.m4 /ext/sqlite3 config.m4
scottmacMon Jan 12 19:03:07 2009 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/sqlite3config.m4 Modified files: /php-src/ext/pdo_sqlite config.m4 Log: MFH Fix building of pdo_sqlite without sqlite3 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.26.2.9.2.7.2.6&r2=1.26.2.9.2.7.2.7&diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.6 php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.7 --- php-src/ext/pdo_sqlite/config.m4:1.26.2.9.2.7.2.6 Thu Jul 31 23:56:32 2008 +++ php-src/ext/pdo_sqlite/config.m4Mon Jan 12 19:03:07 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.26.2.9.2.7.2.6 2008/07/31 23:56:32 scottmac Exp $ +dnl $Id: config.m4,v 1.26.2.9.2.7.2.7 2009/01/12 19:03:07 scottmac Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -81,6 +81,10 @@ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" + if test "$PHP_SQLITE3" != "yes"; then +PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c) + fi + PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.m4 /ext/sqlite3 config.m4
scottmacMon Jan 12 19:02:41 2009 UTC Removed files: /php-src/ext/sqlite3config.m4 Modified files: /php-src/ext/pdo_sqlite config.m4 Log: Fix building of pdo_sqlite without sqlite3 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.40&r2=1.41&diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.40 php-src/ext/pdo_sqlite/config.m4:1.41 --- php-src/ext/pdo_sqlite/config.m4:1.40 Fri Aug 1 12:02:40 2008 +++ php-src/ext/pdo_sqlite/config.m4Mon Jan 12 19:02:41 2009 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.40 2008/08/01 12:02:40 scottmac Exp $ +dnl $Id: config.m4,v 1.41 2009/01/12 19:02:41 scottmac Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -81,6 +81,10 @@ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" + if test "$PHP_SQLITE3" != "yes"; then +PHP_ADD_SOURCES(PHP_EXT_DIR(sqlite3), libsqlite/sqlite3.c) + fi + PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path) -- 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/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
scottmacMon Jan 12 18:55:51 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: MFH Update sqlite to 3.6.8 http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.14&r2=1.1.2.15&diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.14 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.15 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.14Mon Jan 12 17:13:21 2009 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Mon Jan 12 18:55:20 2009 @@ -21,7 +21,7 @@ ** is also in a separate file. This file contains only code for the core ** SQLite library. ** -** This amalgamation was generated on 2009-01-12 15:48:39 UTC. +** This amalgamation was generated on 2009-01-12 15:45:58 UTC. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ /* @@ -526,7 +526,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -7249,7 +7249,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -7805,7 +7805,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -8037,7 +8037,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -8430,7 +8430,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _PAGER_H_ @@ -8580,7 +8580,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _PCACHE_H_ @@ -8748,7 +8748,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by every source file. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ #ifndef _SQLITE_OS_H_ #define _SQLITE_OS_H_ @@ -9030,7 +9030,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ @@ -11195,7 +11195,7 @@ ** ** This file contains definitions of global variables and contants. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ @@ -11302,7 +11302,7 @@ ** This module implements the sqlite3_status() interface and related ** functionality. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ */ /* @@ -11429,7 +11429,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sqlite3.c,v 1.1.2.15 2009/01/12 18:55:20 scottmac Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -12514,7 +12514,7 @@ ** This file contains OS interface code that is common to all ** architectures. ** -** $Id: sqlite3.c,v 1.1.2.14 2009/01/12 17:13:21 iliaa Exp $ +** $Id: sq
[PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h
scottmacMon Jan 12 18:46:59 2009 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c sqlite3.h sqlite3ext.h Log: Update sqlite to 3.6.8 http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.15&r2=1.16&diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.15 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.16 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.15Mon Jan 12 17:15:07 2009 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Mon Jan 12 18:46:57 2009 @@ -21,7 +21,7 @@ ** is also in a separate file. This file contains only code for the core ** SQLite library. ** -** This amalgamation was generated on 2009-01-12 15:48:39 UTC. +** This amalgamation was generated on 2009-01-12 15:45:58 UTC. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ /* @@ -526,7 +526,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -7249,7 +7249,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -7805,7 +7805,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -8037,7 +8037,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -8430,7 +8430,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _PAGER_H_ @@ -8580,7 +8580,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** @(#) $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _PCACHE_H_ @@ -8748,7 +8748,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by every source file. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #ifndef _SQLITE_OS_H_ #define _SQLITE_OS_H_ @@ -9030,7 +9030,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ @@ -11195,7 +11195,7 @@ ** ** This file contains definitions of global variables and contants. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ @@ -11302,7 +11302,7 @@ ** This module implements the sqlite3_status() interface and related ** functionality. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ /* @@ -11429,7 +11429,7 @@ ** sqlite3RegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ ** ** SQLite processes all times and dates as Julian Day numbers. The ** dates and times are stored as the number of days since noon @@ -12514,7 +12514,7 @@ ** This file contains OS interface code that is common to all ** architectures. ** -** $Id: sqlite3.c,v 1.15 2009/01/12 17:15:07 iliaa Exp $ +** $Id: sqlite3.c,v 1.16 2009/01/12 18:46:57 scottmac Exp $ */ #define _SQLITE_OS_C_ 1 #undef _SQLITE_OS_C_ @@ -12791,7 +12791,7 @@ ** ***
[PHP-CVS] cvs: php-src / .project
wharmby Mon Jan 12 18:11:32 2009 UTC Modified files: /php-src.project Log: New math tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/.project?r1=1.1&r2=1.2&diff_format=u Index: php-src/.project diff -u /dev/null php-src/.project:1.2 --- /dev/null Mon Jan 12 18:11:32 2009 +++ php-src/.projectMon Jan 12 18:11:32 2009 @@ -0,0 +1,11 @@ + + + php-6 + + + + + + + + -- 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) / .project /ext/standard/tests/math log1p_basic.phpt log1p_error.phpt log1p_variation1.phpt log_variation1.phpt log_variation2.phpt mt_rand_variation1.phpt mt_rand
On Mon, 12 Jan 2009, andy wharmby wrote: > wharmby Mon Jan 12 17:56:28 2009 UTC > > log1p_basic.phpt > /php-src .project Can you please not add those files? regards, Derick -- http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org twitter: derickrethans -- 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/file 007_error.phpt file_get_contents_variation8-win32.phpt file_put_contents_variation8-win32.phpt readfile_variation10-win32.phpt
wharmby Mon Jan 12 15:59:20 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filereadfile_variation10-win32.phpt
file_get_contents_variation8-win32.phpt
007_error.phpt
file_put_contents_variation8-win32.phpt
Log:
Fix Windows tests after #47037
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10-win32.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/readfile_variation10-win32.phpt
diff -u php-src/ext/standard/tests/file/readfile_variation10-win32.phpt:1.1.2.1
php-src/ext/standard/tests/file/readfile_variation10-win32.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readfile_variation10-win32.phpt:1.1.2.1
Tue Nov 25 11:31:25 2008
+++ php-src/ext/standard/tests/file/readfile_variation10-win32.phpt Mon Jan
12 15:59:20 2009
@@ -17,56 +17,71 @@
echo "*** Testing readfile() : variation ***\n";
-
/* An array of files */
$names_arr = array(
- /* Invalid args */
- -1,
- TRUE,
- FALSE,
- NULL,
- "",
- " ",
- "\0",
- array(),
+ /* Invalid args */
+ "-1" => -1,
+ "TRUE" => TRUE,
+ "FALSE" => FALSE,
+ "NULL" => NULL,
+ "\"\"" => "",
+ "\" \"" => " ",
+ "\\0" => "\0",
+ "array()" => array(),
/* prefix with path separator of a non existing directory*/
- "/no/such/file/dir",
- "php/php"
+ "/no/such/file/dir" => "/no/such/file/dir",
+ "php/php"=> "php/php"
);
-for( $i=0; $i $value) {
+ echo "\n-- Filename: $key --\n";
+ readfile($value);
+};
-echo "\n*** Done ***\n";
?>
+===Done===
--EXPECTF--
*** Testing readfile() : variation ***
--- testing '-1' --
+
+-- Filename: -1 --
Warning: readfile(-1): failed to open stream: No such file or directory in %s
on line %d
--- testing '1' --
+
+-- Filename: TRUE --
Warning: readfile(1): failed to open stream: No such file or directory in %s
on line %d
--- testing '' --
--- testing '' --
--- testing '' --
--- testing ' ' --
+
+-- Filename: FALSE --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: NULL --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: "" --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: " " --
Warning: readfile( ): failed to open stream: Permission denied in %s on line %d
--- testing '%s' --
--- testing 'Array' --
+
+-- Filename: \0 --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: array() --
Warning: readfile() expects parameter 1 to be string, array given in %s on
line %d
--- testing '/no/such/file/dir' --
+
+-- Filename: /no/such/file/dir --
Warning: readfile(/no/such/file/dir): failed to open stream: No such file or
directory in %s on line %d
--- testing 'php/php' --
-Warning: readfile(php/php): failed to open stream: No such file or directory
in %s on line %d
+-- Filename: php/php --
-*** Done ***
\ No newline at end of file
+Warning: readfile(php/php): failed to open stream: No such file or directory
in %s on line %d
+===Done===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
diff -u
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.1.2.1
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.1.2.2
---
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.1.2.1
Tue Nov 25 11:31:25 2008
+++ php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
Mon Jan 12 15:59:20 2009
@@ -16,64 +16,82 @@
*/
echo "*** Testing file_get_contents() : variation ***\n";
+
/* An array of filenames */
$names_arr = array(
- /* Invalid args */
- -1,
- TRUE,
- FALSE,
- NULL,
- "",
- " ",
- "\0",
- array(),
-
- /* prefix with path separator of a non existing directory*/
- "/no/such/file/dir",
- "php/php"
+ /* Invalid args */
+ "-1" => -1,
+ "TRUE" => TRUE,
+ "FALSE" => FALSE,
+ "NULL" => NULL,
+ "\"\"" => "",
+ "\" \"" => " ",
+ "\\0" => "\0",
+ "array()" => array(),
+
+ /* prefix with path separator of a non existing directory*/
+ "/no/such/file/dir" => "/no/such/file/dir",
+ "php/php"=> "php/php"
);
-for( $i=0; $i$value) {
+ echo "\n-- Filename: $key --\n";
+ var_dump(file_get_contents($value));
}
-echo "\n*** Done ***\n";
?>
+===Done===
--EXPECTF--
*** Testing file_get_contents() : variation ***
--- Iteration 0 --
+
+-- Filename: -1 --
Warning: file_get_contents(-1): failed to open stream: No such file or
directory in %s on line %d
bool(false)
--- Iteration 1 --
+
+-- Filename: TRUE --
Warning: file_get_contents(1): failed to open stream: No such file or
directory in %s on lin
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file file_get_contents_variation8-win32.phpt file_put_contents_variation8-win32.phpt readfile_variation10-win32.phpt
wharmby Mon Jan 12 15:59:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filereadfile_variation10-win32.phpt
file_get_contents_variation8-win32.phpt
file_put_contents_variation8-win32.phpt
Log:
Fix Windows tests after #47037
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10-win32.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/readfile_variation10-win32.phpt
diff -u php-src/ext/standard/tests/file/readfile_variation10-win32.phpt:1.1.4.2
php-src/ext/standard/tests/file/readfile_variation10-win32.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/readfile_variation10-win32.phpt:1.1.4.2
Wed Nov 26 10:10:16 2008
+++ php-src/ext/standard/tests/file/readfile_variation10-win32.phpt Mon Jan
12 15:59:04 2009
@@ -17,56 +17,71 @@
echo "*** Testing readfile() : variation ***\n";
-
/* An array of files */
$names_arr = array(
/* Invalid args */
- -1,
- TRUE,
- FALSE,
- NULL,
- "",
- " ",
- "\0",
- array(),
+ "-1" => -1,
+ "TRUE" => TRUE,
+ "FALSE" => FALSE,
+ "NULL" => NULL,
+ "\"\"" => "",
+ "\" \"" => " ",
+ "\\0" => "\0",
+ "array()" => array(),
/* prefix with path separator of a non existing directory*/
- "/no/such/file/dir",
- "php/php"
+ "/no/such/file/dir" => "/no/such/file/dir",
+ "php/php"=> "php/php"
);
-for( $i=0; $i $value) {
+ echo "\n-- Filename: $key --\n";
+ readfile($value);
+};
-echo "\n*** Done ***\n";
?>
+===Done===
--EXPECTF--
*** Testing readfile() : variation ***
--- testing '-1' --
+
+-- Filename: -1 --
Warning: readfile(-1): failed to open stream: No such file or directory in %s
on line %d
--- testing '1' --
+
+-- Filename: TRUE --
Warning: readfile(1): failed to open stream: No such file or directory in %s
on line %d
--- testing '' --
--- testing '' --
--- testing '' --
--- testing ' ' --
+
+-- Filename: FALSE --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: NULL --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: "" --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: " " --
Warning: readfile( ): failed to open stream: Permission denied in %s on line %d
--- testing '%s' --
--- testing 'Array' --
+
+-- Filename: \0 --
+
+Warning: readfile(): Filename cannot be empty in %s on line %d
+
+-- Filename: array() --
Warning: readfile() expects parameter 1 to be string, array given in %s on
line %d
--- testing '/no/such/file/dir' --
+
+-- Filename: /no/such/file/dir --
Warning: readfile(/no/such/file/dir): failed to open stream: No such file or
directory in %s on line %d
--- testing 'php/php' --
-Warning: readfile(php/php): failed to open stream: No such file or directory
in %s on line %d
+-- Filename: php/php --
-*** Done ***
\ No newline at end of file
+Warning: readfile(php/php): failed to open stream: No such file or directory
in %s on line %d
+===Done===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
diff -u
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.1.4.2
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.1.4.3
---
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.1.4.2
Wed Nov 26 10:10:17 2008
+++ php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
Mon Jan 12 15:59:04 2009
@@ -16,64 +16,82 @@
*/
echo "*** Testing file_get_contents() : variation ***\n";
+
/* An array of filenames */
$names_arr = array(
- /* Invalid args */
- -1,
- TRUE,
- FALSE,
- NULL,
- "",
- " ",
- "\0",
- array(),
-
- /* prefix with path separator of a non existing directory*/
- "/no/such/file/dir",
- "php/php"
+ /* Invalid args */
+ "-1" => -1,
+ "TRUE" => TRUE,
+ "FALSE" => FALSE,
+ "NULL" => NULL,
+ "\"\"" => "",
+ "\" \"" => " ",
+ "\\0" => "\0",
+ "array()" => array(),
+
+ /* prefix with path separator of a non existing directory*/
+ "/no/such/file/dir" => "/no/such/file/dir",
+ "php/php"=> "php/php"
);
-for( $i=0; $i$value) {
+ echo "\n-- Filename: $key --\n";
+ var_dump(file_get_contents($value));
}
-echo "\n*** Done ***\n";
?>
+===Done===
--EXPECTF--
*** Testing file_get_contents() : variation ***
--- Iteration 0 --
+
+-- Filename: -1 --
Warning: file_get_contents(-1): failed to open stream: No such file or
directory in %s on line %d
bool(false)
--- Iteration 1 --
+
+-- Filename: TRUE --
Warning: file_get_contents(1): failed to open stream: No such file or
directory in %s on line %d
bool(false)
--- Iteration 2 --
+
+-- Filename: FALSE --
+
+Warning: file_g
[PHP-CVS] cvs: php-src /ext/standard/tests/file file_get_contents_variation8-win32.phpt file_put_contents_variation8-win32.phpt readfile_variation10-win32.phpt
wharmby Mon Jan 12 15:58:41 2009 UTC
Modified files:
/php-src/ext/standard/tests/file
file_get_contents_variation8-win32.phpt
readfile_variation10-win32.phpt
file_put_contents_variation8-win32.phpt
Log:
Fix Windows tests after #47037
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
diff -u
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.2
php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.3
--- php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt:1.2
Wed Nov 26 17:48:40 2008
+++ php-src/ext/standard/tests/file/file_get_contents_variation8-win32.phpt
Mon Jan 12 15:58:41 2009
@@ -1,7 +1,5 @@
--TEST--
Test file_get_contents() function : variation - obscure filenames
---XFAIL--
-Return values are inconsistent (and have changed from previous versions)
--CREDITS--
Dave Kelsey
--SKIPIF--
@@ -18,67 +16,84 @@
*/
echo "*** Testing file_get_contents() : variation ***\n";
+
/* An array of filenames */
$names_arr = array(
/* Invalid args */
- -1,
- TRUE,
- FALSE,
- NULL,
- "",
- " ",
- "\0",
- array(),
-
- /* prefix with path separator of a non existing directory*/
- "/no/such/file/dir",
- "php/php"
+ "-1" => -1,
+ "TRUE" => TRUE,
+ "FALSE" => FALSE,
+ "NULL" => NULL,
+ "\"\"" => "",
+ "\" \"" => " ",
+ "\\0" => "\0",
+ "array()" => array(),
+
+ /* prefix with path separator of a non existing directory*/
+ "/no/such/file/dir" => "/no/such/file/dir",
+ "php/php"=> "php/php"
);
-for( $i=0; $i$value) {
+ echo "\n-- Filename: $key --\n";
+ var_dump(file_get_contents($value));
}
-echo "\n*** Done ***\n";
?>
+===Done===
--EXPECTF--
*** Testing file_get_contents() : variation ***
--- Iteration 0 --
+
+-- Filename: -1 --
Warning: file_get_contents(-1): failed to open stream: No such file or
directory in %s on line %d
bool(false)
--- Iteration 1 --
+
+-- Filename: TRUE --
Warning: file_get_contents(1): failed to open stream: No such file or
directory in %s on line %d
bool(false)
--- Iteration 2 --
+
+-- Filename: FALSE --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
--- Iteration 3 --
+
+-- Filename: NULL --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
--- Iteration 4 --
+
+-- Filename: "" --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
--- Iteration 5 --
+
+-- Filename: " " --
Warning: file_get_contents( ): failed to open stream: Permission denied in %s
on line %d
bool(false)
--- Iteration 6 --
+
+-- Filename: \0 --
+
+Warning: file_get_contents(): Filename cannot be empty in %s on line %d
bool(false)
--- Iteration 7 --
+
+-- Filename: array() --
Notice: Array to string conversion in %s on line %d
Warning: file_get_contents(Array): failed to open stream: No such file or
directory in %s on line %d
bool(false)
--- Iteration 8 --
+
+-- Filename: /no/such/file/dir --
Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such
file or directory in %s on line %d
bool(false)
--- Iteration 9 --
+
+-- Filename: php/php --
Warning: file_get_contents(php/php): failed to open stream: No such file or
directory in %s on line %d
bool(false)
-
-*** Done ***
-
+===Done===
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readfile_variation10-win32.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/readfile_variation10-win32.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_put_contents_variation8-win32.phpt
--
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/standard dns.c dns_win32.c
Em Dom, 2009-01-11 às 18:47 +, Felipe Pena escreveu:
> felipeSun Jan 11 18:47:17 2009 UTC
>
> Modified files: (Branch: PHP_5_3)
> /php-src/ext/standard dns.c dns_win32.c
> Log:
> MFH:
> - Improved fix for #47035 (win32 part by Henrique M. Decaria)
> [DOC] The TXT part needs be returned as an array of strings.
> (dns_get_record())
>
>
Sorry, but ignores this [DOC]. NO BC! :þ
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.17&r2=1.70.2.7.2.5.2.18&diff_format=u
> Index: php-src/ext/standard/dns.c
> diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.17
> php-src/ext/standard/dns.c:1.70.2.7.2.5.2.18
> --- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.17 Thu Jan 8 17:19:50 2009
> +++ php-src/ext/standard/dns.cSun Jan 11 18:47:17 2009
> @@ -18,7 +18,7 @@
> +--+
> */
>
> -/* $Id: dns.c,v 1.70.2.7.2.5.2.17 2009/01/08 17:19:50 felipe Exp $ */
> +/* $Id: dns.c,v 1.70.2.7.2.5.2.18 2009/01/11 18:47:17 felipe Exp $ */
>
> /* {{{ includes */
> #include "php.h"
> @@ -456,20 +456,29 @@
> break;
> case DNS_T_TXT:
> {
> + zval *txtarray = NULL;
> int ll = 0;
> + char *txt = NULL;
>
> add_assoc_string(*subarray, "type", "TXT", 1);
> tp = emalloc(dlen + 1);
>
> + MAKE_STD_ZVAL(txtarray);
> + array_init(txtarray);
> +
> while (ll < dlen) {
> + txt = tp + ll;
> n = cp[ll];
> - memcpy(tp + ll , cp + ll + 1, n);
> + memcpy(txt, cp + ll + 1, n);
> ll = ll + n + 1;
> + tp[ll] = '\0';
> + add_next_index_stringl(txtarray, txt,
> n, 1);
> }
> - tp[dlen] = '\0';
> +
> cp += dlen;
>
> - add_assoc_stringl(*subarray, "txt", tp, dlen -
> 1, 0);
> + add_assoc_zval(*subarray, "txt", txtarray);
> + efree(tp);
> }
> break;
> case DNS_T_SOA:
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
> Index: php-src/ext/standard/dns_win32.c
> diff -u php-src/ext/standard/dns_win32.c:1.1.2.4
> php-src/ext/standard/dns_win32.c:1.1.2.5
> --- php-src/ext/standard/dns_win32.c:1.1.2.4 Wed Jan 7 01:35:36 2009
> +++ php-src/ext/standard/dns_win32.c Sun Jan 11 18:47:17 2009
> @@ -194,25 +194,24 @@
> int i = 0;
> DNS_TXT_DATA *data_txt = &pRec->Data.TXT;
> DWORD count = data_txt->dwStringCount;
> - char *txt, *txt_dst;
> + char *txt;
> long txt_len;
> + zval *txtarray;
>
> - add_assoc_string(*subarray, "type", "TXT", 1);
> + MAKE_STD_ZVAL(txtarray);
> + array_init(txtarray);
>
> - txt_len = 0;
> - for (i = 0; i < count; i++) {
> - txt_len +=
> strlen(data_txt->pStringArray[i]) + 1;
> - }
> + add_assoc_string(*subarray, "type", "TXT", 1);
>
> - txt = ecalloc(txt_len * 2, 1);
> - txt_dst = txt;
> for (i = 0; i < count; i++) {
> - int len =
> strlen(data_txt->pStringArray[i]);
> - memcpy(txt_dst,
> data_txt->pStringArray[i], len);
> - txt_dst += len;
> + txt_len =
> strlen(data_txt->pStringArray[i]);
> + txt = emalloc(txt_len + 1);
> + memcpy(txt, data_txt->pStringArray[i],
> txt_len);
> + txt[txt_len] = '\0';
> + add_next_index_stringl(txtarray, txt,
> txt_len, 0);
> }
>
> - add_assoc_string(*subarray, "txt", txt, 0);
> + add_assoc_zval(*subarray, "txt", txtarray);
> }
>
[PHP-CVS] cvs: php-src /ext/standard dns.c dns_win32.c
felipe Mon Jan 12 14:53:03 2009 UTC
Modified files:
/php-src/ext/standard dns.c dns_win32.c
Log:
- Reverted my previous commit to avoid unnecessary BC.
[DOC] Added new entry to the array returned by dns_get_record(), 'entries',
which contains the separated value from TXT value. (so 'txt' kept the
concatenated version) (Pierre)
- Unicode++ (Felipe)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.104&r2=1.105&diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.104 php-src/ext/standard/dns.c:1.105
--- php-src/ext/standard/dns.c:1.104Sun Jan 11 23:47:52 2009
+++ php-src/ext/standard/dns.c Mon Jan 12 14:53:03 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.104 2009/01/11 23:47:52 scottmac Exp $ */
+/* $Id: dns.c,v 1.105 2009/01/12 14:53:03 felipe Exp $ */
/* {{{ includes */
#include "php.h"
@@ -457,28 +457,26 @@
break;
case DNS_T_TXT:
{
- zval *txtarray = NULL;
int ll = 0;
- char *txt = NULL;
+ zval *entries = NULL;
add_ascii_assoc_rt_string(*subarray, "type",
"TXT", ZSTR_DUPLICATE);
tp = emalloc(dlen + 1);
-
- MAKE_STD_ZVAL(txtarray);
- array_init(txtarray);
+
+ MAKE_STD_ZVAL(entries);
+ array_init(entries);
while (ll < dlen) {
- txt = tp + ll;
n = cp[ll];
- memcpy(txt, cp + ll + 1, n);
+ memcpy(tp + ll, cp + ll + 1, n);
+ add_next_index_rt_stringl(entries, cp +
ll + 1, n, ZSTR_DUPLICATE);
ll = ll + n + 1;
- tp[ll] = '\0';
- add_next_index_rt_stringl(txtarray,
txt, n, ZSTR_DUPLICATE);
}
+ tp[dlen] = '\0';
cp += dlen;
-
- add_rt_assoc_zval(*subarray, "txt", txtarray);
- efree(tp);
+
+ add_ascii_assoc_rt_stringl(*subarray, "txt",
tp, dlen - 1, ZSTR_AUTOFREE);
+ add_ascii_assoc_zval(*subarray, "entries",
entries);
}
break;
case DNS_T_SOA:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns_win32.c?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/standard/dns_win32.c
diff -u php-src/ext/standard/dns_win32.c:1.5
php-src/ext/standard/dns_win32.c:1.6
--- php-src/ext/standard/dns_win32.c:1.5Sun Jan 11 18:38:00 2009
+++ php-src/ext/standard/dns_win32.cMon Jan 12 14:53:03 2009
@@ -153,38 +153,38 @@
ALLOC_INIT_ZVAL(*subarray);
array_init(*subarray);
- add_assoc_rt_string(*subarray, "host", pRec->pName, ZSTR_DUPLICATE);
+ add_ascii_assoc_rt_string(*subarray, "host", pRec->pName,
ZSTR_DUPLICATE);
switch (type) {
case DNS_TYPE_A: {
IN_ADDR ipaddr;
ipaddr.S_un.S_addr = (pRec->Data.A.IpAddress);
- add_assoc_rt_string(*subarray, "type", "A",
ZSTR_DUPLICATE);
- add_assoc_rt_string(*subarray, "ip", inet_ntoa(ipaddr),
ZSTR_DUPLICATE);
+ add_ascii_assoc_rt_string(*subarray, "type", "A",
ZSTR_DUPLICATE);
+ add_ascii_assoc_rt_string(*subarray, "ip",
inet_ntoa(ipaddr), ZSTR_DUPLICATE);
break;
}
case DNS_TYPE_MX:
- add_assoc_rt_string(*subarray, "type", "MX",
ZSTR_DUPLICATE);
- add_assoc_long(*subarray, "pri",
pRec->Data.Srv.wPriority);
+ add_ascii_assoc_rt_string(*subarray, "type", "MX",
ZSTR_DUPLICATE);
+ add_ascii_assoc_long(*subarray, "pri",
pRec->Data.Srv.wPriority);
/* no break; */
case DNS_TYPE_CNAME:
if (type == DNS_TYPE_CNAME) {
- add_assoc_rt_string(*subarray, "type", "CNAME",
ZSTR_DUPLICATE);
+ add_ascii_assoc_rt_string(*subarray, "type",
"CNAME", ZSTR_DUPLICATE);
}
/* no break; */
case DNS_TYPE_NS:
i
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/math expm1_basic.phpt expm1_error.phpt expm1_variation1.phpt floor_basic.phpt floor_error.phpt floor_variation1.phpt fmod_variation1.phpt fmod_varia
wharmby Mon Jan 12 14:31:07 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/mathis_nan_variation1.phpt is_infinite_variation1.phpt hypot_basic.phpt hexdec_variation1_64bit.phpt is_finite_variation1.phpt fmod_variation1.phpt floor_error.phpt hexdec_basic_64bit.phpt expm1_basic.phpt hexdec_variation1.phpt floor_variation1.phpt expm1_variation1.phpt floor_basic.phpt hypot_variation1.phpt expm1_error.phpt fmod_variation2.phpt hypot_variation2.phpt Modified files: /php-src/ext/standard/tests/mathhexdec_error.phpt hypot_error.phpt Log: New math tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hexdec_error.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/math/hexdec_error.phpt diff -u php-src/ext/standard/tests/math/hexdec_error.phpt:1.1.4.2 php-src/ext/standard/tests/math/hexdec_error.phpt:1.1.4.3 --- php-src/ext/standard/tests/math/hexdec_error.phpt:1.1.4.2 Wed Feb 6 09:51:19 2008 +++ php-src/ext/standard/tests/math/hexdec_error.phpt Mon Jan 12 14:31:06 2009 @@ -2,11 +2,35 @@ Test hexdec() - wrong params test hexdec() --FILE-- --EXPECTF-- +*** Testing hexdec() : error conditions *** + +-- Incorrect number of arguments -- + +Warning: Wrong parameter count for hexdec() in %s on line %d + +Warning: Wrong parameter count for hexdec() in %s on line %d -Warning: Wrong parameter count for hexdec() in %s on line 2 +-- Incorrect input -- -Warning: Wrong parameter count for hexdec() in %s on line 3 +Catchable fatal error: Object of class classA could not be converted to string in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hypot_error.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/math/hypot_error.phpt diff -u php-src/ext/standard/tests/math/hypot_error.phpt:1.1.4.2 php-src/ext/standard/tests/math/hypot_error.phpt:1.1.4.3 --- php-src/ext/standard/tests/math/hypot_error.phpt:1.1.4.2Wed Feb 6 09:51:19 2008 +++ php-src/ext/standard/tests/math/hypot_error.phptMon Jan 12 14:31:07 2009 @@ -1,18 +1,33 @@ --TEST-- Test hypot() - wrong params test hypot() ---INI-- -precision=14 --FILE-- +===Done=== --EXPECTF-- +*** Testing hypot() : error conditions *** + +-- Testing hypot() function with less than expected no. of arguments -- +Warning: Wrong parameter count for hypot() in %s on line %d -Warning: Wrong parameter count for hypot() in %s on line 2 +Warning: Wrong parameter count for hypot() in %s on line %d -Warning: Wrong parameter count for hypot() in %s on line 3 +-- Testing hypot() function with more than expected no. of arguments -- -Warning: Wrong parameter count for hypot() in %s on line 4 +Warning: Wrong parameter count for hypot() in %s on line %d +===Done=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/is_nan_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/is_nan_variation1.phpt +++ php-src/ext/standard/tests/math/is_nan_variation1.phpt --TEST-- Test is_nan() function : usage variations - different data types as $val argument --FILE-- ===Done=== --EXPECTF-- *** Testing is_nan() : usage variations *** -- Iteration 1 -- bool(false) -- Iteration 2 -- bool(false) -- Iteration 3 -- bool(false) -- Iteration 4 -- bool(false) -- Iteration 5 -- bool(false) -- Iteration 6 -- bool(false) -- Iteration 7 -- bool(false) -- Iteration 8 -- bool(false) -- Iteration 9 -- bool(false) -- Iteration 10 -- bool(false) -- Iteration 11 -- bool(false) -- Iteration 12 -- bool(false) -- Iteration 13 -- bool(false) -- Iteration 14 -- bool(false) -- Iteration 15 -- bool(false) -- Iteration 16 -- bool(false) -- Iteration 17 -- Warning: is_nan() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 18 -- Warning: is_nan() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 19 -- Warning: is_nan() expects parameter 1 to be double, array given in %s on line %d NULL -- Iteration 20 -- Warning: is_nan() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 21 -- Warning: is_nan() expects parameter 1 to be double, Unicode string gi
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/math expm1_basic.phpt expm1_error.phpt expm1_variation1.phpt floor_basic.phpt floor_error.phpt floor_variation1.phpt fmod_variation1.phpt fmod_varia
wharmby Mon Jan 12 14:30:52 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/mathhypot_variation2.phpt fmod_variation2.phpt floor_basic.phpt hexdec_basic_64bit.phpt expm1_error.phpt floor_variation1.phpt hexdec_variation1.phpt hypot_basic.phpt is_infinite_variation1.phpt floor_error.phpt is_finite_variation1.phpt hexdec_variation1_64bit.phpt expm1_variation1.phpt fmod_variation1.phpt hypot_variation1.phpt is_nan_variation1.phpt expm1_basic.phpt Modified files: /php-src/ext/standard/tests/mathhypot_error.phpt hexdec_error.phpt Log: New math tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hypot_error.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/standard/tests/math/hypot_error.phpt diff -u php-src/ext/standard/tests/math/hypot_error.phpt:1.1.2.3 php-src/ext/standard/tests/math/hypot_error.phpt:1.1.2.4 --- php-src/ext/standard/tests/math/hypot_error.phpt:1.1.2.3Thu Feb 21 17:47:33 2008 +++ php-src/ext/standard/tests/math/hypot_error.phptMon Jan 12 14:30:52 2009 @@ -1,16 +1,33 @@ --TEST-- Test hypot() - wrong params test hypot() ---INI-- -precision=14 --FILE-- +===Done=== --EXPECTF-- +*** Testing hypot() : error conditions *** + +-- Testing hypot() function with less than expected no. of arguments -- + Warning: hypot() expects exactly 2 parameters, 0 given in %s on line %d Warning: hypot() expects exactly 2 parameters, 1 given in %s on line %d +-- Testing hypot() function with more than expected no. of arguments -- + Warning: hypot() expects exactly 2 parameters, 3 given in %s on line %d +===Done=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hexdec_error.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/standard/tests/math/hexdec_error.phpt diff -u php-src/ext/standard/tests/math/hexdec_error.phpt:1.1.2.3 php-src/ext/standard/tests/math/hexdec_error.phpt:1.1.2.4 --- php-src/ext/standard/tests/math/hexdec_error.phpt:1.1.2.3 Thu Feb 21 17:47:33 2008 +++ php-src/ext/standard/tests/math/hexdec_error.phpt Mon Jan 12 14:30:52 2009 @@ -2,10 +2,35 @@ Test hexdec() - wrong params test hexdec() --FILE-- --EXPECTF-- +*** Testing hexdec() : error conditions *** + +-- Incorrect number of arguments -- + Warning: hexdec() expects exactly 1 parameter, 0 given in %s on line %d Warning: hexdec() expects exactly 1 parameter, 2 given in %s on line %d + +-- Incorrect input -- + +Catchable fatal error: Object of class classA could not be converted to string in %s on line %d \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hypot_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/hypot_variation2.phpt +++ php-src/ext/standard/tests/math/hypot_variation2.phpt --TEST-- Test hypot() function : usage variations - different data types as $y argument --FILE-- ===Done=== --EXPECTF-- *** Testing hypot() : usage variations *** -- Iteration 1 -- float(3) -- Iteration 2 -- float(3.1622776601684) -- Iteration 3 -- float(12345.00036452) -- Iteration 4 -- float(2345.0019189758) -- Iteration 5 -- float(2147483647) -- Iteration 6 -- float(10.920164833921) -- Iteration 7 -- float(10.920164833921) -- Iteration 8 -- float(123456789000) -- Iteration 9 -- float(3) -- Iteration 10 -- float(3.0413812651491) -- Iteration 11 -- float(3) -- Iteration 12 -- float(3) -- Iteration 13 -- float(3.1622776601684) -- Iteration 14 -- float(3) -- Iteration 15 -- float(3.1622776601684) -- Iteration 16 -- float(3) -- Iteration 17 -- Warning: hypot() expects parameter 2 to be double, Unicode string given in %s on line %d NULL -- Iteration 18 -- Warning: hypot() expects parameter 2 to be double, Unicode string given in %s on line %d NULL -- Iteration 19 -- Warning: hypot() expects parameter 2 to be double, array given in %s on line %d NULL -- Iteration 20 -- Warning: hypot() expects parameter 2 to be double, Unicode string given in %s on line %d NULL -- Iteration 21 -- Warning: hypot() expects parameter 2 to be double, Unicode string given in %s on line %d NULL -- Iteration 22 -- Warning: hypot() expects parameter 2 to be double, Unicode string given in %s on line %d NULL --
[PHP-CVS] cvs: php-src /ext/standard/tests/math expm1_basic.phpt expm1_error.phpt expm1_variation1.phpt floor_basic.phpt floor_error.phpt floor_variation1.phpt fmod_variation1.phpt fmod_variation2.php
wharmby Mon Jan 12 14:30:31 2009 UTC Added files: /php-src/ext/standard/tests/mathexpm1_variation1.phpt hexdec_variation1.phpt floor_variation1.phpt floor_error.phpt hypot_basic.phpt is_finite_variation1.phpt hexdec_basic_64bit.phpt is_infinite_variation1.phpt hexdec_variation1_64bit.phpt hypot_variation1.phpt expm1_basic.phpt expm1_error.phpt fmod_variation1.phpt floor_basic.phpt hypot_variation2.phpt is_nan_variation1.phpt fmod_variation2.phpt Modified files: /php-src/ext/standard/tests/mathhypot_error.phpt hexdec_error.phpt Log: New math tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hypot_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/math/hypot_error.phpt diff -u php-src/ext/standard/tests/math/hypot_error.phpt:1.1 php-src/ext/standard/tests/math/hypot_error.phpt:1.2 --- php-src/ext/standard/tests/math/hypot_error.phpt:1.1Wed Feb 6 08:39:23 2008 +++ php-src/ext/standard/tests/math/hypot_error.phptMon Jan 12 14:30:30 2009 @@ -1,17 +1,33 @@ --TEST-- Test hypot() - wrong params test hypot() ---INI-- -precision=14 --FILE-- +===Done=== --EXPECTF-- +*** Testing hypot() : error conditions *** + +-- Testing hypot() function with less than expected no. of arguments -- Warning: hypot() expects exactly 2 parameters, 0 given in %s on line %d Warning: hypot() expects exactly 2 parameters, 1 given in %s on line %d +-- Testing hypot() function with more than expected no. of arguments -- + Warning: hypot() expects exactly 2 parameters, 3 given in %s on line %d +===Done=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/hexdec_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/math/hexdec_error.phpt diff -u php-src/ext/standard/tests/math/hexdec_error.phpt:1.1 php-src/ext/standard/tests/math/hexdec_error.phpt:1.2 --- php-src/ext/standard/tests/math/hexdec_error.phpt:1.1 Wed Feb 6 08:39:23 2008 +++ php-src/ext/standard/tests/math/hexdec_error.phpt Mon Jan 12 14:30:30 2009 @@ -2,11 +2,35 @@ Test hexdec() - wrong params test hexdec() --FILE-- --EXPECTF-- +*** Testing hexdec() : error conditions *** + +-- Incorrect number of arguments -- Warning: hexdec() expects exactly 1 parameter, 0 given in %s on line %d Warning: hexdec() expects exactly 1 parameter, 2 given in %s on line %d + +-- Incorrect input -- + +Catchable fatal error: Object of class classA could not be converted to binary string in %s on line %d \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/expm1_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/math/expm1_variation1.phpt +++ php-src/ext/standard/tests/math/expm1_variation1.phpt --TEST-- Test expm1() function : usage variations - different data types as $arg argument --INI-- precision=14 --FILE-- ===Done=== --EXPECTF-- *** Testing expm1() : usage variations *** -- Iteration 1 -- float(0) -- Iteration 2 -- float(1.718281828459) -- Iteration 3 -- float(INF) -- Iteration 4 -- float(-1) -- Iteration 5 -- float(36314.502674247) -- Iteration 6 -- float(-0.7246355065) -- Iteration 7 -- float(INF) -- Iteration 8 -- float(0.0012353302826471) -- Iteration 9 -- float(0.64872127070013) -- Iteration 10 -- float(0) -- Iteration 11 -- float(0) -- Iteration 12 -- float(1.718281828459) -- Iteration 13 -- float(0) -- Iteration 14 -- float(1.718281828459) -- Iteration 15 -- float(0) -- Iteration 16 -- Warning: expm1() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 17 -- Warning: expm1() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 18 -- Warning: expm1() expects parameter 1 to be double, array given in %s on line %d NULL -- Iteration 19 -- Warning: expm1() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 20 -- Warning: expm1() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 21 -- Warning: expm1() expects parameter 1 to be double, Unicode string given in %s on line %d NULL -- Iteration 22 -- Warning: expm1() expects parameter 1 to be double, array given in %s on line %d NULL -- Iteration 23 -- Warning: expm1() expects parame
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xml compat.c
scottmacMon Jan 12 14:30:21 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/xmlcompat.c Log: MFH The previous error was masked by a missing entry, sync them back up. http://cvs.php.net/viewvc.cgi/php-src/ext/xml/compat.c?r1=1.44.2.4.2.6&r2=1.44.2.4.2.7&diff_format=u Index: php-src/ext/xml/compat.c diff -u php-src/ext/xml/compat.c:1.44.2.4.2.6 php-src/ext/xml/compat.c:1.44.2.4.2.7 --- php-src/ext/xml/compat.c:1.44.2.4.2.6 Mon Jan 12 13:42:15 2009 +++ php-src/ext/xml/compat.cMon Jan 12 14:30:21 2009 @@ -623,6 +623,7 @@ "No memory", "Invalid document start", "Empty document", + "Not well-formed (invalid token)", "Invalid document end", "Invalid hexadecimal character reference", "Invalid decimal character reference", -- 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 compat.c
scottmacMon Jan 12 14:28:05 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/xmlcompat.c Log: Fix build, missing comma http://cvs.php.net/viewvc.cgi/php-src/ext/xml/compat.c?r1=1.44.2.4.2.1.2.6&r2=1.44.2.4.2.1.2.7&diff_format=u Index: php-src/ext/xml/compat.c diff -u php-src/ext/xml/compat.c:1.44.2.4.2.1.2.6 php-src/ext/xml/compat.c:1.44.2.4.2.1.2.7 --- php-src/ext/xml/compat.c:1.44.2.4.2.1.2.6 Mon Jan 12 14:26:47 2009 +++ php-src/ext/xml/compat.cMon Jan 12 14:28:05 2009 @@ -623,7 +623,7 @@ "No memory", "Invalid document start", "Empty document", - "Not well-formed (invalid token)" + "Not well-formed (invalid token)", "Invalid document end", "Invalid hexadecimal character reference", "Invalid decimal character reference", -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml compat.c
scottmacMon Jan 12 14:27:39 2009 UTC Modified files: /php-src/ext/xmlcompat.c Log: The previous error was masked by a missing entry, sync them back up. http://cvs.php.net/viewvc.cgi/php-src/ext/xml/compat.c?r1=1.54&r2=1.55&diff_format=u Index: php-src/ext/xml/compat.c diff -u php-src/ext/xml/compat.c:1.54 php-src/ext/xml/compat.c:1.55 --- php-src/ext/xml/compat.c:1.54 Mon Jan 12 13:36:41 2009 +++ php-src/ext/xml/compat.cMon Jan 12 14:27:39 2009 @@ -623,6 +623,7 @@ "No memory", "Invalid document start", "Empty document", + "Not well-formed (invalid token)", "Invalid document end", "Invalid hexadecimal character reference", "Invalid decimal character reference", -- 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 compat.c
scottmacMon Jan 12 14:26:47 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/xmlcompat.c Log: The previous error was masked by a missing entry, sync them back up. http://cvs.php.net/viewvc.cgi/php-src/ext/xml/compat.c?r1=1.44.2.4.2.1.2.5&r2=1.44.2.4.2.1.2.6&diff_format=u Index: php-src/ext/xml/compat.c diff -u php-src/ext/xml/compat.c:1.44.2.4.2.1.2.5 php-src/ext/xml/compat.c:1.44.2.4.2.1.2.6 --- php-src/ext/xml/compat.c:1.44.2.4.2.1.2.5 Mon Jan 12 13:34:33 2009 +++ php-src/ext/xml/compat.cMon Jan 12 14:26:47 2009 @@ -623,6 +623,7 @@ "No memory", "Invalid document start", "Empty document", + "Not well-formed (invalid token)" "Invalid document end", "Invalid hexadecimal character reference", "Invalid decimal character reference", -- 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) / NEWS /ext/mysqli mysqli_fe.c /ext/mysqli/tests bug47050.phpt
johannesMon Jan 12 14:04:32 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysqli/tests bug47050.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysqli mysqli_fe.c
Log:
MFH: Fix #47050 mysqli_poll() modifies improper variables
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.444&r2=1.2027.2.547.2.965.2.445&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.444
php-src/NEWS:1.2027.2.547.2.965.2.445
--- php-src/NEWS:1.2027.2.547.2.965.2.444 Mon Jan 12 12:56:01 2009
+++ php-src/NEWSMon Jan 12 14:04:31 2009
@@ -27,6 +27,7 @@
- Added ICU support to SQLite3 when using the bundled version. (Scott)
- Enabled the salsa hashing functions. (Scott)
+- Fixed bug #47050 (mysqli_poll() modifies improper variables). (Johannes)
- Fixed bug #46957 (The tokenizer returns deprecated values). (Felipe)
- Fixed bug #46944 (UTF-8 characters outside the BMP aren't encoded correctly).
(Scott)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.49.2.5.2.1.2.12&r2=1.49.2.5.2.1.2.13&diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.12
php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.13
--- php-src/ext/mysqli/mysqli_fe.c:1.49.2.5.2.1.2.12Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqli/mysqli_fe.c Mon Jan 12 14:04:32 2009
@@ -15,7 +15,7 @@
| Author: Georg Richter |
+--+
- $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.12 2008/12/31 11:15:39 sebastian Exp $
+ $Id: mysqli_fe.c,v 1.49.2.5.2.1.2.13 2009/01/12 14:04:32 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -42,6 +42,13 @@
ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_poll, 0, 0, 4)
+ ZEND_ARG_ARRAY_INFO(1, read, 1)
+ ZEND_ARG_ARRAY_INFO(1, write, 1)
+ ZEND_ARG_ARRAY_INFO(1, error, 1)
+ ZEND_ARG_INFO(0, sec)
+ ZEND_ARG_INFO(0, usec)
+ZEND_END_ARG_INFO();
/* {{{ mysqli_functions[]
*
@@ -114,7 +121,7 @@
PHP_FE(mysqli_options,
NULL)
PHP_FE(mysqli_ping,
NULL)
#if defined(MYSQLI_USE_MYSQLND)
- PHP_FE(mysqli_poll,
NULL)
+ PHP_FE(mysqli_poll,
arginfo_mysqli_poll)
#endif
PHP_FE(mysqli_prepare,
NULL)
PHP_FE(mysqli_report,
NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug47050.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/bug47050.phpt
+++ php-src/ext/mysqli/tests/bug47050.phpt
--TEST--
Bug #47050 (mysqli_poll() modifies improper variables)
--SKIPIF--
--FILE--
query("SELECT 'test'", MYSQLI_ASYNC);
$all_links = array($link1);
$links = $errors = $reject = $all_links;
mysqli_poll($links, $errors, $reject, 1);
echo "links: ", sizeof($links), "\n";
echo "errors: ",sizeof($errors), "\n";
echo "reject: ",sizeof($reject), "\n";
echo "all_links: ", sizeof($all_links), "\n";
$link1->close();
?>
--EXPECT--
links: 1
errors: 0
reject: 0
all_links: 1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_fe.c /ext/mysqli/tests bug47050.phpt
johannesMon Jan 12 14:01:47 2009 UTC
Added files:
/php-src/ext/mysqli/tests bug47050.phpt
Modified files:
/php-src/ext/mysqli mysqli_fe.c
Log:
Fix #47050 mysqli_poll() modifies improper variables
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.68&r2=1.69&diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.68 php-src/ext/mysqli/mysqli_fe.c:1.69
--- php-src/ext/mysqli/mysqli_fe.c:1.68 Wed Dec 31 11:12:33 2008
+++ php-src/ext/mysqli/mysqli_fe.c Mon Jan 12 14:01:47 2009
@@ -17,7 +17,7 @@
| Ulf Wendel |
+--+
- $Id: mysqli_fe.c,v 1.68 2008/12/31 11:12:33 sebastian Exp $
+ $Id: mysqli_fe.c,v 1.69 2009/01/12 14:01:47 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -44,6 +44,13 @@
ZEND_BEGIN_ARG_INFO(all_args_force_by_ref, 1)
ZEND_END_ARG_INFO();
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_poll, 0, 0, 4)
+ ZEND_ARG_ARRAY_INFO(1, read, 1)
+ ZEND_ARG_ARRAY_INFO(1, write, 1)
+ ZEND_ARG_ARRAY_INFO(1, error, 1)
+ ZEND_ARG_INFO(0, sec)
+ ZEND_ARG_INFO(0, usec)
+ZEND_END_ARG_INFO();
/* {{{ mysqli_functions[]
*
@@ -116,7 +123,7 @@
PHP_FE(mysqli_options,
NULL)
PHP_FE(mysqli_ping,
NULL)
#if defined(MYSQLI_USE_MYSQLND)
- PHP_FE(mysqli_poll,
NULL)
+ PHP_FE(mysqli_poll,
arginfo_mysqli_poll)
#endif
PHP_FE(mysqli_prepare,
NULL)
PHP_FE(mysqli_report,
NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug47050.phpt?view=markup&rev=1.1
Index: php-src/ext/mysqli/tests/bug47050.phpt
+++ php-src/ext/mysqli/tests/bug47050.phpt
--TEST--
Bug #47050 (mysqli_poll() modifies improper variables)
--SKIPIF--
--FILE--
query("SELECT 'test'", MYSQLI_ASYNC);
$all_links = array($link1);
$links = $errors = $reject = $all_links;
mysqli_poll($links, $errors, $reject, 1);
echo "links: ", sizeof($links), "\n";
echo "errors: ",sizeof($errors), "\n";
echo "reject: ",sizeof($reject), "\n";
echo "all_links: ", sizeof($all_links), "\n";
$link1->close();
?>
--EXPECT--
links: 1
errors: 0
reject: 0
all_links: 1
--
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/xml compat.c
scottmacMon Jan 12 13:42:15 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/xmlcompat.c
Log:
MFH This entry doesn't exist upstream any more, it also caused all error
messages to be one off.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1389&r2=1.2027.2.547.2.1390&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1389 php-src/NEWS:1.2027.2.547.2.1390
--- php-src/NEWS:1.2027.2.547.2.1389Sun Jan 11 12:03:43 2009
+++ php-src/NEWSMon Jan 12 13:42:15 2009
@@ -14,6 +14,8 @@
correctly with a non truecolour image. Reported by Hamid Ebadi,
APA Laboratory (Fixes CVE-2008-5498). (Scott)
- Fixed a segfault when malformed string is passed to json_decode(). (Scott)
+- Fixed bug in xml_error_string() which resulted in messages being
+ off by one. (Scott)
- Fixed bug #47042 (PHP cgi sapi is removing SCRIPT_FILENAME for non apache).
(Sriram Natarajan)
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/compat.c?r1=1.44.2.4.2.5&r2=1.44.2.4.2.6&diff_format=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.44.2.4.2.5
php-src/ext/xml/compat.c:1.44.2.4.2.6
--- php-src/ext/xml/compat.c:1.44.2.4.2.5 Sun Jan 11 12:01:55 2009
+++ php-src/ext/xml/compat.cMon Jan 12 13:42:15 2009
@@ -620,7 +620,6 @@
static const XML_Char *const error_mapping[] = {
"No error",
- "Internal error",
"No memory",
"Invalid document start",
"Empty document",
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xml compat.c
scottmacMon Jan 12 13:36:41 2009 UTC
Modified files:
/php-src/ext/xmlcompat.c
Log:
MFB This entry doesn't exist upstream any more, it also caused all error
messages to be one off.
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/compat.c?r1=1.53&r2=1.54&diff_format=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.53 php-src/ext/xml/compat.c:1.54
--- php-src/ext/xml/compat.c:1.53 Sun Jan 11 12:00:30 2009
+++ php-src/ext/xml/compat.cMon Jan 12 13:36:41 2009
@@ -620,7 +620,6 @@
static const XML_Char *const error_mapping[] = {
"No error",
- "Internal error",
"No memory",
"Invalid document start",
"Empty document",
--
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 compat.c
scottmacMon Jan 12 13:34:33 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xmlcompat.c
Log:
This entry doesn't exist upstream any more, it also caused all error messages
to be one off.
http://cvs.php.net/viewvc.cgi/php-src/ext/xml/compat.c?r1=1.44.2.4.2.1.2.4&r2=1.44.2.4.2.1.2.5&diff_format=u
Index: php-src/ext/xml/compat.c
diff -u php-src/ext/xml/compat.c:1.44.2.4.2.1.2.4
php-src/ext/xml/compat.c:1.44.2.4.2.1.2.5
--- php-src/ext/xml/compat.c:1.44.2.4.2.1.2.4 Sun Jan 11 12:01:16 2009
+++ php-src/ext/xml/compat.cMon Jan 12 13:34:33 2009
@@ -620,7 +620,6 @@
static const XML_Char *const error_mapping[] = {
"No error",
- "Internal error",
"No memory",
"Invalid document start",
"Empty document",
--
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) / NEWS /ext/mysqli mysqli.c mysqli_prop.c /ext/mysqli/tests mysqli_fetch_lengths_oo.phpt mysqli_result_references.phpt
johannesMon Jan 12 12:56:02 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/mysqli mysqli.c mysqli_prop.c
/php-src/ext/mysqli/tests mysqli_fetch_lengths_oo.phpt
mysqli_result_references.phpt
Log:
MFH Fix #45940 MySQLI OO does not populate connect_error property on failed
connect
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.443&r2=1.2027.2.547.2.965.2.444&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.443
php-src/NEWS:1.2027.2.547.2.965.2.444
--- php-src/NEWS:1.2027.2.547.2.965.2.443 Sun Jan 11 23:43:45 2009
+++ php-src/NEWSMon Jan 12 12:56:01 2009
@@ -51,6 +51,8 @@
(Scott)
- Fixed bug #45989 (json_decode() doesn't return NULL on certain invalid
strings). (magicaltux, Scott)
+- Fixed bug #45940 (MySQLI OO does not populate connect_error property on
+ failed connect). (Johannes)
- Fixed bug #45820 (Allow empty keys in ArrayObject). (Etienne)
- Fixed bug #45791 (json_decode() doesn't convert 0e0 to a double). (Scott)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.36&r2=1.72.2.16.2.17.2.37&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.36
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.37
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.36 Wed Jan 7 16:32:08 2009
+++ php-src/ext/mysqli/mysqli.c Mon Jan 12 12:56:01 2009
@@ -17,7 +17,7 @@
| Ulf Wendel |
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.36 2009/01/07 16:32:08 johannes Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.37 2009/01/12 12:56:01 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -355,14 +355,6 @@
}
if (ret == SUCCESS) {
- if (strcmp(obj->zo.ce->name, "mysqli_driver") &&
- (!obj->ptr || ((MYSQLI_RESOURCE *)(obj->ptr))->status <
MYSQLI_STATUS_INITIALIZED))
- {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't
fetch %s", obj->zo.ce->name );
- retval = EG(uninitialized_zval_ptr);
- return(retval);
- }
-
ret = hnd->read_func(obj, &retval TSRMLS_CC);
if (ret == SUCCESS) {
/* ensure we're creating a temporary variable */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.23.2.5.2.2.2.10&r2=1.23.2.5.2.2.2.11&diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.10
php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.11
--- php-src/ext/mysqli/mysqli_prop.c:1.23.2.5.2.2.2.10 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqli/mysqli_prop.cMon Jan 12 12:56:01 2009
@@ -15,7 +15,7 @@
| Author: Georg Richter |
+--+
- $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.10 2008/12/31 11:15:39 sebastian Exp $
+ $Id: mysqli_prop.c,v 1.23.2.5.2.2.2.11 2009/01/12 12:56:01 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -30,7 +30,7 @@
#include "php_mysqli_structs.h"
#define CHECK_STATUS(value) \
- if (((MYSQLI_RESOURCE *)obj->ptr)->status < value ) { \
+ if (!obj->ptr || ((MYSQLI_RESOURCE *)obj->ptr)->status < value ) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Property access is
not allowed yet"); \
ZVAL_NULL(*retval); \
return SUCCESS; \
@@ -134,7 +134,6 @@
static int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MAKE_STD_ZVAL(*retval);
- CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
ZVAL_LONG(*retval, (long)MyG(error_no));
return SUCCESS;
}
@@ -144,8 +143,11 @@
static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MAKE_STD_ZVAL(*retval);
- CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
- ZVAL_STRING(*retval, MyG(error_msg), 1);
+ if (MyG(error_msg)) {
+ ZVAL_STRING(*retval, MyG(error_msg), 1);
+ } else {
+ ZVAL_NULL(*retval);
+ }
return SUCCESS;
}
/* }}} */
@@ -158,6 +160,8 @@
MAKE_STD_ZVAL(*retval);
+ CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+
mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
if (!mysql) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
diff -u php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.2.2.2
php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.2.2.3
--- php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.2.2.2 Wed Oct
10 10:14:38 2007
+++ php-src/ext/mys
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c mysqli_prop.c /ext/mysqli/tests mysqli_fetch_lengths_oo.phpt mysqli_result_references.phpt
johannesMon Jan 12 12:54:17 2009 UTC
Modified files:
/php-src/ext/mysqli mysqli.c mysqli_prop.c
/php-src/ext/mysqli/tests mysqli_fetch_lengths_oo.phpt
mysqli_result_references.phpt
Log:
- Fix #45940 MySQLI OO does not populate connect_error property on failed
connect
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.141&r2=1.142&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.141 php-src/ext/mysqli/mysqli.c:1.142
--- php-src/ext/mysqli/mysqli.c:1.141 Wed Jan 7 16:29:42 2009
+++ php-src/ext/mysqli/mysqli.c Mon Jan 12 12:54:17 2009
@@ -17,7 +17,7 @@
| Ulf Wendel |
+--+
- $Id: mysqli.c,v 1.141 2009/01/07 16:29:42 johannes Exp $
+ $Id: mysqli.c,v 1.142 2009/01/12 12:54:17 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -347,13 +347,6 @@
}
if (ret == SUCCESS) {
- if ((!obj->ptr || ((MYSQLI_RESOURCE *)(obj->ptr))->status <
MYSQLI_STATUS_INITIALIZED))
- {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't
fetch %v", obj->zo.ce->name );
- retval = EG(uninitialized_zval_ptr);
- return(retval);
- }
-
ret = hnd->read_func(obj, &retval TSRMLS_CC);
if (ret == SUCCESS) {
/* ensure we're creating a temporary variable */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_prop.c?r1=1.41&r2=1.42&diff_format=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.41
php-src/ext/mysqli/mysqli_prop.c:1.42
--- php-src/ext/mysqli/mysqli_prop.c:1.41 Wed Dec 31 11:12:33 2008
+++ php-src/ext/mysqli/mysqli_prop.cMon Jan 12 12:54:17 2009
@@ -17,7 +17,7 @@
| Ulf Wendel |
+--+
- $Id: mysqli_prop.c,v 1.41 2008/12/31 11:12:33 sebastian Exp $
+ $Id: mysqli_prop.c,v 1.42 2009/01/12 12:54:17 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -32,7 +32,7 @@
#include "php_mysqli_structs.h"
#define CHECK_STATUS(value) \
- if (((MYSQLI_RESOURCE *)obj->ptr)->status < value ) { \
+ if (!obj->ptr || ((MYSQLI_RESOURCE *)obj->ptr)->status < value ) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Property access is
not allowed yet"); \
ZVAL_NULL(*retval); \
return SUCCESS; \
@@ -136,7 +136,6 @@
static int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MAKE_STD_ZVAL(*retval);
- CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
ZVAL_LONG(*retval, (long)MyG(error_no));
return SUCCESS;
}
@@ -146,8 +145,11 @@
static int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
{
MAKE_STD_ZVAL(*retval);
- CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
- ZVAL_UTF8_STRING(*retval, MyG(error_msg), ZSTR_DUPLICATE)
+ if (MyG(error_msg)) {
+ ZVAL_UTF8_STRING(*retval, MyG(error_msg), ZSTR_DUPLICATE);
+ } else {
+ ZVAL_NULL(*retval);
+ }
return SUCCESS;
}
/* }}} */
@@ -160,6 +162,8 @@
MAKE_STD_ZVAL(*retval);
+ CHECK_STATUS(MYSQLI_STATUS_INITIALIZED);
+
mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)(obj->ptr))->ptr;
if (!mysql) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
diff -u php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.2
php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.3
--- php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt:1.2 Thu Aug 9
10:01:19 2007
+++ php-src/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt Mon Jan 12
12:54:17 2009
@@ -38,6 +38,6 @@
}
NULL
-Warning: main(): Couldn't fetch mysqli_result in %s on line %d
+Warning: main(): Property access is not allowed yet in %s on line %d
NULL
-done!
\ No newline at end of file
+done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_result_references.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqli/tests/mysqli_result_references.phpt
diff -u php-src/ext/mysqli/tests/mysqli_result_references.phpt:1.4
php-src/ext/mysqli/tests/mysqli_result_references.phpt:1.5
--- php-src/ext/mysqli/tests/mysqli_result_references.phpt:1.4 Tue Jan 6
00:56:04 2009
+++ php-src/ext/mysqli/tests/mysqli_result_references.phpt Mon Jan 12
12:54:17 2009
@@ -125,7 +125,17 @@
&long(4) refcount(2)
}
[6]=>
- &object(mysqli_result)#2 (0) refcount(2){
+ &object(mysqli_result)#2 (5) refcount(2){
+["current_field"]=>
+NULL refcount(1)
+["field_count"]=>
+NULL refcount(1)
+
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-dist php.ini-recommended
tony2001Mon Jan 12 10:47:47 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-dist php.ini-recommended Log: fix typo http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.22.2.16&r2=1.231.2.10.2.22.2.17&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.22.2.16 php-src/php.ini-dist:1.231.2.10.2.22.2.17 --- php-src/php.ini-dist:1.231.2.10.2.22.2.16 Fri Jan 9 14:59:29 2009 +++ php-src/php.ini-distMon Jan 12 10:47:47 2009 @@ -747,7 +747,7 @@ ; the 5th parameter to mail(), even in safe mode. ;mail.force_extra_parameters = -; Add X-PHP-Originaiting-Script: that will include uid of the script followed by the filename +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = Off ; Log all mail() calls including the full path of the script, line #, to address and headers http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.17&r2=1.179.2.11.2.23.2.18&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.17 php-src/php.ini-recommended:1.179.2.11.2.23.2.18 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.17Fri Jan 9 14:59:30 2009 +++ php-src/php.ini-recommended Mon Jan 12 10:47:47 2009 @@ -799,7 +799,7 @@ ; the 5th parameter to mail(), even in safe mode. ;mail.force_extra_parameters = -; Add X-PHP-Originaiting-Script: that will include uid of the script followed by the filename +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = On ; Log all mail() calls including the full path of the script, line #, to address and headers -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
tony2001Mon Jan 12 10:46:31 2009 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: fix typo (reported by Richard Quadling) http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.286&r2=1.287&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.286 php-src/php.ini-dist:1.287 --- php-src/php.ini-dist:1.286 Fri Jan 9 15:00:36 2009 +++ php-src/php.ini-distMon Jan 12 10:46:31 2009 @@ -669,7 +669,7 @@ ; the 5th parameter to mail(), even in safe mode. ;mail.force_extra_parameters = -; Add X-PHP-Originaiting-Script: that will include uid of the script followed by the filename +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = Off ; Log all mail() calls including the full path of the script, line #, to address and headers http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.236&r2=1.237&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.236 php-src/php.ini-recommended:1.237 --- php-src/php.ini-recommended:1.236 Fri Jan 9 15:00:36 2009 +++ php-src/php.ini-recommended Mon Jan 12 10:46:31 2009 @@ -706,7 +706,7 @@ ; the 5th parameter to mail(), even in safe mode. ;mail.force_extra_parameters = -; Add X-PHP-Originaiting-Script: that will include uid of the script followed by the filename +; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = On ; Log all mail() calls including the full path of the script, line #, to address and headers -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
