granicus.if.org Git

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.

commit | commitdiff | tree

Pierre Joye [Sat, 23 Mar 2013 09:30:06 +0000 (10:30 +0100)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Pierre Joye [Sat, 23 Mar 2013 09:26:26 +0000 (10:26 +0100)]

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

commit | commitdiff | tree

Pierre Joye [Sat, 23 Mar 2013 09:21:22 +0000 (10:21 +0100)]

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

commit | commitdiff | tree

Pierre Joye [Sat, 23 Mar 2013 09:18:31 +0000 (10:18 +0100)]

- 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

commit | commitdiff | tree

David Soria Parra [Fri, 22 Mar 2013 16:45:07 +0000 (17:45 +0100)]

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

commit | commitdiff | tree

David Soria Parra [Fri, 22 Mar 2013 16:44:32 +0000 (17:44 +0100)]

Note about bison version

commit | commitdiff | tree

Etienne Kneuss [Fri, 22 Mar 2013 10:35:45 +0000 (11:35 +0100)]

Add SplDoublyLinkedList::add to UPGRADING

commit | commitdiff | tree

Pierre Joye [Fri, 22 Mar 2013 08:30:32 +0000 (09:30 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
- fix regression (imagerotate_overflow.phpt), fix for all cases

commit | commitdiff | tree

Pierre Joye [Fri, 22 Mar 2013 08:30:23 +0000 (09:30 +0100)]

- fix regression (imagerotate_overflow.phpt), fix for all cases

commit | commitdiff | tree

Pierre Joye [Fri, 22 Mar 2013 08:21:23 +0000 (09:21 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
- fix regression bug24155.phpt and bug39366.phpt

commit | commitdiff | tree

Pierre Joye [Fri, 22 Mar 2013 08:21:11 +0000 (09:21 +0100)]

- fix regression bug24155.phpt and bug39366.phpt

commit | commitdiff | tree

Pierre Joye [Fri, 22 Mar 2013 07:31:11 +0000 (08:31 +0100)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Pierre Joye [Fri, 22 Mar 2013 07:28:25 +0000 (08:28 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
- fix regression (imagerotate_overflow.phpt)

commit | commitdiff | tree

Pierre Joye [Fri, 22 Mar 2013 07:28:11 +0000 (08:28 +0100)]

- fix regression (imagerotate_overflow.phpt)

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 22 Mar 2013 06:14:16 +0000 (23:14 -0700)]

Tweaks an add OPcache info to UPGRADING

commit | commitdiff | tree

David Soria Parra [Thu, 21 Mar 2013 14:52:12 +0000 (15:52 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Add OPCache ini settings to php.ini

commit | commitdiff | tree

David Soria Parra [Thu, 21 Mar 2013 14:50:21 +0000 (15:50 +0100)]

Add OPCache ini settings to php.ini

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Mar 2013 13:32:57 +0000 (21:32 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Mar 2013 13:32:32 +0000 (21:32 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Mar 2013 13:29:02 +0000 (21:29 +0800)]

Fix bug in reflectionClass relate to #64239

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Mar 2013 13:11:42 +0000 (21:11 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Mar 2013 13:11:15 +0000 (21:11 +0800)]

Update NEWS

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

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)

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Mar 2013 07:58:25 +0000 (15:58 +0800)]

Merge branch '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

commit | commitdiff | tree

Xinchen Hui [Sat, 16 Mar 2013 15:14:06 +0000 (23:14 +0800)]

Fix test after f8b91d9acff10ede7bd3f2bc631794a3abef8ff7

commit | commitdiff | tree

Xinchen Hui [Thu, 21 Mar 2013 03:15:05 +0000 (11:15 +0800)]

Merge branch '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

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)

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

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

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()

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Mar 2013 21:14:17 +0000 (14:14 -0700)]

add array_column()

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

commit | commitdiff | tree

David Soria Parra [Wed, 20 Mar 2013 14:07:08 +0000 (15:07 +0100)]

NEWS section for beta 2

commit | commitdiff | tree

David Soria Parra [Wed, 20 Mar 2013 14:06:15 +0000 (15:06 +0100)]

NEWS for beta 1

commit | commitdiff | tree

David Soria Parra [Wed, 20 Mar 2013 14:16:24 +0000 (15:16 +0100)]

Allow local override of PHPROOT in makedist

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()

commit | commitdiff | tree

David Soria Parra [Wed, 20 Mar 2013 12:14:20 +0000 (13:14 +0100)]

NEWS for array_column

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()

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

commit | commitdiff | tree

Pierre Joye [Wed, 20 Mar 2013 11:37:13 +0000 (12:37 +0100)]

- ws

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

commit | commitdiff | tree

Pierre Joye [Wed, 20 Mar 2013 11:34:01 +0000 (12:34 +0100)]

- add gd changes

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

commit | commitdiff | tree

Pierre Joye [Wed, 20 Mar 2013 11:29:47 +0000 (12:29 +0100)]

- update the comment to match the code/features

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

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

commit | commitdiff | tree

Pierre Joye [Wed, 20 Mar 2013 11:19:03 +0000 (12:19 +0100)]

- add imageaffinematrixget and imagematrixconcat

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

commit | commitdiff | tree

Pierre Joye [Wed, 20 Mar 2013 08:24:54 +0000 (09:24 +0100)]

- fix unix build

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

commit | commitdiff | tree

Anatol Belski [Wed, 20 Mar 2013 08:15:16 +0000 (09:15 +0100)]

updated NEWS

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

commit | commitdiff | tree

Anatol Belski [Wed, 20 Mar 2013 08:13:13 +0000 (09:13 +0100)]

updated NEWS

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

commit | commitdiff | tree

Anatol Belski [Wed, 20 Mar 2013 08:10:10 +0000 (09:10 +0100)]

Fixed bug #64452 Zip PHPTs crash intermittently

commit | commitdiff | tree

Pierre Joye [Wed, 20 Mar 2013 07:10:54 +0000 (08:10 +0100)]

- add new files for interpolation

commit | commitdiff | tree

Pierre Joye [Wed, 20 Mar 2013 06:52:23 +0000 (07:52 +0100)]

- config.m4 sync with .w32

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

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

commit | commitdiff | tree

Stanislav Malyshev [Wed, 20 Mar 2013 05:32:50 +0000 (22:32 -0700)]

clarify NEWS

commit | commitdiff | tree

Ben Ramsey [Wed, 20 Mar 2013 01:44:19 +0000 (20:44 -0500)]

array_column: Fix compile-time warnings

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