]>
granicus.if.org Git - php/log
Dmitry Stogov [Fri, 20 Jun 2014 15:40:03 +0000 (19:40 +0400)]
Code cleanup
Dmitry Stogov [Fri, 20 Jun 2014 11:04:38 +0000 (15:04 +0400)]
Fixed compilation warnings
Dmitry Stogov [Fri, 20 Jun 2014 11:04:25 +0000 (15:04 +0400)]
fixed memory leak
Dmitry Stogov [Fri, 20 Jun 2014 10:02:15 +0000 (14:02 +0400)]
Merge branch 'master' into phpng
* master:
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 10:01:22 +0000 (14:01 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:58:26 +0000 (13:58 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:57:38 +0000 (13:57 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:56:32 +0000 (13:56 +0400)]
Fixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:31:43 +0000 (13:31 +0400)]
Hide warning message after fatal errors
Dmitry Stogov [Fri, 20 Jun 2014 09:31:23 +0000 (13:31 +0400)]
Check if socket is still alive
Dmitry Stogov [Fri, 20 Jun 2014 07:16:57 +0000 (11:16 +0400)]
Merge branch 'master' into phpng
* master:
skip this test which fails without network
add missing entry to NEWS
add missing entry to NEWS
add NEWS block for 5.6.0RC2
Add support for gb18030/MySQL 5.7
Fix another problem with MySQL 5.7
new test, missing in
ea466a3
Suppress test failure with MySQL 5.7
Dmitry Stogov [Fri, 20 Jun 2014 06:32:05 +0000 (10:32 +0400)]
Fixed compilation warning
Dmitry Stogov [Fri, 20 Jun 2014 06:27:24 +0000 (10:27 +0400)]
Fixed compilation
Xinchen Hui [Fri, 20 Jun 2014 05:27:56 +0000 (13:27 +0800)]
Fixed memory leak
Xinchen Hui [Fri, 20 Jun 2014 05:08:40 +0000 (13:08 +0800)]
Fixed bugs in binding result
Remi Collet [Fri, 20 Jun 2014 04:45:36 +0000 (06:45 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
skip this test which fails without network
Remi Collet [Fri, 20 Jun 2014 04:45:16 +0000 (06:45 +0200)]
skip this test which fails without network
Xinchen Hui [Fri, 20 Jun 2014 03:40:53 +0000 (11:40 +0800)]
Fixed PDO_PARAM_ZVAL
Xinchen Hui [Thu, 19 Jun 2014 15:00:45 +0000 (23:00 +0800)]
Fixed pdo_mysql build with mysqlnd
Xinchen Hui [Thu, 19 Jun 2014 14:36:48 +0000 (22:36 +0800)]
Refcount may have different meaning in PHP NG
Xinchen Hui [Thu, 19 Jun 2014 14:30:15 +0000 (22:30 +0800)]
Fixed mysqli_get_links_stats
Xinchen Hui [Thu, 19 Jun 2014 14:28:43 +0000 (22:28 +0800)]
Fixed paramters binding
Xinchen Hui [Thu, 19 Jun 2014 08:24:24 +0000 (16:24 +0800)]
Fixed hash key in persistent hash
Xinchen Hui [Thu, 19 Jun 2014 08:20:21 +0000 (16:20 +0800)]
Fixed releasing of hash_key
Xinchen Hui [Thu, 19 Jun 2014 08:16:41 +0000 (16:16 +0800)]
Fixed stat fields name
Xinchen Hui [Thu, 19 Jun 2014 08:08:45 +0000 (16:08 +0800)]
Fixed reference handling of bind_result
Xinchen Hui [Thu, 19 Jun 2014 07:49:56 +0000 (15:49 +0800)]
Fixed invalid read
Xinchen Hui [Thu, 19 Jun 2014 06:43:14 +0000 (14:43 +0800)]
Fixed segfault
Xinchen Hui [Thu, 19 Jun 2014 06:24:49 +0000 (14:24 +0800)]
Fixed various bugs
Xinchen Hui [Thu, 19 Jun 2014 03:10:03 +0000 (11:10 +0800)]
Fixed MySQLi built with mysqlnd
Xinchen Hui [Thu, 19 Jun 2014 02:46:23 +0000 (10:46 +0800)]
unused variables
Ferenc Kovacs [Thu, 19 Jun 2014 00:29:42 +0000 (02:29 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:29:27 +0000 (02:29 +0200)]
add missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:18:52 +0000 (02:18 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:18:26 +0000 (02:18 +0200)]
add missing entry to NEWS
Ferenc Kovacs [Wed, 18 Jun 2014 23:35:19 +0000 (01:35 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS block for 5.6.0RC2
Ferenc Kovacs [Wed, 18 Jun 2014 23:34:25 +0000 (01:34 +0200)]
add NEWS block for 5.6.0RC2
Andrey Hristov [Wed, 18 Jun 2014 18:54:26 +0000 (21:54 +0300)]
Merge branch 'PHP-5.6'
Conflicts:
NEWS
Andrey Hristov [Wed, 18 Jun 2014 18:53:34 +0000 (21:53 +0300)]
Add support for gb18030/MySQL 5.7
Xinchen Hui [Wed, 18 Jun 2014 15:37:47 +0000 (23:37 +0800)]
Merge branch 'phpng' of git.php.net:php-src into phpng
Xinchen Hui [Wed, 18 Jun 2014 15:13:30 +0000 (23:13 +0800)]
Fixed various bugs (ext/mysql with mysqlnd tests pass)
Andrey Hristov [Wed, 18 Jun 2014 15:32:51 +0000 (18:32 +0300)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Andrey Hristov [Wed, 18 Jun 2014 15:31:07 +0000 (18:31 +0300)]
Merge branch 'master' of git.php.net:php-src
Andrey Hristov [Wed, 18 Jun 2014 15:30:49 +0000 (18:30 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Wed, 18 Jun 2014 15:30:37 +0000 (18:30 +0300)]
Fix another problem with MySQL 5.7
Remi Collet [Wed, 18 Jun 2014 14:00:07 +0000 (16:00 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
new test, missing in
ea466a3
Remi Collet [Wed, 18 Jun 2014 13:59:45 +0000 (15:59 +0200)]
new test, missing in
ea466a3
Dmitry Stogov [Wed, 18 Jun 2014 13:50:27 +0000 (17:50 +0400)]
Merge branch 'master' into phpng
* master: (41 commits)
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
NEWS
Fix Request #67453 Allow to unserialize empty data.
Update copyright year to 2014
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Fix patch for bug #67436
fix failed test
Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
Added tests for bug 67436
Fixed wrong XFAIL test - already fixed
Fix typo in Bug #67406 NEWS entry
Fix typo in Bug #67406 NEWS entry
...
Conflicts:
Zend/zend_compile.c
ext/session/session.c
ext/standard/array.c
ext/standard/http_fopen_wrapper.c
tests/classes/bug63462.phpt
Andrey Hristov [Wed, 18 Jun 2014 13:45:12 +0000 (16:45 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Wed, 18 Jun 2014 13:42:42 +0000 (16:42 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Wed, 18 Jun 2014 13:20:14 +0000 (16:20 +0300)]
Suppress test failure with MySQL 5.7
Dmitry Stogov [Wed, 18 Jun 2014 13:09:37 +0000 (17:09 +0400)]
Use arena allocator for optimizer temporary data structures
Xinchen Hui [Wed, 18 Jun 2014 08:59:56 +0000 (16:59 +0800)]
Fixed warning message
Xinchen Hui [Wed, 18 Jun 2014 08:10:51 +0000 (16:10 +0800)]
Fixed memory leak while doing fetch
Xinchen Hui [Wed, 18 Jun 2014 07:43:15 +0000 (15:43 +0800)]
Fixed segfaults
Xinchen Hui [Wed, 18 Jun 2014 07:13:43 +0000 (15:13 +0800)]
copy_data seems useless now
Xinchen Hui [Wed, 18 Jun 2014 07:11:46 +0000 (15:11 +0800)]
Fixed typo
Xinchen Hui [Wed, 18 Jun 2014 06:42:46 +0000 (14:42 +0800)]
Fixed segfault of stream handling
Xinchen Hui [Wed, 18 Jun 2014 06:26:17 +0000 (14:26 +0800)]
Fixed plugin fetching
Xinchen Hui [Wed, 18 Jun 2014 04:09:51 +0000 (12:09 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Xinchen Hui [Tue, 17 Jun 2014 09:50:54 +0000 (17:50 +0800)]
Refactoring mysqlnd (incompleted, only mysqlnd ext compilable)
Dmitry Stogov [Tue, 17 Jun 2014 22:47:01 +0000 (02:47 +0400)]
Use arena allocator for zend_class_entry, zend_op_array and zend_property_info that live till the end of request
Lior Kaplan [Tue, 17 Jun 2014 21:22:16 +0000 (00:22 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:21:20 +0000 (00:21 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:18:47 +0000 (00:18 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:16:23 +0000 (00:16 +0300)]
Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
Lior Kaplan [Tue, 17 Jun 2014 21:14:18 +0000 (00:14 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:12:33 +0000 (00:12 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:11:55 +0000 (00:11 +0300)]
Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
Lior Kaplan [Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update copyright year to 2014
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:57:20 +0000 (23:57 +0300)]
Update copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:56:46 +0000 (23:56 +0300)]
Update copyright year to 2014
Dmitry Stogov [Tue, 17 Jun 2014 09:53:23 +0000 (13:53 +0400)]
Fixed HASH_FLAG_APPLY_PROTECTION flag usage
Remi Collet [Tue, 17 Jun 2014 07:41:30 +0000 (09:41 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fix Request #67453 Allow to unserialize empty data.
Remi Collet [Tue, 17 Jun 2014 07:41:10 +0000 (09:41 +0200)]
NEWS
Remi Collet [Tue, 17 Jun 2014 07:38:54 +0000 (09:38 +0200)]
Fix Request #67453 Allow to unserialize empty data.
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.
This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
Dmitry Stogov [Mon, 16 Jun 2014 22:59:00 +0000 (02:59 +0400)]
Don't include trailing zero into hash function
Dmitry Stogov [Mon, 16 Jun 2014 21:15:51 +0000 (01:15 +0400)]
Fixed support for constants inherited from interfaces
Lior Kaplan [Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update copyright year to 2014
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:34:50 +0000 (23:34 +0300)]
Update copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:32:10 +0000 (23:32 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:30:44 +0000 (23:30 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:28:36 +0000 (23:28 +0300)]
Update copyright year for re2c generated files
Lior Kaplan [Mon, 16 Jun 2014 20:27:45 +0000 (23:27 +0300)]
Update copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:26:50 +0000 (23:26 +0300)]
Update copyright year for re2c files as well
Dmitry Stogov [Mon, 16 Jun 2014 19:32:58 +0000 (23:32 +0400)]
Avoid useles constants update
Dmitry Stogov [Mon, 16 Jun 2014 17:49:46 +0000 (21:49 +0400)]
Optimize out useles paths
Dmitry Stogov [Mon, 16 Jun 2014 17:11:52 +0000 (21:11 +0400)]
Use new zend_hash iteration API
Dmitry Stogov [Mon, 16 Jun 2014 09:25:23 +0000 (13:25 +0400)]
Small call/return improvement
Bob Weinand [Mon, 16 Jun 2014 09:20:05 +0000 (11:20 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Mon, 16 Jun 2014 09:18:45 +0000 (11:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_compile.c
Bob Weinand [Mon, 16 Jun 2014 09:16:33 +0000 (11:16 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Mon, 16 Jun 2014 09:10:50 +0000 (11:10 +0200)]
Fix patch for bug #67436
Dmitry Stogov [Mon, 16 Jun 2014 09:08:48 +0000 (13:08 +0400)]
Fixed support for references
Remi Collet [Mon, 16 Jun 2014 08:52:39 +0000 (10:52 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix failed test
Remi Collet [Mon, 16 Jun 2014 08:52:26 +0000 (10:52 +0200)]
fix failed test
Remi Collet [Mon, 16 Jun 2014 07:44:58 +0000 (09:44 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
Remi Collet [Mon, 16 Jun 2014 07:42:55 +0000 (09:42 +0200)]
Fix test on modern distro where old unsecure algo are disabled in openssl config.
Testing recent algo should be enough to check this function.
Xinchen Hui [Mon, 16 Jun 2014 06:59:03 +0000 (14:59 +0800)]
Refactoring imap (in progress)
Bob Weinand [Sun, 15 Jun 2014 22:43:31 +0000 (00:43 +0200)]
Merge branch 'PHP-5.6'