com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/mysqlnd/mysqlnd_ps.c
| From: | Andrey Hristov | Date: | Wed, 13 Mar 2013 14:29:40 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: NEWS ext/mysqlnd/mysqlnd_ps.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71449@lists.php.net to get a copy of this message | ||
Commit: 7503a4b4a4d0ffe4140f5afab9cae45aaa691c4a
Author: Andrey Hristov <andrey@php.net> Wed, 13 Mar 2013 15:29:40 +0100
Parents: 28634bf603d312bf066eab0a95700ae187d8d347 0777a18703d9be2ea8efd85c0352863b8768e49e
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7503a4b4a4d0ffe4140f5afab9cae45aaa691c4a
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Changed paths:
MM NEWS
MM ext/mysqlnd/mysqlnd_ps.c
Diff:
diff --cc NEWS
index 291ec52,ac0c943..9d87b95
--- a/NEWS
+++ b/NEWS
@@@ -1,28 -1,6 +1,31 @@@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.4.14
+?? ??? 20??, PHP 5.5.0 Beta 1
+
+- Core:
+ . Fixed bug #64354 (Unserialize array of objects whose class can't
+ be autoloaded fail). (Laruence)
+ . Added support for changing the process's title in CLI/CLI-Server SAPIs.
+ The implementation is more robust that the proctitle PECL module. More
+ details here: https://wiki.php.net/rfc/cli_process_title.
(Keyur)
+ . Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']).
+ (Anatol)
+
++- mysqlnd
++ . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc
++ for stmt->param_bind). (Andrey)
+
+07 Mar 2013, PHP 5..5.0 Alpha 6
+
+- Core:
+ . Fixed bug #61025 (__invoke() visibility not honored). (Laruence)
+ . Fixed bug #49348 (Uninitialized ++$foo->bar; does not cause a notice).
+ (Stas)
+
+- Sockets:
+ . Fixed bug #64287 (sendmsg/recvmsg shutdown handler causes segfault).
+ (Gustavo)
+
- PCRE:
. Merged PCRE 8.32. (Anatol)
diff --cc ext/mysqlnd/mysqlnd_ps.c
index 4916c06,cd5b302..2a0c9dd
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@@ -1463,7 -1478,7 +1463,8 @@@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_p
if (stmt->param_count) {
if (!stmt->param_bind) {
- stmt->param_bind = mnd_pecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND),
stmt->persistent);
++// stmt->param_bind = mnd_pecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND),
stmt->persistent);
+ stmt->param_bind = mnd_ecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND));
if (!stmt->param_bind) {
DBG_RETURN(FAIL);
}