[PHP-CVS] cvs: php-src(PHP_5_3) / UPGRADING
gwynne Thu Jun 25 07:57:05 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Whitespace fixes, reformatting to bring all lines to 80 cols, grammatical fixes, removed redundant information http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.21&r2=1.1.2.3.2.1.2.22&diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.21 php-src/UPGRADING:1.1.2.3.2.1.2.22 --- php-src/UPGRADING:1.1.2.3.2.1.2.21 Wed Jun 24 22:26:56 2009 +++ php-src/UPGRADING Thu Jun 25 07:57:05 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.21 2009/06/24 22:26:56 johannes Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.22 2009/06/25 07:57:05 gwynne Exp $ UPGRADE NOTES - PHP 5.3 @@ -44,9 +44,9 @@ successful. - The array functions natsort(), natcasesort(), usort(), uasort(), uksort(), - array_flip() and array_unique(), no longer accept objects passed as arguments. - If you need to access their properties using an object, you will need to cast - the objects to arrays first. + array_flip(), and array_unique() no longer accept objects passed as arguments. + If you need to use them to access an object's properties, you must cast the + object to an array first. - var_dump() output now includes private object members. @@ -59,76 +59,76 @@ - clearstatcache() no longer clears the realpath cache by default. -- realpath() is no longer system dependent and works the same on any platform. +- realpath() is no longer system-dependent and works identically on all + platforms. - call_user_func() now propagates $this even if the callee is the parent class. -- The filesystem functions opendir(), scandir() and dir() now use the default - context if no context is passed as an argument to them. +- The filesystem functions opendir(), scandir(), and dir() now use the default + context if no context argument is passed. - The behaviour of functions with by-reference parameters called by value has changed. Where previously the function would accept the by-value argument, a warning is now emitted and all by-ref parameters are set to NULL. -- There is now native support for the following math functions: asinh(), acosh(), - atanh(), log1p() and expm1(). +- There is now native support for the following math functions: asinh(), + acosh(), atanh(), log1p(), and expm1(). - In the GD extension, there is now pixelation support available through the imagefilter() function. -- crypt() now has Blowfish and extended DES support, and crypt() features are now - 100% portable. PHP has its own internal crypt implementation which drops into - place when support for crypt or crypt_r() is not found. +- crypt() now has Blowfish and extended DES support, and crypt() features are + now 100% portable. PHP has its own internal crypt implementation which drops + into place when system support for crypt or crypt_r() is not found. - get_cfg_var() is now able to return "array" INI options. -- Stream wrappers can now be used by include_path(). +- Stream wrappers can now be used by the include_path INI directive. -- There are new parameters in: - clearstatcache(): clear_realpath_cache and filename. - copy(): context. - fgetcsv(): escape. - ini_get_all(): details. - json_encode(): options. - json_decode(): depth. - nl2br(): is_xhtml. - parse_ini_file(): scanner_mode. - round(): mode. - stream_context_create(): params. - strstr(), stristr(): before_needle. - sybase_connect(): new. - -- And new mode options for fopen, 'n' (O_NONBLOCK) - -- The new mysqlnd library necessitates using MySQL's newer 41 byte password format. - Continued use of the old 16 byte passwords will cause mysql_connect() to produce - the following error message: "mysqlnd cannot connect to MySQL 4.1+ using old - authentication" - -- The dl() function is now disabled by default, and only available under the cli, - cgi and the embed SAPIs. +- These functions now take new parameters: + clearstatcache(): $clear_realpath_cache and $filename. + copy(): $context + fgetcsv(): $escape + ini_get_all(): $details + json_encode(): $options + json_decode(): $depth + nl2br(): $is_xhtml + parse_ini_file(): $scanner_mode + round(): $mode + stream_context_create(): $params + strstr(), stristr(): $before_needle + sybase_connect(): $new + +- And new mode option for fopen: 'n' (O_NONBLOCK) + +- The new mysqlnd library necessitates using MySQL's newer 41-byte password + format. Continued use of the old 16 byte passwords will cause mysql_connect() + and other related functsins to produce the following error message: + "mysqlnd cannot connect to MySQL 4.1+ using old authentication" -- Changed opendir(), dir() and scandir() to use default context when no context - argument is passed. +- The dl() function is now disabled by default, and only available under the + cli, cgi, and embed SAPIs.
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite sqlite.c /ext/sqlite/tests bug48679.phpt
johannesThu Jun 25 09:38:04 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/sqlite/tests bug48679.phpt
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
MFH Fix bug #48679 - Crash in SQLite with count on an unbuffered query set
(Scott)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.21&r2=1.166.2.13.2.9.2.22&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.21
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.22
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.21 Sun Mar 22 15:05:20 2009
+++ php-src/ext/sqlite/sqlite.c Thu Jun 25 09:38:04 2009
@@ -17,7 +17,7 @@
| Marcus Boerger |
+--+
- $Id: sqlite.c,v 1.166.2.13.2.9.2.21 2009/03/22 15:05:20 iliaa Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9.2.22 2009/06/25 09:38:04 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1458,7 +1458,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.21 2009/03/22
15:05:20 iliaa Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.9.2.22 2009/06/25
09:38:04 johannes Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -2819,6 +2819,11 @@
{
sqlite_object *obj = (sqlite_object*)
zend_object_store_get_object(object TSRMLS_CC);
+ if (obj->u.res == NULL) {
+ zend_throw_exception(sqlite_ce_exception, "Row count is not
available for this query", 0 TSRMLS_CC);
+ return FAILURE;
+ }
+
if (obj->u.res->buffered) {
* count = obj->u.res->nrows;
return SUCCESS;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/tests/bug48679.phpt?view=markup&rev=1.1
Index: php-src/ext/sqlite/tests/bug48679.phpt
+++ php-src/ext/sqlite/tests/bug48679.phpt
--TEST--
Bug #48679 (sqlite2 count on unbuffered query causes segfault)
--SKIPIF--
--FILE--
getMessage());
}
echo "Done\n";
?>
--EXPECT--
unicode(41) "Row count is not available for this query"
Done
--
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_2) /ext/sqlite sqlite.c /ext/sqlite/tests bug48679.phpt
Scott, On Thu, 2009-06-25 at 00:07 +, Scott MacVicar wrote: > scottmac Thu Jun 25 00:07:21 2009 UTC > > Added files: (Branch: PHP_5_2) [...] > --EXPECT-- > unicode(41) "Row count is not available for this query" > Done I doubt that works in this branch, and I think this branch deserves a NEWS entry. johanne -- 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) / UPGRADING
gwynne Thu Jun 25 10:41:07 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: fix a little typo I made, bug #48685 http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.22&r2=1.1.2.3.2.1.2.23&diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.22 php-src/UPGRADING:1.1.2.3.2.1.2.23 --- php-src/UPGRADING:1.1.2.3.2.1.2.22 Thu Jun 25 07:57:05 2009 +++ php-src/UPGRADING Thu Jun 25 10:41:07 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.22 2009/06/25 07:57:05 gwynne Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.23 2009/06/25 10:41:07 gwynne Exp $ UPGRADE NOTES - PHP 5.3 @@ -103,7 +103,7 @@ - The new mysqlnd library necessitates using MySQL's newer 41-byte password format. Continued use of the old 16 byte passwords will cause mysql_connect() - and other related functsins to produce the following error message: + and other related functions to produce the following error message: "mysqlnd cannot connect to MySQL 4.1+ using old authentication" - The dl() function is now disabled by default, and only available under the -- 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_2) /ext/sqlite sqlite.c /ext/sqlite/tests bug48679.phpt
On 25 Jun 2009, at 10:40, Johannes Schlüter wrote: Scott, On Thu, 2009-06-25 at 00:07 +, Scott MacVicar wrote: scottmacThu Jun 25 00:07:21 2009 UTC Added files: (Branch: PHP_5_2) [...] --EXPECT-- unicode(41) "Row count is not available for this query" Done I doubt that works in this branch, and I think this branch deserves a NEWS entry. The commit email is wrong, it definitely says string(41) in CVS and no one changed it. Scott -- 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_2) /ext/sqlite sqlite.c /ext/sqlite/tests bug48679.phpt
2009/6/25 Scott MacVicar : > On 25 Jun 2009, at 10:40, Johannes Schlüter wrote: > >> Scott, >> >> On Thu, 2009-06-25 at 00:07 +, Scott MacVicar wrote: >>> >>> scottmac Thu Jun 25 00:07:21 2009 UTC >>> >>> Added files: (Branch: PHP_5_2) >> >> [...] >>> >>> --EXPECT-- >>> unicode(41) "Row count is not available for this query" >>> Done >> >> I doubt that works in this branch, and I think this branch deserves a >> NEWS entry. >> > > The commit email is wrong, it definitely says string(41) in CVS and no one > changed it. Right, note the link in the mail "?view=markup&rev=1.1". Its hardcoded in the commit script that a new file (in any branch) will send out rev1.1 on that file. -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/date/tests strftime_variation22.phpt
zoe Thu Jun 25 12:36:46 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/tests strftime_variation22.phpt
Log:
fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strftime_variation22.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/date/tests/strftime_variation22.phpt
diff -u php-src/ext/date/tests/strftime_variation22.phpt:1.1.2.3
php-src/ext/date/tests/strftime_variation22.phpt:1.1.2.4
--- php-src/ext/date/tests/strftime_variation22.phpt:1.1.2.3Tue Jan 27
14:22:17 2009
+++ php-src/ext/date/tests/strftime_variation22.phptThu Jun 25 12:36:46 2009
@@ -5,6 +5,9 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
+if(!setlocale(LC_ALL, "en_US.utf8", "en_US")) {
+ die("skip Locale en_US.utf8 or en_US is needed by test and is not
available");
+}
?>
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/tests strftime_variation22.phpt
zoe Thu Jun 25 12:37:45 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date/tests strftime_variation22.phpt
Log:
fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/strftime_variation22.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/date/tests/strftime_variation22.phpt
diff -u php-src/ext/date/tests/strftime_variation22.phpt:1.1.4.2
php-src/ext/date/tests/strftime_variation22.phpt:1.1.4.3
--- php-src/ext/date/tests/strftime_variation22.phpt:1.1.4.2Wed Jan 21
10:52:32 2009
+++ php-src/ext/date/tests/strftime_variation22.phptThu Jun 25 12:37:45 2009
@@ -5,6 +5,9 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
+if (!setlocale(LC_ALL, "en_US")) {
+die("skip The en_US locale is not available");
+}
?>
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
iliaa Thu Jun 25 12:41:41 2009 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
Fixed bug #48678 (DateInterval segfaults when unserialising)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.239&r2=1.240&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.239 php-src/ext/date/php_date.c:1.240
--- php-src/ext/date/php_date.c:1.239 Mon Jun 22 13:43:06 2009
+++ php-src/ext/date/php_date.c Thu Jun 25 12:41:41 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.239 2009/06/22 13:43:06 iliaa Exp $ */
+/* $Id: php_date.c,v 1.240 2009/06/25 12:41:41 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2316,6 +2316,10 @@
props = intervalobj->std.properties;
+ if (!intervalobj->initialized) {
+ return props;
+ }
+
#define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \
MAKE_STD_ZVAL(zv); \
ZVAL_LONG(zv, intervalobj->diff->f); \
--
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) / UPGRADING
mattwil Thu Jun 25 13:00:08 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Fix example - it means what it says http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.23&r2=1.1.2.3.2.1.2.24&diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.23 php-src/UPGRADING:1.1.2.3.2.1.2.24 --- php-src/UPGRADING:1.1.2.3.2.1.2.23 Thu Jun 25 10:41:07 2009 +++ php-src/UPGRADING Thu Jun 25 13:00:08 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.23 2009/06/25 10:41:07 gwynne Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.24 2009/06/25 13:00:08 mattwil Exp $ UPGRADE NOTES - PHP 5.3 @@ -285,7 +285,7 @@ Static HEREDOCs can be used to initialize static variables and class members or constants: - static $foo = <<<'LABEL' + static $foo = <
Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/phar/phar pharcommand.inc
On 25.06.2009, at 00:12, Greg Beaver wrote: cellog Wed Jun 24 22:12:47 2009 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/phar/phar pharcommand.inc Log: fix slightly unclear error message in generation of phar.phar This doesnt need to be merged to HEAD? regards, Lukas Kahwe Smith [email protected] -- 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 /ext/phar/phar pharcommand.inc
Lukas Kahwe Smith wrote: > > On 25.06.2009, at 00:12, Greg Beaver wrote: > >> cellogWed Jun 24 22:12:47 2009 UTC >> >> Modified files: (Branch: PHP_5_3) >>/php-srcNEWS >>/php-src/ext/phar/pharpharcommand.inc >> Log: >> fix slightly unclear error message in generation of phar.phar > > > This doesnt need to be merged to HEAD? Hi, It was merged to HEAD here http://news.php.net/php.cvs/58971 Thanks, Greg -- 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/date/tests gmstrftime_variation22.phpt
zoe Thu Jun 25 14:42:38 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date/tests gmstrftime_variation22.phpt
Log:
fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/gmstrftime_variation22.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/date/tests/gmstrftime_variation22.phpt
diff -u php-src/ext/date/tests/gmstrftime_variation22.phpt:1.1.2.1
php-src/ext/date/tests/gmstrftime_variation22.phpt:1.1.2.2
--- php-src/ext/date/tests/gmstrftime_variation22.phpt:1.1.2.1 Thu Jan 22
18:47:12 2009
+++ php-src/ext/date/tests/gmstrftime_variation22.phpt Thu Jun 25 14:42:38 2009
@@ -5,6 +5,10 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
+if (!setlocale(LC_ALL, "en_US")) {
+die("skip Locale en_US not available");
+}
+
?>
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests gmstrftime_variation22.phpt
zoe Thu Jun 25 14:44:01 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/tests gmstrftime_variation22.phpt
Log:
fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/gmstrftime_variation22.phpt?r1=1.1.4.3&r2=1.1.4.4&diff_format=u
Index: php-src/ext/date/tests/gmstrftime_variation22.phpt
diff -u php-src/ext/date/tests/gmstrftime_variation22.phpt:1.1.4.3
php-src/ext/date/tests/gmstrftime_variation22.phpt:1.1.4.4
--- php-src/ext/date/tests/gmstrftime_variation22.phpt:1.1.4.3 Tue Jan 27
14:22:17 2009
+++ php-src/ext/date/tests/gmstrftime_variation22.phpt Thu Jun 25 14:44:01 2009
@@ -5,6 +5,9 @@
if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
die("skip Test is not valid for Windows");
}
+if (!setlocale(LC_ALL, "en_US.utf8", "en_US")) {
+die("skip Locale en_US or en_US.utf8 is required to run this test");
+}
?>
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap.c /ext/ldap/tests bug48696.phpt
felipe Thu Jun 25 14:48:53 2009 UTC
Added files:
/php-src/ext/ldap/tests bug48696.phpt
Modified files:
/php-src/ext/ldap ldap.c
Log:
- Fixed bug #48696 (ldap_read() segfaults with invalid parameters)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.203&r2=1.204&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.203 php-src/ext/ldap/ldap.c:1.204
--- php-src/ext/ldap/ldap.c:1.203 Mon Jun 15 15:18:12 2009
+++ php-src/ext/ldap/ldap.c Thu Jun 25 14:48:53 2009
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.203 2009/06/15 15:18:12 patrickallaert Exp $ */
+/* $Id: ldap.c,v 1.204 2009/06/25 14:48:53 felipe Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -235,7 +235,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.203
2009/06/15 15:18:12 patrickallaert Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.204
2009/06/25 14:48:53 felipe Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -600,7 +600,7 @@
char *ldap_base_dn = NULL;
char *ldap_filter = NULL;
char **ldap_attrs = NULL;
- ldap_linkdata *ld;
+ ldap_linkdata *ld = NULL;
LDAPMessage *ldap_res;
int ldap_attrsonly = 0;
int ldap_sizelimit = -1;
@@ -817,8 +817,10 @@
}
cleanup:
- // Restoring previous options
- php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit,
old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref);
+ if (ld) {
+ /* Restoring previous options */
+ php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit,
old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref);
+ }
if (ldap_attrs != NULL) {
efree(ldap_attrs);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/bug48696.phpt?view=markup&rev=1.1
Index: php-src/ext/ldap/tests/bug48696.phpt
+++ php-src/ext/ldap/tests/bug48696.phpt
--TEST--
Bug #48696 (ldap_read() segfaults with invalid parameters)
--FILE--
--EXPECTF--
Warning: ldap_read(): supplied argument is not a valid ldap link resource in %s
on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings moneyformat.phpt
zoe Thu Jun 25 14:49:47 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings moneyformat.phpt
Log:
fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/moneyformat.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/moneyformat.phpt
diff -u php-src/ext/standard/tests/strings/moneyformat.phpt:1.1.2.2
php-src/ext/standard/tests/strings/moneyformat.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/moneyformat.phpt:1.1.2.2 Wed Jun 6
17:46:17 2007
+++ php-src/ext/standard/tests/strings/moneyformat.phpt Thu Jun 25 14:49:47 2009
@@ -5,6 +5,10 @@
if (!function_exists('money_format') || !function_exists('setlocale')) {
die("SKIP money_format - not supported\n");
}
+ if (setlocale(LC_MONETARY, 'en_US') === false) {
+ die('skip en_US locale not available');
+ }
+
?>
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / UPGRADING
felipe Thu Jun 25 14:56:14 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: - Added note about deprecation of "#" comment-style in .INI files http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.24&r2=1.1.2.3.2.1.2.25&diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.24 php-src/UPGRADING:1.1.2.3.2.1.2.25 --- php-src/UPGRADING:1.1.2.3.2.1.2.24 Thu Jun 25 13:00:08 2009 +++ php-src/UPGRADING Thu Jun 25 14:56:14 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.24 2009/06/25 13:00:08 mattwil Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.25 2009/06/25 14:56:14 felipe Exp $ UPGRADE NOTES - PHP 5.3 @@ -158,6 +158,8 @@ - session_register(), session_unregister(), and session_is_registered() are now deprecated. Use the $_SESSION superglobal array instead. +- Comments starting with '#' are deprecated in .INI files. + - The following ini directives will now emit an E_DEPRECATED warning upon startup if they are activated: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests bug48678.phpt
johannesThu Jun 25 15:04:14 2009 UTC Added files: /php-src/ext/date/tests bug48678.phpt Log: Add test http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug48678.phpt?view=markup&rev=1.1 Index: php-src/ext/date/tests/bug48678.phpt +++ php-src/ext/date/tests/bug48678.phpt --TEST-- Bug #48678 DateInterval segfaults when unserialising --FILE-- 3 [m] => 6 [d] => 4 [h] => 12 [i] => 30 [s] => 5 [invert] => 0 [days] => 0 ) DateInterval Object ( [y] => 3 [m] => 6 [d] => 4 [h] => 12 [i] => 30 [s] => 5 [invert] => 0 [days] => 0 ) -- 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/date php_date.c /ext/date/tests bug48678.phpt
johannesThu Jun 25 15:07:36 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug48678.phpt
Modified files:
/php-src/ext/date php_date.c
Log:
MFH: Fixed bug #48678 (DateInterval segfaults when unserialising (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.83&r2=1.43.2.45.2.51.2.84&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.83
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.84
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.83 Mon Jun 22 14:24:27 2009
+++ php-src/ext/date/php_date.c Thu Jun 25 15:07:36 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.83 2009/06/22 14:24:27 iliaa Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.84 2009/06/25 15:07:36 johannes Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2213,6 +2213,10 @@
props = intervalobj->std.properties;
+ if (!intervalobj->initialized) {
+ return props;
+ }
+
#define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \
MAKE_STD_ZVAL(zv); \
ZVAL_LONG(zv, intervalobj->diff->f); \
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug48678.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/bug48678.phpt
+++ php-src/ext/date/tests/bug48678.phpt
--TEST--
Bug #48678 DateInterval segfaults when unserialising
--FILE--
3
[m] => 6
[d] => 4
[h] => 12
[i] => 30
[s] => 5
[invert] => 0
[days] => 0
)
DateInterval Object
(
[y] => 3
[m] => 6
[d] => 4
[h] => 12
[i] => 30
[s] => 5
[invert] => 0
[days] => 0
)
--
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/ldap ldap.c /ext/ldap/tests bug48696.phpt
johannesThu Jun 25 15:19:30 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/ldap/tests bug48696.phpt
Modified files:
/php-src/ext/ldap ldap.c
Log:
MFH: Fixed bug #48696 (ldap_read() segfaults with invalid parameters) (Felipe)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.11.2.29&r2=1.161.2.3.2.11.2.30&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.29
php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.30
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.11.2.29 Mon Jun 15 15:18:31 2009
+++ php-src/ext/ldap/ldap.c Thu Jun 25 15:19:29 2009
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.11.2.29 2009/06/15 15:18:31 patrickallaert Exp $
*/
+/* $Id: ldap.c,v 1.161.2.3.2.11.2.30 2009/06/25 15:19:29 johannes Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -224,7 +224,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v
1.161.2.3.2.11.2.29 2009/06/15 15:18:31 patrickallaert Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v
1.161.2.3.2.11.2.30 2009/06/25 15:19:29 johannes Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -589,7 +589,7 @@
char *ldap_base_dn = NULL;
char *ldap_filter = NULL;
char **ldap_attrs = NULL;
- ldap_linkdata *ld;
+ ldap_linkdata *ld = NULL;
LDAPMessage *ldap_res;
int ldap_attrsonly = 0;
int ldap_sizelimit = -1;
@@ -806,8 +806,10 @@
}
cleanup:
- // Restoring previous options
- php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit,
old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref);
+ if (ld) {
+ /* Restoring previous options */
+ php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit,
old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref);
+ }
if (ldap_attrs != NULL) {
efree(ldap_attrs);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/bug48696.phpt?view=markup&rev=1.1
Index: php-src/ext/ldap/tests/bug48696.phpt
+++ php-src/ext/ldap/tests/bug48696.phpt
--TEST--
Bug #48696 (ldap_read() segfaults with invalid parameters)
--FILE--
--EXPECTF--
Warning: ldap_read(): supplied argument is not a valid ldap link resource in %s
on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / GenPHPInstaller.wxs.php PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wx
jmertic Thu Jun 25 15:59:13 2009 UTC
Modified files:
/win-installer GenPHPInstaller.wxs.php PHPInstallerBase52.wxs
PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs
PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs
PHPInstallerBase60NTS.wxs
Log:
Added including the readme-redist-bins.txt with the installer only if it
exists.
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.13&r2=1.14&diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.13
win-installer/GenPHPInstaller.wxs.php:1.14
--- win-installer/GenPHPInstaller.wxs.php:1.13 Wed Apr 1 19:47:32 2009
+++ win-installer/GenPHPInstaller.wxs.php Thu Jun 25 15:59:13 2009
@@ -41,8 +41,6 @@
$MergeRef->setAttribute('Id','VCRedist_policy');
}
-$PHPInstallerBaseWXS->save("PHPInstaller$version.wxs");
-
// remove extension info from php.ini-production
if ( is_file("Files/php.ini-production") )
$infile = fopen("Files/php.ini-production",'r');
@@ -62,5 +60,31 @@
fclose($infile);
fclose($outfile);
+// check for presence of certain file; if not there then remove the feature
from the installer
+$files = array(
+'readme-redist-bins.txt' => 'readmedistbinsTXT',
+);
+
+foreach ( $files as $filename => $component ) {
+if ( !file_exists("Files/$filename") ) {
+$Components = $PHPInstallerBaseWXS->getElementsByTagName('Component');
+foreach ( $Components as $Component ) {
+if ( $Component->getAttribute('Id') == $component ) {
+$Component->parentNode->removeChild($Component);
+break;
+}
+}
+$ComponentRefs =
$PHPInstallerBaseWXS->getElementsByTagName('ComponentRef');
+foreach ( $ComponentRefs as $ComponentRef ) {
+if ( $ComponentRef->getAttribute('Id') == $component ) {
+$ComponentRef->parentNode->removeChild($ComponentRef);
+break;
+}
+}
+}
+}
+
+$PHPInstallerBaseWXS->save("PHPInstaller$version.wxs");
+
exit;
?>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.44&r2=1.45&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.44
win-installer/PHPInstallerBase52.wxs:1.45
--- win-installer/PHPInstallerBase52.wxs:1.44 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase52.wxsThu Jun 25 15:59:13 2009
@@ -164,6 +164,14 @@
Name="news.txt"
Source="Files\news.txt"/>
+
+
+
@@ -353,6 +361,7 @@
Level="1">
+
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.20&r2=1.21&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.20
win-installer/PHPInstallerBase52NTS.wxs:1.21
--- win-installer/PHPInstallerBase52NTS.wxs:1.20Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jun 25 15:59:13 2009
@@ -142,6 +142,14 @@
Name="news.txt"
Source="Files\news.txt"/>
+
+
+
@@ -331,6 +339,7 @@
Level="1">
+
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.23&r2=1.24&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.23
win-installer/PHPInstallerBase53.wxs:1.24
--- win-installer/PHPInstallerBase53.wxs:1.23 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase53.wxsThu Jun 25 15:59:13 2009
@@ -157,12 +157,13 @@
Name="news.txt"
Source="Files\news.txt"/>
-
-
+Guid="23359910-5f6e-11de-8a39-0800200c9a66">
+
+
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.20&r2=1.21&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.20
win-installer/PHPInstallerBase53NTS.wxs:1.21
--- win-installer/PHPInstallerBase53NTS.wxs:1.20Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Jun 25 15:59:13 2009
@@ -135,6 +135,14 @@
Name="news.txt"
Source="Files\news.txt"/>
+
+
+
@@ -310,6 +318,7 @@
Level="1">
+
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.36&r2=1.37&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.36
win-installer/PHPInstallerBase60.wxs:1.37
--- win-installer/PHPInstal
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
felipe Thu Jun 25 16:16:09 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - BFN #48696 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.648&r2=1.2027.2.547.2.965.2.649&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.648 php-src/NEWS:1.2027.2.547.2.965.2.649 --- php-src/NEWS:1.2027.2.547.2.965.2.648 Wed Jun 24 22:12:47 2009 +++ php-src/NEWSThu Jun 25 16:16:08 2009 @@ -4,6 +4,7 @@ - Fixed slightly unclear message in generation of phar.phar. (Greg+others) - Fixed memory leak in json_decode() when depth is less than 0. (Felipe) +- Fixed bug #48696 (ldap_read() segfaults with invalid parameters). (Felipe) - Fixed bug #48643 (String functions memory issue). (Dmitry) - Fixed bug #48641 (tmpfile() uses old parameter parsing). (crrodriguez at opensuse dot 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) /ext/standard/tests/http .cvsignore
gwynne Thu Jun 25 16:18:24 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/http.cvsignore Log: missing .cvsignore file added http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/http/.cvsignore?view=markup&rev=1.1 Index: php-src/ext/standard/tests/http/.cvsignore +++ php-src/ext/standard/tests/http/.cvsignore -- 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) / UPGRADING
bjori Thu Jun 25 18:01:09 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcUPGRADING
Log:
More missing stuff
http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.25&r2=1.1.2.3.2.1.2.26&diff_format=u
Index: php-src/UPGRADING
diff -u php-src/UPGRADING:1.1.2.3.2.1.2.25 php-src/UPGRADING:1.1.2.3.2.1.2.26
--- php-src/UPGRADING:1.1.2.3.2.1.2.25 Thu Jun 25 14:56:14 2009
+++ php-src/UPGRADING Thu Jun 25 18:01:08 2009
@@ -1,4 +1,4 @@
-$Id: UPGRADING,v 1.1.2.3.2.1.2.25 2009/06/25 14:56:14 felipe Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.26 2009/06/25 18:01:08 bjori Exp $
UPGRADE NOTES - PHP 5.3
@@ -114,6 +114,10 @@
- stream_select(), stream_set_blocking(), stream_set_timeout(), and
stream_set_write_buffer() now work with user-space stream wrappers.
+- getopt() accepts "long options" now on all platforms (including Linux).
+ Optional values and = as seperator for shortopts are now supported.
+
+
===
3. Changes made to existing methods
===
@@ -194,6 +198,7 @@
- msql
- sybase (use sybase_ct, which is still in PHP core)
- mhash (hash has full BC layer)
+- mime_magic (use fileinfo, has full BC layer)
c. with changed behaviour
@@ -215,6 +220,10 @@
rollback as needed.
The old behavior can be enabled with the INI directive
oci8.old_oci_close_semantics.
+ Supports Database Resident Connection Pooling (DRCP), Fast
+ Application Notification (FAN) support, Oracle External
+ Authentication (not supported on Windows).
+ oci_bind_by_name() now supports SQLT_AFC (aka CHAR datatype).
- openssl: OpenSSL digest and cipher functions are now supported.
It is also now possible to access the internal values of DSA, RSA and
@@ -276,6 +285,10 @@
- The default value of session.use_only_cookies has changed to "1"
+- The default value of oci8.default_prefetch has been changed from 10 to 100.
+
+- Added new directive, request_order, control specifically $_REQUEST behavior.
+
10. Syntax additions
@@ -291,6 +304,10 @@
No variables here...
LABEL;
+- HEREDOC Now supports wrapping the identifier:
+
+ <<<"LABEL" ...
+
- The ?: operator has been introduced:
var_dump(0 ?: 'Hello!');
@@ -300,8 +317,22 @@
namespace my\name;
$obj = new \my\name\MyClass;
- use \my\name\MyClass as MyClass;
- $obj = new MyClass;
+- Dynamic access to static methods is now possible:
+
+ $foo::myFunc();
+
+- Exceptions can now be nested:
+
+ class MyCustomException extends Exception {}
+ try {
+ throw new MyCustomException("Something happend", 112);
+ } catch(Exception $e) {
+ throw new InvalidArgumentException("You are doing it wrong!", 911,
$e);
+ }
+
+- Exceptions can now be handled in destructors.
+
+- Garbage collector has been added and is enabled by default.
===
11. Windows support
@@ -348,7 +379,7 @@
b. New extensions
- enchant
- - fileinfo
+ - fileinfo (replaces mime_magic)
- intl
- Phar
- SQLite3
@@ -526,6 +557,7 @@
DateTime::createFromFormat()
DateTime::getLastErrors()
- DOM: DOMNode::getLineNo()
+ - Exception:Exception::getPrevious()
- PDO_Firebird: PDO::setAttribute()
- Reflection: ReflectionProperty::setAccessible()
ReflectionFunction::inNamespace()
--
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) / UPGRADING
bjori Thu Jun 25 18:04:35 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: reduntant http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.26&r2=1.1.2.3.2.1.2.27&diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.26 php-src/UPGRADING:1.1.2.3.2.1.2.27 --- php-src/UPGRADING:1.1.2.3.2.1.2.26 Thu Jun 25 18:01:08 2009 +++ php-src/UPGRADING Thu Jun 25 18:04:35 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.26 2009/06/25 18:01:08 bjori Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.27 2009/06/25 18:04:35 bjori Exp $ UPGRADE NOTES - PHP 5.3 @@ -114,7 +114,7 @@ - stream_select(), stream_set_blocking(), stream_set_timeout(), and stream_set_write_buffer() now work with user-space stream wrappers. -- getopt() accepts "long options" now on all platforms (including Linux). +- getopt() accepts "long options" now on all platforms. Optional values and = as seperator for shortopts are now supported. -- 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) / UPGRADING
kalle Thu Jun 25 18:17:52 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcUPGRADING Log: Persistent connections with mysqli missing http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.27&r2=1.1.2.3.2.1.2.28&diff_format=u Index: php-src/UPGRADING diff -u php-src/UPGRADING:1.1.2.3.2.1.2.27 php-src/UPGRADING:1.1.2.3.2.1.2.28 --- php-src/UPGRADING:1.1.2.3.2.1.2.27 Thu Jun 25 18:04:35 2009 +++ php-src/UPGRADING Thu Jun 25 18:17:52 2009 @@ -1,4 +1,4 @@ -$Id: UPGRADING,v 1.1.2.3.2.1.2.27 2009/06/25 18:04:35 bjori Exp $ +$Id: UPGRADING,v 1.1.2.3.2.1.2.28 2009/06/25 18:17:52 kalle Exp $ UPGRADE NOTES - PHP 5.3 @@ -235,6 +235,9 @@ - SOAP: Now supports sending user-supplied HTTP headers. +- MySQLi: Now supports persistent connections by prepending the hostname + with "p:". + d. no longer possible to disable - PCRE -- 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/mysqlnd mysqlnd.h mysqlnd_block_alloc.c mysqlnd_block_alloc.h mysqlnd_debug.c mysqlnd_enum_n_def.h mysqlnd_palloc.c mysqlnd_ps.c mysqlnd_result.c mysqlnd_statistic
johannesThu Jun 25 19:03:52 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd.h mysqlnd_block_alloc.c
mysqlnd_block_alloc.h mysqlnd_debug.c
mysqlnd_enum_n_def.h mysqlnd_palloc.c
mysqlnd_ps.c mysqlnd_result.c
mysqlnd_statistics.c mysqlnd_structs.h
mysqlnd_wireprotocol.c php_mysqlnd.c
Log:
Revert mysqlnd to RC3 state after issues with pconnects
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.h?r1=1.3.2.26&r2=1.3.2.27&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.3.2.26
php-src/ext/mysqlnd/mysqlnd.h:1.3.2.27
--- php-src/ext/mysqlnd/mysqlnd.h:1.3.2.26 Wed Jun 17 16:22:13 2009
+++ php-src/ext/mysqlnd/mysqlnd.h Thu Jun 25 19:03:51 2009
@@ -18,13 +18,13 @@
+--+
*/
-/* $Id: mysqlnd.h,v 1.3.2.26 2009/06/17 16:22:13 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.3.2.27 2009/06/25 19:03:51 johannes Exp $ */
#ifndef MYSQLND_H
#define MYSQLND_H
-#define MYSQLND_VERSION "mysqlnd/PHP " PHP_VERSION " $Revision: 1.3.2.26 $"
-#define MYSQLND_VERSION_ID PHP_VERSION_ID
+#define MYSQLND_VERSION "mysqlnd 5.0.5-dev - 081106 - $Revision: 1.3.2.27 $"
+#define MYSQLND_VERSION_ID 50005
/* This forces inlining of some accessor functions */
#define MYSQLND_USE_OPTIMISATIONS 1
@@ -318,9 +318,11 @@
PHPAPI void
_mysqlnd_palloc_rshutdown(MYSQLND_THD_ZVAL_PCACHE * cache TSRMLS_DC);
+#define mysqlnd_palloc_init_thd_cache(cache)
_mysqlnd_palloc_init_thd_cache((cache) TSRMLS_CC)
#define mysqlnd_palloc_free_thd_cache_reference(cache)
_mysqlnd_palloc_free_thd_cache_reference((cache) TSRMLS_CC)
#define mysqlnd_palloc_get_thd_cache_reference(cache)
_mysqlnd_palloc_get_thd_cache_reference((cache) TSRMLS_CC)
+PHPAPI MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache TSRMLS_DC);
MYSQLND_THD_ZVAL_PCACHE*
_mysqlnd_palloc_get_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE * const cache
TSRMLS_DC);
PHPAPI void
_mysqlnd_palloc_free_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE **cache
TSRMLS_DC);
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_block_alloc.c?r1=1.1.2.8&r2=1.1.2.9&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_block_alloc.c
diff -u php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.8
php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.9
--- php-src/ext/mysqlnd/mysqlnd_block_alloc.c:1.1.2.8 Wed Jun 17 16:22:13 2009
+++ php-src/ext/mysqlnd/mysqlnd_block_alloc.c Thu Jun 25 19:03:51 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_block_alloc.c,v 1.1.2.8 2009/06/17 16:22:13 andrey Exp $ */
+/* $Id: mysqlnd_block_alloc.c,v 1.1.2.9 2009/06/25 19:03:51 johannes Exp $ */
#include "php.h"
#include "mysqlnd.h"
@@ -35,7 +35,7 @@
DBG_ENTER("mysqlnd_mempool_dtor");
for (i = 0; i < pool->free_chunk_list_elements; i++) {
MYSQLND_MEMORY_POOL_CHUNK * chunk = pool->free_chunk_list[i];
- mysqlnd_mempool_free_chunk(chunk, FALSE TSRMLS_CC);
+ chunk->free_chunk(chunk, FALSE TSRMLS_CC);
}
DBG_VOID_RETURN;
@@ -44,14 +44,11 @@
/* {{{ mysqlnd_mempool_free_chunk */
-void
+static void
mysqlnd_mempool_free_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, zend_bool
cache_it TSRMLS_DC)
{
MYSQLND_MEMORY_POOL * pool = chunk->pool;
DBG_ENTER("mysqlnd_mempool_free_chunk");
- if (!chunk) {
- DBG_VOID_RETURN;
- }
if (chunk->from_pool) {
/* Try to back-off and guess if this is the last block
allocated */
if (chunk->ptr == (pool->arena + (pool->arena_size -
pool->free_size - chunk->size))) {
@@ -78,7 +75,7 @@
/* {{{ mysqlnd_mempool_resize_chunk */
-void
+static void
mysqlnd_mempool_resize_chunk(MYSQLND_MEMORY_POOL_CHUNK * chunk, unsigned int
size TSRMLS_DC)
{
DBG_ENTER("mysqlnd_mempool_resize_chunk");
@@ -138,6 +135,8 @@
chunk = mnd_malloc(sizeof(MYSQLND_MEMORY_POOL_CHUNK));
}
+ chunk->free_chunk = mysqlnd_mempool_free_chunk;
+ chunk->resize_chunk = mysqlnd_mempool_resize_chunk;
chunk->size = size;
/*
Should not go over MYSQLND_MAX_PACKET_SIZE, since we
@@ -184,12 +183,10 @@
mysqlnd_mempool_destroy(MYSQLND_MEMORY_POOL * pool TSRMLS_DC)
{
DBG_ENTER("mysqlnd_mempool_destroy");
- if (pool) {
- /* mnd_free will reference LOCK_access and might crash,
depending on the caller...*/
- mysqlnd_mempool_free_contents(pool TSRMLS_CC);
- mnd_free(pool-
[PHP-CVS] cvs: win-installer / PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs
jmertic Thu Jun 25 20:51:05 2009 UTC Modified files: /win-installer PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs Log: Added installing phar.phar.bat and pharcommand.phar files automatically. http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.24&r2=1.25&diff_format=u Index: win-installer/PHPInstallerBase53.wxs diff -u win-installer/PHPInstallerBase53.wxs:1.24 win-installer/PHPInstallerBase53.wxs:1.25 --- win-installer/PHPInstallerBase53.wxs:1.24 Thu Jun 25 15:59:13 2009 +++ win-installer/PHPInstallerBase53.wxsThu Jun 25 20:51:04 2009 @@ -165,6 +165,13 @@ LongName="readme-redist-bins.txt" Source="Files\readme-redist-bins.txt"/> + + + @@ -287,6 +294,22 @@ Name="php5ts.dll" Source="Files\php5ts.dll"/> + + + + + + @@ -343,6 +366,8 @@ + + http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.21&r2=1.22&diff_format=u Index: win-installer/PHPInstallerBase53NTS.wxs diff -u win-installer/PHPInstallerBase53NTS.wxs:1.21 win-installer/PHPInstallerBase53NTS.wxs:1.22 --- win-installer/PHPInstallerBase53NTS.wxs:1.21Thu Jun 25 15:59:13 2009 +++ win-installer/PHPInstallerBase53NTS.wxs Thu Jun 25 20:51:04 2009 @@ -272,6 +272,22 @@ Name="php5.dll" Source="Files\php5.dll"/> + + + + + + @@ -328,6 +344,8 @@ + + http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.37&r2=1.38&diff_format=u Index: win-installer/PHPInstallerBase60.wxs diff -u win-installer/PHPInstallerBase60.wxs:1.37 win-installer/PHPInstallerBase60.wxs:1.38 --- win-installer/PHPInstallerBase60.wxs:1.37 Thu Jun 25 15:59:13 2009 +++ win-installer/PHPInstallerBase60.wxsThu Jun 25 20:51:04 2009 @@ -294,6 +294,22 @@ Name="php6ts.dll" Source="Files\php6ts.dll"/> + + + + + + @@ -350,6 +366,8 @@ + + http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.21&r2=1.22&diff_format=u Index: win-installer/PHPInstallerBase60NTS.wxs diff -u win-installer/PHPInstallerBase60NTS.wxs:1.21 win-installer/PHPInstallerBase60NTS.wxs:1.22 --- win-installer/PHPInstallerBase60NTS.wxs:1.21Thu Jun 25 15:59:13 2009 +++ win-installer/PHPInstallerBase60NTS.wxs Thu Jun 25 20:51:04 2009 @@ -272,6 +272,22 @@ Name="php6.dll" Source="Files\php6.dll"/> + + + + + + @@ -328,6 +344,8 @@ + + http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / GenExtensionsComponents.wxs.php
jmertic Thu Jun 25 20:53:02 2009 UTC
Modified files:
/win-installer GenExtensionsComponents.wxs.php
Log:
Remove some debugging statements from the build code.
http://cvs.php.net/viewvc.cgi/win-installer/GenExtensionsComponents.wxs.php?r1=1.20&r2=1.21&diff_format=u
Index: win-installer/GenExtensionsComponents.wxs.php
diff -u win-installer/GenExtensionsComponents.wxs.php:1.20
win-installer/GenExtensionsComponents.wxs.php:1.21
--- win-installer/GenExtensionsComponents.wxs.php:1.20 Tue May 19 19:02:35 2009
+++ win-installer/GenExtensionsComponents.wxs.php Thu Jun 25 20:53:02 2009
@@ -138,9 +138,7 @@
}
// If this is a VC9 build, change the ICU library version
-var_dump($buildtype);
if ( stripos($buildtype,'VC9') !== FALSE ) {
- var_dump("I'm here");
$icuVer = '36';
if ( $phpver == '53' )
$icuVer = '38';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtClassMap.php run-tests.php /src/configuration rtCommandLineOptions.php /src/configuration/exceptions rtEnvironmentException.php rtException.php rtMissingArgumentExc
g2 Fri Jun 26 00:07:24 2009 UTC
Added files:
/phpruntests/src/taskScheduler rtTaskInterface.php
rtTaskScheduler.php
rtTaskSchedulerFile.php rtTask.php
rtTaskSchedulerMsgQ.php
rtTaskTestGroup.php
/phpruntests/src/configuration/exceptions rtException.php
/phpruntests/tests rtTaskSchedulerTest.php
Modified files:
/phpruntests/src/configuration/exceptions
rtEnvironmentException.php
rtMissingArgumentException.php
rtUnknownOptionException.php
rtUnknownIniSettingException.php
/phpruntests/srcrun-tests.php rtClassMap.php
/phpruntests/src/configuration rtCommandLineOptions.php
/phpruntests/src/testrunrtPhpTestRun.php
Log:
phpruntests - integrated taskScheduler into "rtPhpTestRun" - added argument
for cmd-line-option 'z' (number of processes) - added rtExcpetion and a simple
exception-hanlder
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/exceptions/rtEnvironmentException.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/exceptions/rtEnvironmentException.php
diff -u phpruntests/src/configuration/exceptions/rtEnvironmentException.php:1.2
phpruntests/src/configuration/exceptions/rtEnvironmentException.php:1.3
--- phpruntests/src/configuration/exceptions/rtEnvironmentException.php:1.2
Mon Apr 20 20:24:30 2009
+++ phpruntests/src/configuration/exceptions/rtEnvironmentException.php Fri Jun
26 00:07:24 2009
@@ -1,6 +1,6 @@
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/exceptions/rtMissingArgumentException.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/exceptions/rtMissingArgumentException.php
diff -u
phpruntests/src/configuration/exceptions/rtMissingArgumentException.php:1.2
phpruntests/src/configuration/exceptions/rtMissingArgumentException.php:1.3
--- phpruntests/src/configuration/exceptions/rtMissingArgumentException.php:1.2
Mon Apr 20 20:24:30 2009
+++ phpruntests/src/configuration/exceptions/rtMissingArgumentException.php
Fri Jun 26 00:07:24 2009
@@ -1,6 +1,6 @@
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/exceptions/rtUnknownOptionException.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/exceptions/rtUnknownOptionException.php
diff -u
phpruntests/src/configuration/exceptions/rtUnknownOptionException.php:1.2
phpruntests/src/configuration/exceptions/rtUnknownOptionException.php:1.3
--- phpruntests/src/configuration/exceptions/rtUnknownOptionException.php:1.2
Mon Apr 20 20:24:30 2009
+++ phpruntests/src/configuration/exceptions/rtUnknownOptionException.php
Fri Jun 26 00:07:24 2009
@@ -1,6 +1,6 @@
http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/exceptions/rtUnknownIniSettingException.php?r1=1.2&r2=1.3&diff_format=u
Index: phpruntests/src/configuration/exceptions/rtUnknownIniSettingException.php
diff -u
phpruntests/src/configuration/exceptions/rtUnknownIniSettingException.php:1.2
phpruntests/src/configuration/exceptions/rtUnknownIniSettingException.php:1.3
---
phpruntests/src/configuration/exceptions/rtUnknownIniSettingException.php:1.2
Mon Apr 20 20:24:30 2009
+++ phpruntests/src/configuration/exceptions/rtUnknownIniSettingException.php
Fri Jun 26 00:07:24 2009
@@ -1,6 +1,6 @@
http://cvs.php.net/viewvc.cgi/phpruntests/src/run-tests.php?r1=1.3&r2=1.4&diff_format=u
Index: phpruntests/src/run-tests.php
diff -u phpruntests/src/run-tests.php:1.3 phpruntests/src/run-tests.php:1.4
--- phpruntests/src/run-tests.php:1.3 Tue May 12 16:05:00 2009
+++ phpruntests/src/run-tests.php Fri Jun 26 00:07:24 2009
@@ -4,6 +4,22 @@
*/
+
+/**
+ * rtExceptionHandler
+ *
+ * @param Exception $e
+ * @return unknown_type
+ */
+function rtExceptionHandler(Exception $e) {
+
+ print $e;
+}
+
+set_exception_handler('rtExceptionHandler');
+
+
+
/*
* check the version of the running php-executable and
* ensure that is 5.3 or higher
@@ -14,7 +30,13 @@
require_once dirname(__FILE__) . '/rtAutoload.php';
+$s = microtime(true);
+
$phpTestRun = new rtPhpTestRun($argv);
$phpTestRun->run();
+$e = microtime(true);
+
+print "\n".($e-$s)." sec\n\n";
+
?>
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.13&r2=1.14&diff_format=u
Index: phpruntests/src/rtClassMap.php
diff -u phpruntests/src/rtClassMap.php:1.13 phpruntests/src/rtClassMap.php:1.14
--- phpruntests/src/rtClassMap.php:1.13 Tue Jun 23 12:59:51 2009
+++ phpruntests/src/rtClassMap.php Fri Jun 26 00:07:24 2009
@@ -8,6 +8,7 @@
*/
$rtClassMap = array(
'rtEnvironmentException' =>
'configurat
