granicus.if.org Git

Merge branch 'date-time-dst-rfc' into PHP-5.4

This is a partial resolve of some DST issues, plenty of things to do, but as
this *does* fix a few issues it's worth merging it already.

commit | commitdiff | tree

Derick Rethans [Thu, 28 Nov 2013 14:24:39 +0000 (14:24 +0000)]

Marking those two as XFAIL for now.

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 13:04:54 +0000 (17:04 +0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
  Updated NEWS for Constant Scalar Exprs RFC
  Moved arrays again to "static_scalar:" & little cleanup
  Renaming
  Constant expressions refactoring
  Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
  Added a few more operators
  Whitespace fix
  converted several switches to ifs and made more opcache friendly
  Fatal error about self referencing constants fixed
  Fixed mem leaks, added tests and ternary operator
  Working commit for constant scalar expressions (with constants). Tests will follow.

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 13:03:59 +0000 (17:03 +0400)]

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

* 'master' of git.php.net:php-src:
  Updated NEWS for Constant Scalar Exprs RFC
  Moved arrays again to "static_scalar:" & little cleanup
  Renaming
  Constant expressions refactoring
  Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
  Added a few more operators
  Whitespace fix
  converted several switches to ifs and made more opcache friendly
  Fatal error about self referencing constants fixed
  Fixed mem leaks, added tests and ternary operator
  Working commit for constant scalar expressions (with constants). Tests will follow.

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 13:03:28 +0000 (17:03 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Some rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need to be fixed)
Removed duplicated hash function implementation (100% source compatible)

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 13:02:01 +0000 (17:02 +0400)]

Some rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need to be fixed)

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 13:01:10 +0000 (17:01 +0400)]

Removed duplicated hash function implementation (100% source compatible)

commit | commitdiff | tree

Bob Weinand [Thu, 28 Nov 2013 12:53:00 +0000 (13:53 +0100)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Bob Weinand [Thu, 28 Nov 2013 12:46:51 +0000 (13:46 +0100)]

Updated NEWS for Constant Scalar Exprs RFC

commit | commitdiff | tree

Bob Weinand [Thu, 28 Nov 2013 12:41:42 +0000 (13:41 +0100)]

Merge branch 'const_scalar_exprs' into PHP-5.6

Conflicts:
Zend/zend_extensions.h

commit | commitdiff | tree

Derick Rethans [Thu, 20 Jun 2013 08:28:23 +0000 (09:28 +0100)]

Fixed a few DST changeover issues.

commit | commitdiff | tree

Derick Rethans [Tue, 16 Apr 2013 15:31:10 +0000 (16:31 +0100)]

Move add/sub to timelib.

commit | commitdiff | tree

Derick Rethans [Sat, 13 Apr 2013 22:47:23 +0000 (23:47 +0100)]

Fix backwards transition diffs.

commit | commitdiff | tree

Derick Rethans [Sat, 13 Apr 2013 22:28:59 +0000 (23:28 +0100)]

Split up tests into their different categories.

commit | commitdiff | tree

Derick Rethans [Sat, 13 Apr 2013 17:45:51 +0000 (18:45 +0100)]

Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.

commit | commitdiff | tree

Derick Rethans [Fri, 12 Apr 2013 10:24:14 +0000 (11:24 +0100)]

Fixed forward transitions in diffs.

commit | commitdiff | tree

Derick Rethans [Fri, 12 Apr 2013 10:23:49 +0000 (11:23 +0100)]

Always reset those parameters.

commit | commitdiff | tree

Derick Rethans [Sun, 31 Mar 2013 17:11:35 +0000 (18:11 +0100)]

Fixed "Forward Transition" construction of DateTime objects.

This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 07:46:28 +0000 (11:46 +0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 07:46:11 +0000 (11:46 +0400)]

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

* 'master' of git.php.net:php-src:
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 07:45:47 +0000 (11:45 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Don't check argument types for internal functions without type hinting

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 07:44:14 +0000 (11:44 +0400)]

Don't check argument types for internal functions without type hinting

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:01:16 +0000 (22:01 +0000)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:01:09 +0000 (22:01 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:01:03 +0000 (22:01 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:00:53 +0000 (22:00 +0000)]

Merge branch 'bug53879' into PHP-5.4

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 21:59:46 +0000 (21:59 +0000)]

Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 17:04:23 +0000 (21:04 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed tests

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 17:04:00 +0000 (21:04 +0400)]

Fixed tests

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 16:32:21 +0000 (20:32 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Removed deprecated AI_SET_PTR()s

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 16:30:35 +0000 (20:30 +0400)]

Removed deprecated AI_SET_PTR()s

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:54 +0000 (14:58 +0400)]

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:35 +0000 (14:58 +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:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:23 +0000 (14:58 +0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:08 +0000 (14:58 +0400)]

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

* 'master' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:56:48 +0000 (14:56 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #65969 (Chain assignment with T_LIST failure)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:56:18 +0000 (14:56 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #65969 (Chain assignment with T_LIST failure)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:39:40 +0000 (14:39 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #65969 (Chain assignment with T_LIST failure)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:26:34 +0000 (14:26 +0400)]

Fixed bug #65969 (Chain assignment with T_LIST failure)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:16:18 +0000 (11:16 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:15:58 +0000 (11:15 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:15:34 +0000 (11:15 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:15:08 +0000 (11:15 +0100)]

Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:13:16 +0000 (11:13 +0100)]

Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Julien Pauli [Wed, 27 Nov 2013 09:33:05 +0000 (10:33 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
5.5.8-dev now

commit | commitdiff | tree

Julien Pauli [Wed, 27 Nov 2013 09:32:05 +0000 (10:32 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Julien Pauli [Wed, 27 Nov 2013 08:34:40 +0000 (09:34 +0100)]

5.5.8-dev now

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:19:30 +0000 (00:19 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:18:54 +0000 (00:18 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.24-dev now
  merge fix
  add test
  Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:15:03 +0000 (00:15 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
5.4.24-dev now

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:14:42 +0000 (00:14 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.24-dev now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:13:45 +0000 (00:13 -0800)]

5.4.24-dev now

commit | commitdiff | tree

George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]

update to LSAPI 6.6

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 18:10:30 +0000 (20:10 +0200)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 18:10:17 +0000 (20:10 +0200)]

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

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:59:19 +0000 (21:59 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed opcahce_reset() crash when opcache.protect_memory is set

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:59:02 +0000 (21:59 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed opcahce_reset() crash when opcache.protect_memory is set

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:57:32 +0000 (21:57 +0400)]

Fixed opcahce_reset() crash when opcache.protect_memory is set

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:44:54 +0000 (21:44 +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:
Fixed a wrong test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:44:32 +0000 (21:44 +0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
Fixed a wrong test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:43:51 +0000 (21:43 +0400)]

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

* 'master' of git.php.net:php-src:
Fixed a wrong test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:43:19 +0000 (21:43 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Added an optimization of class constants and constant calls to some internal functions
Added an optimization of class constants and constant calls to some internal functions

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:38:40 +0000 (21:38 +0400)]

Added an optimization of class constants and constant calls to some internal functions

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:37:43 +0000 (19:37 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:37:31 +0000 (21:37 +0400)]

Added an optimization of class constants and constant calls to some internal functions

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:15:43 +0000 (19:15 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:15:30 +0000 (19:15 +0200)]

merge fix

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:15:12 +0000 (19:15 +0200)]

add test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:03:34 +0000 (21:03 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:02:45 +0000 (19:02 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:01:49 +0000 (19:01 +0200)]

Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:01:01 +0000 (21:01 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:00:00 +0000 (21:00 +0400)]

Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Julien Pauli [Tue, 26 Nov 2013 16:44:52 +0000 (17:44 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed a wrong test

commit | commitdiff | tree

Julien Pauli [Tue, 26 Nov 2013 16:43:45 +0000 (17:43 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed a wrong test

commit | commitdiff | tree

Julien Pauli [Tue, 26 Nov 2013 16:43:31 +0000 (17:43 +0100)]

Fixed a wrong test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 15:55:49 +0000 (19:55 +0400)]

Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:49:38 +0000 (17:49 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Revert NEWS
Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:48:59 +0000 (17:48 +0400)]

Revert NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:48:11 +0000 (17:48 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:47:02 +0000 (17:47 +0400)]

Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 08:14:22 +0000 (12:14 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Added test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 08:14:12 +0000 (12:14 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Added test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 08:13:42 +0000 (12:13 +0400)]

Added test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 07:37:05 +0000 (11:37 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 07:36:23 +0000 (11:36 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
bring the news

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 07:34:41 +0000 (11:34 +0400)]

Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)

commit | commitdiff | tree

Andrey Hristov [Mon, 25 Nov 2013 19:33:14 +0000 (21:33 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Andrey Hristov [Mon, 25 Nov 2013 19:33:04 +0000 (21:33 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

commit | commitdiff | tree

Andrey Hristov [Mon, 25 Nov 2013 19:31:51 +0000 (21:31 +0200)]

bring the news

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:12:11 +0000 (14:12 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:11:45 +0000 (14:11 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:09:57 +0000 (14:09 +0400)]

Fixed compatibility with old PHP versions

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:07:24 +0000 (14:07 +0400)]

Fixed bug #65915 (Inconsistent results with require return value)

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

RSS Atom