]> granicus.if.org Git - php/log
php
11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Michael Wallner [Fri, 6 Dec 2013 09:39:10 +0000 (10:39 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN

11 years agoBFN
Michael Wallner [Fri, 6 Dec 2013 09:39:02 +0000 (10:39 +0100)]
BFN

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Michael Wallner [Fri, 6 Dec 2013 09:33:47 +0000 (10:33 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Fri, 6 Dec 2013 09:33:10 +0000 (10:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value

11 years agoFixed bug #61645 (fopen and O_NONBLOCK)
Michael Wallner [Fri, 6 Dec 2013 09:29:24 +0000 (10:29 +0100)]
Fixed bug #61645 (fopen and O_NONBLOCK)

if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check

11 years agofix possibly uninitialized value
Michael Wallner [Fri, 6 Dec 2013 09:27:33 +0000 (10:27 +0100)]
fix possibly uninitialized value

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Sara Golemon [Wed, 4 Dec 2013 15:50:45 +0000 (07:50 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Use 'user@example.com' rather than 'user@company.com' in tests

11 years agoUse 'user@example.com' rather than 'user@company.com' in tests
Sara Golemon [Wed, 4 Dec 2013 15:49:16 +0000 (07:49 -0800)]
Use 'user@example.com' rather than 'user@company.com' in tests

Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Wed, 4 Dec 2013 10:39:11 +0000 (12:39 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Wed, 4 Dec 2013 10:07:18 +0000 (12:07 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix loss of precision
Andrey Hristov [Wed, 4 Dec 2013 10:06:59 +0000 (12:06 +0200)]
Fix loss of precision

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Sara Golemon [Wed, 4 Dec 2013 02:21:12 +0000 (18:21 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module

11 years agoFix php_module_startup() when loading more than one additional module
Sara Golemon [Wed, 4 Dec 2013 00:36:07 +0000 (16:36 -0800)]
Fix php_module_startup() when loading more than one additional module

Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).

Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.

Fixes 63159
Thanks to @a-j-k

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Adam Harvey [Tue, 3 Dec 2013 22:52:35 +0000 (14:52 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Tue, 3 Dec 2013 22:51:03 +0000 (14:51 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.

11 years agoRemove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
Adam Harvey [Tue, 3 Dec 2013 22:46:15 +0000 (14:46 -0800)]
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.

These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.

Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).

11 years agoSupport gmp_remroot() on GMP 4.1
Nikita Popov [Mon, 2 Dec 2013 19:10:08 +0000 (20:10 +0100)]
Support gmp_remroot() on GMP 4.1

11 years agoAdded note about const scalar exprs in UPGRADING file
Bob Weinand [Mon, 2 Dec 2013 17:39:01 +0000 (18:39 +0100)]
Added note about const scalar exprs in UPGRADING file

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Michael Wallner [Mon, 2 Dec 2013 16:02:13 +0000 (17:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN
  Fix bug #65196

11 years agoBFN
Michael Wallner [Mon, 2 Dec 2013 16:02:01 +0000 (17:02 +0100)]
BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Mon, 2 Dec 2013 16:01:25 +0000 (17:01 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #65196

11 years agoFix bug #65196
Michael Wallner [Mon, 2 Dec 2013 15:58:34 +0000 (16:58 +0100)]
Fix bug #65196

Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Michael Wallner [Mon, 2 Dec 2013 11:15:27 +0000 (12:15 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  BFN
  fix bug #49634x

11 years agoBFN
Michael Wallner [Mon, 2 Dec 2013 11:14:26 +0000 (12:14 +0100)]
BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Mon, 2 Dec 2013 11:10:59 +0000 (12:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #49634x

11 years agofix bug #49634x
Michael Wallner [Mon, 2 Dec 2013 11:08:22 +0000 (12:08 +0100)]
fix bug #49634x

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Mon, 2 Dec 2013 08:05:29 +0000 (12:05 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed tests

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Mon, 2 Dec 2013 08:04:07 +0000 (12:04 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed tests

11 years agoFixed tests
Dmitry Stogov [Mon, 2 Dec 2013 07:53:35 +0000 (11:53 +0400)]
Fixed tests

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Mon, 2 Dec 2013 07:03:17 +0000 (11:03 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ability to build non-specialized GOTO VM

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Mon, 2 Dec 2013 07:02:40 +0000 (11:02 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed ability to build non-specialized GOTO VM

Conflicts:
Zend/zend_vm_gen.php

11 years agoFixed ability to build non-specialized GOTO VM
Dmitry Stogov [Mon, 2 Dec 2013 06:59:32 +0000 (10:59 +0400)]
Fixed ability to build non-specialized GOTO VM

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sun, 1 Dec 2013 12:45:22 +0000 (13:45 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoFix bug #65764
Nikita Popov [Sun, 1 Dec 2013 12:37:56 +0000 (13:37 +0100)]
Fix bug #65764

I'm not exactly sure whether this is the right way to fix it. The
question is whether Generator::throw() on a newborn generator (i.e.
a generator that is not yet at yield expression) should first advance to
the first yield and throw the exception there or whether it should
instead throw the exception in the caller's context.

The old behavior was to throw it at the start of the function (i.e.
the very first opcode), which causes issues like the one in #65764.
Effectively it's impossible to properly handle the exceptions in this
case.

For now I choose the variant where the generator advances to the
first yield before throwing, as that's consistent with how all other
methods on the Generator object currently behave. This does not
necessarily match the behavior in other languages, e.g. Python would throw
the exception in the caller's context. But then our send() method already
has this kind of deviation, so it stays internally consistent at least.

11 years ago- BFN
Felipe Pena [Sat, 30 Nov 2013 14:05:51 +0000 (12:05 -0200)]
- BFN

11 years agoMerge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Felipe Pena [Sat, 30 Nov 2013 13:44:08 +0000 (11:44 -0200)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5

11 years agoMerge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Felipe Pena [Sat, 30 Nov 2013 13:43:51 +0000 (11:43 -0200)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Felipe Pena [Sat, 30 Nov 2013 13:40:42 +0000 (11:40 -0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)

11 years ago- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
Felipe Pena [Sat, 30 Nov 2013 13:39:57 +0000 (11:39 -0200)]
- Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sat, 30 Nov 2013 12:40:17 +0000 (13:40 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoCleanup generator closing code a bit
Nikita Popov [Sat, 30 Nov 2013 12:35:33 +0000 (13:35 +0100)]
Cleanup generator closing code a bit

All code dealing with unfinished execution cleanup is now in a separate
function (previously most of it was run even when execution was properly
finished.

Furthermore some code dealing with unclean shutdowns has been removed,
which is no longer necessary, because we no longer try to clean up in
this case.

11 years agoFixed bug #66041: list() fails to unpack yielded ArrayAccess object
Nikita Popov [Sat, 30 Nov 2013 12:05:40 +0000 (13:05 +0100)]
Fixed bug #66041: list() fails to unpack yielded ArrayAccess object

Yield return values now use IS_VAR rather than IS_TMP_VAR. This
fixes the issue with list() and should also be faster as it avoids
doing a zval copy.

11 years agoFixed unused value compiler warning
ArunSK [Fri, 29 Nov 2013 22:54:17 +0000 (23:54 +0100)]
Fixed unused value compiler warning

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Fri, 29 Nov 2013 22:31:13 +0000 (23:31 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoFixed bug #65768: DateTimeImmutable::diff does not work
nikita2206 [Tue, 29 Oct 2013 15:40:17 +0000 (19:40 +0400)]
Fixed bug #65768: DateTimeImmutable::diff does not work

This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Fri, 29 Nov 2013 08:55:11 +0000 (12:55 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added validation of class names in the autoload process

Conflicts:
NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Fri, 29 Nov 2013 08:54:22 +0000 (12:54 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Added validation of class names in the autoload process

11 years agoAdded validation of class names in the autoload process
Dmitry Stogov [Fri, 29 Nov 2013 08:53:02 +0000 (12:53 +0400)]
Added validation of class names in the autoload process

11 years agoClean up GMP arginfos
Nikita Popov [Thu, 28 Nov 2013 23:00:41 +0000 (00:00 +0100)]
Clean up GMP arginfos

Removed duplicate arginfos, specified number of required args
everywhere and removed weird pass-by-ref arguments.

11 years agoAdd gmp_root() and gmp_rootrem() functions
Nikita Popov [Thu, 28 Nov 2013 22:42:23 +0000 (23:42 +0100)]
Add gmp_root() and gmp_rootrem() functions

11 years agoUse class handlers for GMP serialization
Nikita Popov [Sat, 23 Nov 2013 23:43:12 +0000 (00:43 +0100)]
Use class handlers for GMP serialization

A bit faster and less boilerplate

11 years agoRemove duplicate / commented code in GMP
Nikita Popov [Sat, 23 Nov 2013 11:54:20 +0000 (12:54 +0100)]
Remove duplicate / commented code in GMP

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Dmitry Stogov [Thu, 28 Nov 2013 21:00:14 +0000 (01:00 +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 #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
  Marking those two as XFAIL for now.
  Fixed a few DST changeover issues.
  Move add/sub to timelib.
  Fix backwards transition diffs.
  Split up tests into their different categories.
  Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
  Fixed forward transitions in diffs.
  Always reset those parameters.
  Fixed "Forward Transition" construction of DateTime objects.

11 years agoAvoid interned hash key duplication and hash key length recaclulation
Dmitry Stogov [Thu, 28 Nov 2013 20:57:49 +0000 (00:57 +0400)]
Avoid interned hash key duplication and hash key length recaclulation

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Thu, 28 Nov 2013 16:33:17 +0000 (16:33 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Thu, 28 Nov 2013 16:33:08 +0000 (16:33 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent...
Derick Rethans [Thu, 28 Nov 2013 16:32:11 +0000 (16:32 +0000)]
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Derick Rethans [Thu, 28 Nov 2013 14:46:21 +0000 (14:46 +0000)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Thu, 28 Nov 2013 14:45:26 +0000 (14:45 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoRemoved unused "pHashFunction" argument in _zend_hash_init() and family (must be...
Dmitry Stogov [Thu, 28 Nov 2013 14:40:46 +0000 (18:40 +0400)]
Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Thu, 28 Nov 2013 14:30:08 +0000 (14:30 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/date/php_date.c

11 years agoMerge branch 'date-time-dst-rfc' into PHP-5.4
Derick Rethans [Thu, 28 Nov 2013 14:26:01 +0000 (14:26 +0000)]
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.

11 years agoMarking those two as XFAIL for now.
Derick Rethans [Thu, 28 Nov 2013 14:24:39 +0000 (14:24 +0000)]
Marking those two as XFAIL for now.

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

11 years agoSome rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need...
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)

11 years agoRemoved duplicated hash function implementation (100% source compatible)
Dmitry Stogov [Thu, 28 Nov 2013 13:01:10 +0000 (17:01 +0400)]
Removed duplicated hash function implementation (100% source compatible)

11 years agoUpdated NEWS for Constant Scalar Exprs RFC
Bob Weinand [Thu, 28 Nov 2013 12:46:51 +0000 (13:46 +0100)]
Updated NEWS for Constant Scalar Exprs RFC

11 years agoMerge branch 'const_scalar_exprs' into PHP-5.6
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

11 years agoFixed a few DST changeover issues.
Derick Rethans [Thu, 20 Jun 2013 08:28:23 +0000 (09:28 +0100)]
Fixed a few DST changeover issues.

11 years agoMove add/sub to timelib.
Derick Rethans [Tue, 16 Apr 2013 15:31:10 +0000 (16:31 +0100)]
Move add/sub to timelib.

11 years agoFix backwards transition diffs.
Derick Rethans [Sat, 13 Apr 2013 22:47:23 +0000 (23:47 +0100)]
Fix backwards transition diffs.

11 years agoSplit up tests into their different categories.
Derick Rethans [Sat, 13 Apr 2013 22:28:59 +0000 (23:28 +0100)]
Split up tests into their different categories.

11 years agoGroup those tests a bit better, as some of the bd ones wanted a "ST" feature that...
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.

11 years agoFixed forward transitions in diffs.
Derick Rethans [Fri, 12 Apr 2013 10:24:14 +0000 (11:24 +0100)]
Fixed forward transitions in diffs.

11 years agoAlways reset those parameters.
Derick Rethans [Fri, 12 Apr 2013 10:23:49 +0000 (11:23 +0100)]
Always reset those parameters.

11 years agoFixed "Forward Transition" construction of DateTime objects.
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.

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
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)

11 years agoDon't check argument types for internal functions without type hinting
Dmitry Stogov [Thu, 28 Nov 2013 07:44:14 +0000 (11:44 +0400)]
Don't check argument types for internal functions without type hinting

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Wed, 27 Nov 2013 22:01:09 +0000 (22:01 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Wed, 27 Nov 2013 22:01:03 +0000 (22:01 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'bug53879' into PHP-5.4
Derick Rethans [Wed, 27 Nov 2013 22:00:53 +0000 (22:00 +0000)]
Merge branch 'bug53879' into PHP-5.4

11 years agoFixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
Derick Rethans [Wed, 27 Nov 2013 21:59:46 +0000 (21:59 +0000)]
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)

11 years agoFixed tests
Dmitry Stogov [Wed, 27 Nov 2013 17:04:00 +0000 (21:04 +0400)]
Fixed tests

11 years agoRemoved deprecated AI_SET_PTR()s
Dmitry Stogov [Wed, 27 Nov 2013 16:30:35 +0000 (20:30 +0400)]
Removed deprecated AI_SET_PTR()s

11 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
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)

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

11 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
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)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

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

11 years agoFixed bug #65969 (Chain assignment with T_LIST failure)
Dmitry Stogov [Wed, 27 Nov 2013 10:26:34 +0000 (14:26 +0400)]
Fixed bug #65969 (Chain assignment with T_LIST failure)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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)

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

11 years agoFixed bug #66060 (Heap buffer over-read in DateInterval)
Remi Collet [Wed, 27 Nov 2013 10:15:08 +0000 (11:15 +0100)]
Fixed bug #66060 (Heap buffer over-read in DateInterval)

11 years agoFixed bug #66060 (Heap buffer over-read in DateInterval)
Remi Collet [Wed, 27 Nov 2013 10:13:16 +0000 (11:13 +0100)]
Fixed bug #66060 (Heap buffer over-read in DateInterval)

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
Julien Pauli [Wed, 27 Nov 2013 09:32:05 +0000 (10:32 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

11 years ago5.5.8-dev now
Julien Pauli [Wed, 27 Nov 2013 08:34:40 +0000 (09:34 +0100)]
5.5.8-dev now

11 years agoMerge branch 'PHP-5.5' into PHP-5.6
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)

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

11 years ago5.4.24-dev now
Stanislav Malyshev [Wed, 27 Nov 2013 08:13:45 +0000 (00:13 -0800)]
5.4.24-dev now

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