]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 13:11:42 +0000 (21:11 +0800)]
Merge branch 'PHP-5.5'

11 years agoUpdate NEWS
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 13:11:15 +0000 (21:11 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 13:10:32 +0000 (21:10 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 13:09:30 +0000 (21:09 +0800)]
Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 07:58:25 +0000 (15:58 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 07:58:08 +0000 (15:58 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7
commit | commitdiff | tree
Xinchen Hui [Sat, 16 Mar 2013 15:14:06 +0000 (23:14 +0800)]
Fix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 03:15:05 +0000 (11:15 +0800)]
Merge branch 'PHP-5.5'

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 03:14:36 +0000 (11:14 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #64432 (more empty delimiter warning in strX methods)
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 03:14:10 +0000 (11:14 +0800)]
Fixed bug #64432 (more empty delimiter warning in strX methods)

11 years agofix memory leak
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 02:56:30 +0000 (10:56 +0800)]
fix memory leak

the value shouldn't be ref, use z_add_ref is enough

11 years agofix memory leak
commit | commitdiff | tree
Xinchen Hui [Thu, 21 Mar 2013 02:56:30 +0000 (10:56 +0800)]
fix memory leak

the value shouldn't be ref, use z_add_ref is enough

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 20 Mar 2013 21:16:08 +0000 (14:16 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  add array_column()

11 years agoadd array_column()
commit | commitdiff | tree
Stanislav Malyshev [Wed, 20 Mar 2013 21:14:17 +0000 (14:14 -0700)]
add array_column()

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Wed, 20 Mar 2013 14:24:00 +0000 (15:24 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS section for beta 2
  NEWS for beta 1
  Allow local override of PHPROOT in makedist

11 years agoNEWS section for beta 2
commit | commitdiff | tree
David Soria Parra [Wed, 20 Mar 2013 14:07:08 +0000 (15:07 +0100)]
NEWS section for beta 2

11 years agoNEWS for beta 1
commit | commitdiff | tree
David Soria Parra [Wed, 20 Mar 2013 14:06:15 +0000 (15:06 +0100)]
NEWS for beta 1

11 years agoAllow local override of PHPROOT in makedist
commit | commitdiff | tree
David Soria Parra [Wed, 20 Mar 2013 14:16:24 +0000 (15:16 +0100)]
Allow local override of PHPROOT in makedist

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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()

11 years agoNEWS for array_column
commit | commitdiff | tree
David Soria Parra [Wed, 20 Mar 2013 12:14:20 +0000 (13:14 +0100)]
NEWS for array_column

11 years agoMerge branch 'pull-request/257' into PHP-5.5
commit | commitdiff | tree
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()

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 11:38:22 +0000 (12:38 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  - ws

Conflicts:
UPGRADING

11 years ago- ws
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 11:37:13 +0000 (12:37 +0100)]
- ws

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years ago- add gd changes
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 11:34:01 +0000 (12:34 +0100)]
- add gd changes

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years ago- update the comment to match the code/features
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 11:29:47 +0000 (12:29 +0100)]
- update the comment to match the code/features

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 11:20:32 +0000 (12:20 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years ago- add imageaffinematrixget and imagematrixconcat
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 11:19:03 +0000 (12:19 +0100)]
- add imageaffinematrixget and imagematrixconcat

11 years ago- add affine matrix helper for translate, scale, rotate and shear
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 10:01:37 +0000 (11:01 +0100)]
- add affine matrix helper for translate, scale, rotate and shear

11 years ago- fix unix build
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 08:24:54 +0000 (09:24 +0100)]
- fix unix build

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Wed, 20 Mar 2013 08:15:16 +0000 (09:15 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoupdated NEWS
commit | commitdiff | tree
Anatol Belski [Wed, 20 Mar 2013 08:13:13 +0000 (09:13 +0100)]
updated NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
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

11 years agoFixed bug #64452 Zip PHPTs crash intermittently
commit | commitdiff | tree
Anatol Belski [Wed, 20 Mar 2013 08:10:10 +0000 (09:10 +0100)]
Fixed bug #64452 Zip PHPTs crash intermittently

11 years ago- add new files for interpolation
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 07:10:54 +0000 (08:10 +0100)]
- add new files for interpolation

11 years ago- config.m4 sync with .w32
commit | commitdiff | tree
Pierre Joye [Wed, 20 Mar 2013 06:52:23 +0000 (07:52 +0100)]
- config.m4 sync with .w32

11 years ago- add new interpolation method
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Stanislav Malyshev [Wed, 20 Mar 2013 06:26:42 +0000 (23:26 -0700)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  clarify NEWS

11 years agoclarify NEWS
commit | commitdiff | tree
Stanislav Malyshev [Wed, 20 Mar 2013 05:32:50 +0000 (22:32 -0700)]
clarify NEWS

11 years agoarray_column: Fix compile-time warnings
commit | commitdiff | tree
Ben Ramsey [Wed, 20 Mar 2013 01:44:19 +0000 (20:44 -0500)]
array_column: Fix compile-time warnings

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
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

11 years agoBackported fix for bug #62852
commit | commitdiff | tree
Anatol Belski [Tue, 19 Mar 2013 20:19:55 +0000 (21:19 +0100)]
Backported fix for bug #62852

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoRefer to Zend Optimizer as Zend Opcache from now on
commit | commitdiff | tree
David Soria Parra [Tue, 19 Mar 2013 15:15:54 +0000 (16:15 +0100)]
Refer to Zend Optimizer as Zend Opcache from now on

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Tue, 19 Mar 2013 14:55:36 +0000 (15:55 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  ZO+ NEWS

11 years agoZO+ NEWS
commit | commitdiff | tree
David Soria Parra [Tue, 19 Mar 2013 14:26:40 +0000 (15:26 +0100)]
ZO+ NEWS

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Anatol Belski [Tue, 19 Mar 2013 14:16:16 +0000 (15:16 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Tue, 19 Mar 2013 14:14:03 +0000 (15:14 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix C89 compat

11 years agofix C89 compat
commit | commitdiff | tree
Anatol Belski [Tue, 19 Mar 2013 14:13:27 +0000 (15:13 +0100)]
fix C89 compat

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
David Soria Parra [Tue, 19 Mar 2013 14:11:56 +0000 (15:11 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix typos

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoFix typos
commit | commitdiff | tree
Carson McDonald [Tue, 12 Mar 2013 08:15:50 +0000 (04:15 -0400)]
Fix typos

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
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

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
Anatol Belski [Tue, 19 Mar 2013 13:49:41 +0000 (14:49 +0100)]
Merge branch 'master' of git.php.net:php-src

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoFix #48358 add() method for SplDoublyLinkedLis
commit | commitdiff | tree
Mark Baker [Mon, 18 Mar 2013 21:01:42 +0000 (22:01 +0100)]
Fix #48358 add() method for SplDoublyLinkedLis

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
Anatol Belski [Tue, 19 Mar 2013 13:45:57 +0000 (14:45 +0100)]
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix C90 compat

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agofix C90 compat
commit | commitdiff | tree
Anatol Belski [Tue, 19 Mar 2013 13:42:18 +0000 (14:42 +0100)]
fix C90 compat

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoFixed bug #63976 (Parent class incorrectly using child constant in class property)
commit | commitdiff | tree
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)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoPartial fix for bug #64239
commit | commitdiff | tree
Dmitry Stogov [Tue, 19 Mar 2013 11:45:48 +0000 (15:45 +0400)]
Partial fix for bug #64239

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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())

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
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())

11 years agoFixed bug #62343 (Show class_alias In get_declared_classes())
commit | commitdiff | tree
Dmitry Stogov [Tue, 19 Mar 2013 10:56:53 +0000 (14:56 +0400)]
Fixed bug #62343 (Show class_alias In get_declared_classes())

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoFixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
commit | commitdiff | tree
Dmitry Stogov [Tue, 19 Mar 2013 08:48:23 +0000 (12:48 +0400)]
Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agostrlen() returns size_t
commit | commitdiff | tree
Dmitry Stogov [Tue, 19 Mar 2013 06:45:38 +0000 (10:45 +0400)]
strlen() returns size_t

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoRenamed Zend Optimizer+ into Zend OPcache
commit | commitdiff | tree
Dmitry Stogov [Tue, 19 Mar 2013 06:32:24 +0000 (10:32 +0400)]
Renamed Zend Optimizer+ into Zend OPcache

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoAdd stats to phpinfo
commit | commitdiff | tree
Dmitry Stogov [Tue, 19 Mar 2013 06:17:44 +0000 (10:17 +0400)]
Add stats to phpinfo

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoAvoid trailing line break
commit | commitdiff | tree
Dmitry Stogov [Mon, 18 Mar 2013 09:36:31 +0000 (13:36 +0400)]
Avoid trailing line break

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
commit | commitdiff | tree
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

11 years agoMerge branch 'master' of git.php.net:php-src
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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()

11 years agoAdd oom, wasted, hash and manual restart counters to help identify potential configur...
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
commit | commitdiff | tree
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

11 years agofix NEWS
commit | commitdiff | tree
Stanislav Malyshev [Mon, 18 Mar 2013 07:52:15 +0000 (00:52 -0700)]
fix NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
commit | commitdiff | tree
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

11 years agofix NEWS
commit | commitdiff | tree
Stanislav Malyshev [Mon, 18 Mar 2013 07:51:16 +0000 (00:51 -0700)]
fix NEWS

11 years agoAdd optional flag to opcache_get_status()
commit | commitdiff | tree
Dmitry Stogov [Mon, 18 Mar 2013 07:23:26 +0000 (11:23 +0400)]
Add optional flag to opcache_get_status()

11 years agoMerge branch 'PHP-5.5'
commit | commitdiff | tree
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

11 years agomerge with 5.4
commit | commitdiff | tree
Boris Lytochkin [Sun, 17 Mar 2013 16:52:55 +0000 (20:52 +0400)]
merge with 5.4

next
Unnamed repository; edit this file 'description' to name the repository.