1
0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Commit Graph

73776 Commits

Author SHA1 Message Date
Nikita Popov 1713d9ad30 Merge branch 'PHP-5.5'
Conflicts:
	UPGRADING
	UPGRADING.INTERNALS
2013-03-23 18:09:05 +01:00
Nikita Popov 0cb868c042 Move some internal changes from UPGRADING to UPGRADING.INTERNALS 2013-03-23 18:06:25 +01:00
Anatol Belski 3e45aa0723 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed possible precision loss in microtime
2013-03-23 17:48:21 +01:00
Anatol Belski 2e00f7611c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed possible precision loss in microtime
2013-03-23 17:48:05 +01:00
Anatol Belski 3654ff7366 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed possible precision loss in microtime
2013-03-23 17:47:39 +01:00
Anatol Belski b022e54bd1 Fixed possible precision loss in microtime
This is related to the fix for bug #64370. MSVC natively supports __int64 type,
so calculating with 32 bit ints is neither necessary nor reliable. Therefore
an older piece of code is reused.
2013-03-23 17:40:06 +01:00
Pierre Joye 8a256d8ffb Merge branch 'master' of git.php.net:php-src 2013-03-23 10:30:06 +01:00
Pierre Joye 84220f8a60 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 10:26:26 +01:00
Pierre Joye 4a9eb328ee Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 10:21:22 +01:00
Pierre Joye e6a9d1ca8d - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too 2013-03-23 10:18:31 +01:00
David Soria Parra 6cae773dae Merge branch 'PHP-5.5'
* PHP-5.5:
  Note about bison version
  Add SplDoublyLinkedList::add to UPGRADING
  Tweaks an add OPcache info to UPGRADING

Conflicts:
	UPGRADING
2013-03-22 17:45:07 +01:00
David Soria Parra defb08c705 Note about bison version 2013-03-22 17:44:32 +01:00
Etienne Kneuss 6af1b08482 Add SplDoublyLinkedList::add to UPGRADING 2013-03-22 11:35:45 +01:00
Pierre Joye dd9e4b34d6 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt), fix for all cases
2013-03-22 09:30:32 +01:00
Pierre Joye f39a23696b - fix regression (imagerotate_overflow.phpt), fix for all cases 2013-03-22 09:30:23 +01:00
Pierre Joye 672f8525fb Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix regression bug24155.phpt and bug39366.phpt
2013-03-22 09:21:23 +01:00
Pierre Joye f05972ddbf - fix regression bug24155.phpt and bug39366.phpt 2013-03-22 09:21:11 +01:00
Pierre Joye 6512c44d8e Merge branch 'master' of git.php.net:php-src 2013-03-22 08:31:11 +01:00
Pierre Joye 2a8a9c0007 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt)
2013-03-22 08:28:25 +01:00
Pierre Joye 4e6d54f5a7 - fix regression (imagerotate_overflow.phpt) 2013-03-22 08:28:11 +01:00
Rasmus Lerdorf fd2b8df265 Tweaks an add OPcache info to UPGRADING 2013-03-21 23:14:16 -07:00
David Soria Parra 95c3b9ab39 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add OPCache ini settings to php.ini
2013-03-21 15:52:12 +01:00
David Soria Parra 293d5defb4 Add OPCache ini settings to php.ini 2013-03-21 15:51:23 +01:00
Xinchen Hui 9d2897a9d1 Merge branch 'PHP-5.5' 2013-03-21 21:32:57 +08:00
Xinchen Hui 534aec8a52 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 21:32:32 +08:00
Xinchen Hui 39a173b79b Fix bug in reflectionClass relate to #64239 2013-03-21 21:32:06 +08:00
Xinchen Hui 0bf7549772 Merge branch 'PHP-5.5' 2013-03-21 21:11:42 +08:00
Xinchen Hui 9d31c0de0c Update NEWS 2013-03-21 21:11:15 +08:00
Xinchen Hui 79925094c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 21:10:32 +08:00
Xinchen Hui 7dce0194c8 Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11) 2013-03-21 21:09:30 +08:00
Xinchen Hui bfbf334aff Merge branch 'PHP-5.5' 2013-03-21 15:58:25 +08:00
Xinchen Hui f2383dead6 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 15:58:08 +08:00
Xinchen Hui 08624ea90d Fix test after f8b91d9acf 2013-03-21 15:57:21 +08:00
Xinchen Hui b9185a4544 Merge branch 'PHP-5.5' 2013-03-21 11:15:05 +08:00
Xinchen Hui b29a9fa75d Merge branch 'PHP-5.4' into PHP-5.5 2013-03-21 11:14:36 +08:00
Xinchen Hui 0fd3572f4e Fixed bug #64432 (more empty delimiter warning in strX methods) 2013-03-21 11:14:10 +08:00
Xinchen Hui da6916a770 fix memory leak
the value shouldn't be ref, use z_add_ref is enough
2013-03-21 10:58:58 +08:00
Xinchen Hui d99c14b1a6 fix memory leak
the value shouldn't be ref, use z_add_ref is enough
2013-03-21 10:56:30 +08:00
Stanislav Malyshev 45b1d014f2 Merge branch 'PHP-5.5'
* PHP-5.5:
  add array_column()
2013-03-20 14:16:08 -07:00
Stanislav Malyshev 6f17c6242f add array_column() 2013-03-20 14:14:17 -07:00
David Soria Parra 78acb84b6e Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS section for beta 2
  NEWS for beta 1
  Allow local override of PHPROOT in makedist
2013-03-20 15:24:00 +01:00
David Soria Parra 2258350450 NEWS section for beta 2 2013-03-20 15:17:53 +01:00
David Soria Parra 7f2424bb1d NEWS for beta 1 2013-03-20 15:17:53 +01:00
David Soria Parra 52171aeaf4 Allow local override of PHPROOT in makedist 2013-03-20 15:17:53 +01:00
David Soria Parra ec26c93eff Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for array_column
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
2013-03-20 13:14:33 +01:00
David Soria Parra 66b4e5cdec NEWS for array_column 2013-03-20 13:14:20 +01:00
David Soria Parra 0173c4bab0 Merge branch 'pull-request/257' into PHP-5.5
* pull-request/257:
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
2013-03-20 13:02:33 +01:00
Pierre Joye fa161e9a67 Merge branch 'PHP-5.5'
* PHP-5.5:
  - ws

Conflicts:
	UPGRADING
2013-03-20 12:38:22 +01:00
Pierre Joye 15ecea7602 - ws 2013-03-20 12:37:13 +01:00
Pierre Joye 09854f1fb9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add gd changes

Conflicts:
	UPGRADING
2013-03-20 12:34:51 +01:00