php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,755 Commits 549 Branches 1,485 Tags
95c3b9ab397339978d7a2f2a196d2fa761410eb2
Commit Graph

73755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pierre Joye ff7d7bb290 - add gd changes 2013-03-20 12:34:01 +01:00
Pierre Joye 83e81c40ae Merge branch 'PHP-5.5' 
* PHP-5.5:
  - update the comment to match the code/features
 2013-03-20 12:29:56 +01:00
Pierre Joye f0078897c7 - update the comment to match the code/features 2013-03-20 12:29:47 +01:00
Pierre Joye 2799534296 Merge branch 'master' of git.php.net:php-src 2013-03-20 12:20:32 +01:00
Pierre Joye bc7b287a61 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - add imageaffinematrixget and imagematrixconcat
  - add affine matrix helper for translate, scale, rotate and shear
  - fix unix build
  - add new files for interpolation
  - config.m4 sync with .w32
  - add new interpolation method   . imagescale   . imageaffine   . replace imagerotate with new generic and optimized new implementations   . imagesetinterpolationmethod, to set the default interpolation to be     used with the new functions   . add imagepalettetotruecolor
 2013-03-20 12:19:46 +01:00
Pierre Joye 1ec484d3c5 - add imageaffinematrixget and imagematrixconcat 2013-03-20 12:19:03 +01:00
Pierre Joye 780c6e0a9c - add affine matrix helper for translate, scale, rotate and shear 2013-03-20 11:01:37 +01:00
Pierre Joye a46065ef71 - fix unix build 2013-03-20 09:24:54 +01:00
Anatol Belski 7daabc42a2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
 2013-03-20 09:15:46 +01:00
Anatol Belski bf8026aacf updated NEWS 2013-03-20 09:15:16 +01:00
Anatol Belski 0125ec77d2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
 2013-03-20 09:14:13 +01:00
Anatol Belski 0881ff0466 updated NEWS 2013-03-20 09:13:13 +01:00
Anatol Belski 06a526be3e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently
 2013-03-20 09:12:33 +01:00
Anatol Belski bb935ff8dc Fixed bug #64452 Zip PHPTs crash intermittently 2013-03-20 09:10:10 +01:00
Pierre Joye a7a53d369b - add new files for interpolation 2013-03-20 08:10:54 +01:00
Pierre Joye 00a53ca817 - config.m4 sync with .w32 2013-03-20 07:52:23 +01:00
Pierre Joye 22159fb7b7 - add new interpolation method 
. imagescale
  . imageaffine
  . replace imagerotate with new generic and optimized new implementations
  . imagesetinterpolationmethod, to set the default interpolation to be
    used with the new functions
  . add imagepalettetotruecolor
 2013-03-20 07:46:59 +01:00
Stanislav Malyshev b5a7675836 Merge branch 'PHP-5.5' 
* PHP-5.5:
  clarify NEWS
 2013-03-19 23:26:42 -07:00
Stanislav Malyshev 5aaff8d634 clarify NEWS 2013-03-19 22:32:50 -07:00
Ben Ramsey f5bf1ba88f array_column: Fix compile-time warnings 2013-03-19 20:44:19 -05:00
Anatol Belski 1cdf2c49ba Merge branch 'PHP-5.5' 
* PHP-5.5:
  Backported fix for bug #62852
 2013-03-19 21:23:08 +01:00