Commit Graph

81750 Commits

Author SHA1 Message Date
Xinchen Hui
d8a4b1affb Fixed paramters binding 2014-06-19 22:28:43 +08:00
Xinchen Hui
4cc3c7387b Fixed hash key in persistent hash 2014-06-19 16:24:24 +08:00
Xinchen Hui
46117aff49 Fixed releasing of hash_key 2014-06-19 16:20:21 +08:00
Xinchen Hui
82823e1e96 Fixed stat fields name 2014-06-19 16:16:41 +08:00
Xinchen Hui
e0680cb170 Fixed reference handling of bind_result 2014-06-19 16:08:45 +08:00
Xinchen Hui
f81498c8c8 Fixed invalid read 2014-06-19 15:56:35 +08:00
Xinchen Hui
ffaf8beda7 Fixed segfault 2014-06-19 14:43:14 +08:00
Xinchen Hui
049e52f19b Fixed various bugs 2014-06-19 14:24:49 +08:00
Xinchen Hui
b7b5fa111b Fixed MySQLi built with mysqlnd 2014-06-19 11:10:03 +08:00
Xinchen Hui
27e8e11ff9 unused variables 2014-06-19 10:46:23 +08:00
Xinchen Hui
17f35c9a29 Merge branch 'phpng' of git.php.net:php-src into phpng 2014-06-18 23:37:47 +08:00
Xinchen Hui
b38f6f3de9 Fixed various bugs (ext/mysql with mysqlnd tests pass) 2014-06-18 23:37:15 +08:00
Dmitry Stogov
b108267f2c 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
2014-06-18 17:50:27 +04:00
Dmitry Stogov
a4f38192ec Use arena allocator for optimizer temporary data structures 2014-06-18 17:09:37 +04:00
Xinchen Hui
7032e1b96d Fixed warning message 2014-06-18 16:59:56 +08:00
Xinchen Hui
d5c6816e86 Fixed memory leak while doing fetch 2014-06-18 16:10:51 +08:00
Xinchen Hui
98afbc7f75 Fixed segfaults 2014-06-18 15:43:15 +08:00
Xinchen Hui
ac1d6abbef copy_data seems useless now 2014-06-18 15:13:43 +08:00
Xinchen Hui
2508d493d9 Fixed typo 2014-06-18 15:11:46 +08:00
Xinchen Hui
83d450c78d Fixed segfault of stream handling 2014-06-18 15:03:01 +08:00
Xinchen Hui
4c4dc8e239 Fixed plugin fetching 2014-06-18 14:26:17 +08:00
Xinchen Hui
2bd14a07fe Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-06-18 12:09:51 +08:00
Xinchen Hui
6288bb8ffe Refactoring mysqlnd (incompleted, only mysqlnd ext compilable) 2014-06-18 12:09:37 +08:00
Dmitry Stogov
e1b18e59f7 Use arena allocator for zend_class_entry, zend_op_array and zend_property_info that live till the end of request 2014-06-18 02:47:01 +04:00
Lior Kaplan
eba7c77685 Update copyright year to 2014 2014-06-18 00:22:16 +03:00
Lior Kaplan
9d047bb138 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
2014-06-18 00:21:20 +03:00
Lior Kaplan
b0b47a2064 Update copyright year to 2014 2014-06-18 00:18:47 +03:00
Lior Kaplan
9f727692b6 Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:16:23 +03:00
Lior Kaplan
1222f51ebd 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
2014-06-18 00:14:18 +03:00
Lior Kaplan
728c554f93 Update copyright year to 2014 2014-06-18 00:12:33 +03:00
Lior Kaplan
a3bd2d268c Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:11:55 +03:00
Lior Kaplan
d2bdedbcfc Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Update copyright year to 2014
  Update copyright year to 2014
2014-06-18 00:11:35 +03:00
Lior Kaplan
4106d48d1c Update copyright year to 2014 2014-06-17 23:57:20 +03:00
Lior Kaplan
945938d33c Update copyright year to 2014 2014-06-17 23:56:46 +03:00
Dmitry Stogov
56731f68a7 Fixed HASH_FLAG_APPLY_PROTECTION flag usage 2014-06-17 13:53:23 +04:00
Remi Collet
a012c2befa Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
2014-06-17 09:41:30 +02:00
Remi Collet
ba34f0c2e8 NEWS 2014-06-17 09:41:10 +02:00
Remi Collet
ea466a316f 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.
2014-06-17 09:38:54 +02:00
Dmitry Stogov
accaaf9d6e Don't include trailing zero into hash function 2014-06-17 02:59:00 +04:00
Dmitry Stogov
a8e63d2b56 Fixed support for constants inherited from interfaces 2014-06-17 01:15:51 +04:00
Lior Kaplan
6e0a9b4588 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
2014-06-16 23:36:39 +03:00
Lior Kaplan
b538816b0b Update copyright year to 2014 2014-06-16 23:34:50 +03:00
Lior Kaplan
11b18347d8 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
2014-06-16 23:32:10 +03:00
Lior Kaplan
c38b73a701 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
2014-06-16 23:30:44 +03:00
Lior Kaplan
6f3bcb0d6e Update copyright year for re2c generated files 2014-06-16 23:28:36 +03:00
Lior Kaplan
2d576c2a99 Update copyright year to 2014 2014-06-16 23:27:45 +03:00
Lior Kaplan
e667d23178 Update copyright year for re2c files as well 2014-06-16 23:26:50 +03:00
Dmitry Stogov
909acec231 Avoid useles constants update 2014-06-16 23:32:58 +04:00
Dmitry Stogov
50cbd7f4ce Optimize out useles paths 2014-06-16 21:49:46 +04:00
Dmitry Stogov
bd10db271c Use new zend_hash iteration API 2014-06-16 21:11:52 +04:00