]>
granicus.if.org Git - php/log
David Soria Parra [Wed, 20 Mar 2013 12:14:33 +0000 (13:14 +0100)]
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()
David Soria Parra [Wed, 20 Mar 2013 12:14:20 +0000 (13:14 +0100)]
NEWS for array_column
David Soria Parra [Wed, 20 Mar 2013 12:02:33 +0000 (13:02 +0100)]
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()
Pierre Joye [Wed, 20 Mar 2013 11:38:22 +0000 (12:38 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- ws
Conflicts:
UPGRADING
Pierre Joye [Wed, 20 Mar 2013 11:37:13 +0000 (12:37 +0100)]
- ws
Pierre Joye [Wed, 20 Mar 2013 11:34:51 +0000 (12:34 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- add gd changes
Conflicts:
UPGRADING
Pierre Joye [Wed, 20 Mar 2013 11:34:01 +0000 (12:34 +0100)]
- add gd changes
Pierre Joye [Wed, 20 Mar 2013 11:29:56 +0000 (12:29 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- update the comment to match the code/features
Pierre Joye [Wed, 20 Mar 2013 11:29:47 +0000 (12:29 +0100)]
- update the comment to match the code/features
Pierre Joye [Wed, 20 Mar 2013 11:20:32 +0000 (12:20 +0100)]
Merge branch 'master' of git.php.net:php-src
Pierre Joye [Wed, 20 Mar 2013 11:19:46 +0000 (12:19 +0100)]
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
Pierre Joye [Wed, 20 Mar 2013 11:19:03 +0000 (12:19 +0100)]
- add imageaffinematrixget and imagematrixconcat
Pierre Joye [Wed, 20 Mar 2013 10:01:37 +0000 (11:01 +0100)]
- add affine matrix helper for translate, scale, rotate and shear
Pierre Joye [Wed, 20 Mar 2013 08:24:54 +0000 (09:24 +0100)]
- fix unix build
Anatol Belski [Wed, 20 Mar 2013 08:15:46 +0000 (09:15 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
Anatol Belski [Wed, 20 Mar 2013 08:15:16 +0000 (09:15 +0100)]
updated NEWS
Anatol Belski [Wed, 20 Mar 2013 08:14:13 +0000 (09:14 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
Fixed bug #64452 Zip PHPTs crash intermittently
Anatol Belski [Wed, 20 Mar 2013 08:13:13 +0000 (09:13 +0100)]
updated NEWS
Anatol Belski [Wed, 20 Mar 2013 08:12:33 +0000 (09:12 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #64452 Zip PHPTs crash intermittently
Anatol Belski [Wed, 20 Mar 2013 08:10:10 +0000 (09:10 +0100)]
Fixed bug #64452 Zip PHPTs crash intermittently
Pierre Joye [Wed, 20 Mar 2013 07:10:54 +0000 (08:10 +0100)]
- add new files for interpolation
Pierre Joye [Wed, 20 Mar 2013 06:52:23 +0000 (07:52 +0100)]
- config.m4 sync with .w32
Pierre Joye [Wed, 20 Mar 2013 06:46:59 +0000 (07:46 +0100)]
- 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
Stanislav Malyshev [Wed, 20 Mar 2013 06:26:42 +0000 (23:26 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
clarify NEWS
Stanislav Malyshev [Wed, 20 Mar 2013 05:32:50 +0000 (22:32 -0700)]
clarify NEWS
Ben Ramsey [Wed, 20 Mar 2013 01:44:19 +0000 (20:44 -0500)]
array_column: Fix compile-time warnings
Anatol Belski [Tue, 19 Mar 2013 20:23:08 +0000 (21:23 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Backported fix for bug #62852
Anatol Belski [Tue, 19 Mar 2013 20:22:49 +0000 (21:22 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Backported fix for bug #62852
Anatol Belski [Tue, 19 Mar 2013 20:22:09 +0000 (21:22 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Backported fix for bug #62852
Anatol Belski [Tue, 19 Mar 2013 20:19:55 +0000 (21:19 +0100)]
Backported fix for bug #62852
David Soria Parra [Tue, 19 Mar 2013 15:21:14 +0000 (16:21 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Refer to Zend Optimizer as Zend Opcache from now on
David Soria Parra [Tue, 19 Mar 2013 15:15:54 +0000 (16:15 +0100)]
Refer to Zend Optimizer as Zend Opcache from now on
David Soria Parra [Tue, 19 Mar 2013 14:55:36 +0000 (15:55 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
ZO+ NEWS
David Soria Parra [Tue, 19 Mar 2013 14:26:40 +0000 (15:26 +0100)]
ZO+ NEWS
Anatol Belski [Tue, 19 Mar 2013 14:16:16 +0000 (15:16 +0100)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Tue, 19 Mar 2013 14:15:31 +0000 (15:15 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Anatol Belski [Tue, 19 Mar 2013 14:14:03 +0000 (15:14 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix C89 compat
Anatol Belski [Tue, 19 Mar 2013 14:13:27 +0000 (15:13 +0100)]
fix C89 compat
David Soria Parra [Tue, 19 Mar 2013 14:11:56 +0000 (15:11 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix typos
David Soria Parra [Tue, 19 Mar 2013 14:11:48 +0000 (15:11 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix typos
Carson McDonald [Tue, 12 Mar 2013 08:15:50 +0000 (04:15 -0400)]
Fix typos
Anatol Belski [Tue, 19 Mar 2013 13:50:05 +0000 (14:50 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Anatol Belski [Tue, 19 Mar 2013 13:49:41 +0000 (14:49 +0100)]
Merge branch 'master' of git.php.net:php-src
David Soria Parra [Tue, 19 Mar 2013 13:48:05 +0000 (14:48 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix #48358 add() method for SplDoublyLinkedLis
Mark Baker [Mon, 18 Mar 2013 21:01:42 +0000 (22:01 +0100)]
Fix #48358 add() method for SplDoublyLinkedLis
Anatol Belski [Tue, 19 Mar 2013 13:45:57 +0000 (14:45 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix C90 compat
Anatol Belski [Tue, 19 Mar 2013 13:44:20 +0000 (14:44 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix C90 compat
Anatol Belski [Tue, 19 Mar 2013 13:42:18 +0000 (14:42 +0100)]
fix C90 compat
Dmitry Stogov [Tue, 19 Mar 2013 13:05:36 +0000 (17:05 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Dmitry Stogov [Tue, 19 Mar 2013 13:04:35 +0000 (17:04 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Conflicts:
NEWS
Dmitry Stogov [Tue, 19 Mar 2013 12:59:01 +0000 (16:59 +0400)]
Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Dmitry Stogov [Tue, 19 Mar 2013 11:48:22 +0000 (15:48 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Partial fix for bug #64239
Dmitry Stogov [Tue, 19 Mar 2013 11:47:43 +0000 (15:47 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Partial fix for bug #64239
Dmitry Stogov [Tue, 19 Mar 2013 11:45:48 +0000 (15:45 +0400)]
Partial fix for bug #64239
Dmitry Stogov [Tue, 19 Mar 2013 11:01:05 +0000 (15:01 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Dmitry Stogov [Tue, 19 Mar 2013 11:00:24 +0000 (15:00 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Conflicts:
NEWS
Dmitry Stogov [Tue, 19 Mar 2013 10:59:08 +0000 (14:59 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Dmitry Stogov [Tue, 19 Mar 2013 10:56:53 +0000 (14:56 +0400)]
Fixed bug #62343 (Show class_alias In get_declared_classes())
Dmitry Stogov [Tue, 19 Mar 2013 09:08:14 +0000 (13:08 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Dmitry Stogov [Tue, 19 Mar 2013 09:07:32 +0000 (13:07 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Conflicts:
NEWS
Zend/zend_compile.c
Dmitry Stogov [Tue, 19 Mar 2013 08:48:23 +0000 (12:48 +0400)]
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
Dmitry Stogov [Tue, 19 Mar 2013 06:45:57 +0000 (10:45 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
strlen() returns size_t
Dmitry Stogov [Tue, 19 Mar 2013 06:45:38 +0000 (10:45 +0400)]
strlen() returns size_t
Dmitry Stogov [Tue, 19 Mar 2013 06:32:50 +0000 (10:32 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Renamed Zend Optimizer+ into Zend OPcache
Dmitry Stogov [Tue, 19 Mar 2013 06:32:24 +0000 (10:32 +0400)]
Renamed Zend Optimizer+ into Zend OPcache
Dmitry Stogov [Tue, 19 Mar 2013 06:19:01 +0000 (10:19 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Add stats to phpinfo
Dmitry Stogov [Tue, 19 Mar 2013 06:17:44 +0000 (10:17 +0400)]
Add stats to phpinfo
Dmitry Stogov [Mon, 18 Mar 2013 09:36:52 +0000 (13:36 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Avoid trailing line break
Dmitry Stogov [Mon, 18 Mar 2013 09:36:31 +0000 (13:36 +0400)]
Avoid trailing line break
Dmitry Stogov [Mon, 18 Mar 2013 09:17:42 +0000 (13:17 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
fix NEWS
fix NEWS
Dmitry Stogov [Mon, 18 Mar 2013 09:17:26 +0000 (13:17 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix NEWS
fix NEWS
Dmitry Stogov [Mon, 18 Mar 2013 09:16:32 +0000 (13:16 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
Add optional flag to opcache_get_status()
Dmitry Stogov [Mon, 18 Mar 2013 09:13:35 +0000 (13:13 +0400)]
Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:53 +0000 (00:52 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
fix NEWS
fix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:36 +0000 (00:52 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:27 +0000 (00:52 -0700)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:15 +0000 (00:52 -0700)]
fix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:51:35 +0000 (00:51 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS
Stanislav Malyshev [Mon, 18 Mar 2013 07:51:16 +0000 (00:51 -0700)]
fix NEWS
Dmitry Stogov [Mon, 18 Mar 2013 07:23:26 +0000 (11:23 +0400)]
Add optional flag to opcache_get_status()
Boris Lytochkin [Sun, 17 Mar 2013 16:53:19 +0000 (20:53 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
merge with 5.4
more test coverage: missing square bracket error message
Fixed bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:52:55 +0000 (20:52 +0400)]
merge with 5.4
Boris Lytochkin [Sun, 17 Mar 2013 16:52:12 +0000 (20:52 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
more test coverage: missing square bracket error message
Fixed bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:40:15 +0000 (20:40 +0400)]
more test coverage: missing square bracket error message
Boris Lytochkin [Sun, 17 Mar 2013 16:29:14 +0000 (20:29 +0400)]
Fixed bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:18:17 +0000 (20:18 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:02:34 +0000 (20:02 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #61981
Boris Lytochkin [Sun, 17 Mar 2013 16:00:37 +0000 (20:00 +0400)]
Fix bug #61981
Dmitry Stogov [Sun, 17 Mar 2013 08:17:39 +0000 (12:17 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Load "black list" only if O+ is enabled
Dmitry Stogov [Sun, 17 Mar 2013 08:17:04 +0000 (12:17 +0400)]
Load "black list" only if O+ is enabled
Dmitry Stogov [Sun, 17 Mar 2013 07:57:08 +0000 (11:57 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Made opcache_get_status() return statistics during O+ restart
Dmitry Stogov [Sun, 17 Mar 2013 07:56:04 +0000 (11:56 +0400)]
Made opcache_get_status() return statistics during O+ restart
Dmitry Stogov [Sun, 17 Mar 2013 07:43:45 +0000 (11:43 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Added ability to load zend_extensions without absolute path names
Dmitry Stogov [Sun, 17 Mar 2013 07:42:25 +0000 (11:42 +0400)]
Added ability to load zend_extensions without absolute path names
Dmitry Stogov [Sun, 17 Mar 2013 06:59:23 +0000 (10:59 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Enabled O+ build by default (it may be disabled before 5.0.0 release)
Dmitry Stogov [Sun, 17 Mar 2013 06:58:30 +0000 (10:58 +0400)]
Enabled O+ build by default (it may be disabled before 5.0.0 release)
Dmitry Stogov [Sun, 17 Mar 2013 06:42:41 +0000 (10:42 +0400)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Removed files that are neccessary only for standalone pecl branch
setting plausible default value for struct members
Dmitry Stogov [Sun, 17 Mar 2013 06:40:59 +0000 (10:40 +0400)]
Removed files that are neccessary only for standalone pecl branch
Anatol Belski [Sat, 16 Mar 2013 17:07:21 +0000 (18:07 +0100)]
setting plausible default value for struct members
especially for unsigned members so they don't casted to max unsigned
Anatol Belski [Sat, 16 Mar 2013 17:27:21 +0000 (18:27 +0100)]
Merge branch 'master' of git.php.net:php-src