]> granicus.if.org Git - php/log
projects / php / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
php
8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 3 Feb 2017 06:01:10 +0000 (06:01 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  increase wait time in timeout_variation_9.phpt by 1 second

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 3 Feb 2017 06:00:53 +0000 (06:00 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  increase wait time in timeout_variation_9.phpt by 1 second

8 years agoMerge branch 'pull-request/2359' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 3 Feb 2017 06:00:34 +0000 (06:00 +0000)]
Merge branch 'pull-request/2359' into PHP-7.0

* pull-request/2359:
  increase wait time in timeout_variation_9.phpt by 1 second

8 years agoincrease wait time in timeout_variation_9.phpt by 1 second
commit | commitdiff | tree
Rodrigo Prado [Wed, 1 Feb 2017 23:12:05 +0000 (21:12 -0200)]
increase wait time in timeout_variation_9.phpt by 1 second

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Fri, 3 Feb 2017 05:55:29 +0000 (05:55 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  increase wait time in timeout_variation_10.phpt by 1 second

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Fri, 3 Feb 2017 05:55:16 +0000 (05:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  increase wait time in timeout_variation_10.phpt by 1 second

8 years agoMerge branch 'pull-request/2360' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Fri, 3 Feb 2017 05:54:50 +0000 (05:54 +0000)]
Merge branch 'pull-request/2360' into PHP-7.0

* pull-request/2360:
  increase wait time in timeout_variation_10.phpt by 1 second

8 years agoincrease wait time in timeout_variation_10.phpt by 1 second
commit | commitdiff | tree
Rodrigo Prado [Wed, 1 Feb 2017 23:22:35 +0000 (15:22 -0800)]
increase wait time in timeout_variation_10.phpt by 1 second

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Thu, 2 Feb 2017 17:35:35 +0000 (18:35 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Thu, 2 Feb 2017 17:33:26 +0000 (18:33 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoBUG #73998: Numeric properties are not accessible from get_object_vars
commit | commitdiff | tree
Mitch Hagstrand [Tue, 31 Jan 2017 17:25:05 +0000 (09:25 -0800)]
BUG #73998: Numeric properties are not accessible from get_object_vars

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Thu, 2 Feb 2017 17:15:11 +0000 (18:15 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Thu, 2 Feb 2017 17:14:50 +0000 (18:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #74031
commit | commitdiff | tree
Matěj Humpál [Thu, 2 Feb 2017 09:24:00 +0000 (10:24 +0100)]
Fix bug #74031

Fix incorrect parameter count for imagepng function

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Nikita Popov [Thu, 2 Feb 2017 17:07:27 +0000 (18:07 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Nikita Popov [Thu, 2 Feb 2017 17:06:47 +0000 (18:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #73807
commit | commitdiff | tree
Nikita Popov [Thu, 2 Feb 2017 15:04:02 +0000 (16:04 +0100)]
Fix bug #73807

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 13:22:43 +0000 (14:22 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS

8 years ago[ci skip] update NEWS
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 13:21:31 +0000 (14:21 +0100)]
[ci skip] update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 13:20:53 +0000 (14:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

8 years ago[ci skip] update NEWS
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 13:19:35 +0000 (14:19 +0100)]
[ci skip] update NEWS

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 12:07:48 +0000 (13:07 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 12:06:31 +0000 (13:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.

8 years agoFixed #74022 PHP Fast CGI crashes when reading from a pfx file.
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 11:48:12 +0000 (12:48 +0100)]
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 00:36:29 +0000 (01:36 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  [ci skip] update NEWS
  update NEWS

8 years ago[ci skip] update NEWS
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 00:35:22 +0000 (01:35 +0100)]
[ci skip] update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 00:34:48 +0000 (01:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Thu, 2 Feb 2017 00:33:41 +0000 (01:33 +0100)]
update NEWS

8 years agoRemove obsolete version checks from tests
commit | commitdiff | tree
Nikita Popov [Wed, 1 Feb 2017 23:57:40 +0000 (00:57 +0100)]
Remove obsolete version checks from tests

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 19:07:07 +0000 (20:07 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  remove the reverted NEWS entry
  sync NEWS with the reverted stuff
  Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
  Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Wed, 1 Feb 2017 19:05:50 +0000 (19:05 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert "Inheritance checks should not ignore parents if these implement an interface"
  Revert "Added tests demonstrating the same effect with abstracts"

8 years agoremove the reverted NEWS entry
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 19:02:20 +0000 (20:02 +0100)]
remove the reverted NEWS entry

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 19:01:40 +0000 (20:01 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  sync NEWS with the reverted stuff
  Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
  Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"

8 years agosync NEWS with the reverted stuff
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 19:00:32 +0000 (20:00 +0100)]
sync NEWS with the reverted stuff

8 years agoRevert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 18:59:24 +0000 (19:59 +0100)]
Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"

This reverts commit 2fcf1259c6a9c1d70bcdfb96aeabc54c47e2a4a0.

8 years agoRevert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 18:59:18 +0000 (19:59 +0100)]
Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)"

This reverts commit 62938bf08806129b42b17e74d79a450c30d4ff30.

8 years agoRevert "Inheritance checks should not ignore parents if these implement an interface"
commit | commitdiff | tree
Joe Watkins [Wed, 1 Feb 2017 18:33:58 +0000 (18:33 +0000)]
Revert "Inheritance checks should not ignore parents if these implement an interface"

This reverts commit b67eb3440bb244adf6957bf2c68aeeaa6efc8c8d.

8 years agoRevert "Added tests demonstrating the same effect with abstracts"
commit | commitdiff | tree
Joe Watkins [Wed, 1 Feb 2017 18:33:47 +0000 (18:33 +0000)]
Revert "Added tests demonstrating the same effect with abstracts"

This reverts commit c11b2b809d349399c8f4b54c6bf24078dece455e.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Wed, 1 Feb 2017 14:38:12 +0000 (17:38 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  typo

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Dmitry Stogov [Wed, 1 Feb 2017 14:37:40 +0000 (17:37 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  typo

8 years agotypo
commit | commitdiff | tree
Dmitry Stogov [Wed, 1 Feb 2017 14:36:55 +0000 (17:36 +0300)]
typo

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Dmitry Stogov [Wed, 1 Feb 2017 13:06:17 +0000 (16:06 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fixed macro

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Dmitry Stogov [Wed, 1 Feb 2017 13:05:57 +0000 (16:05 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fixed macro

8 years agofixed macro
commit | commitdiff | tree
Dmitry Stogov [Wed, 1 Feb 2017 13:05:33 +0000 (16:05 +0300)]
fixed macro

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 12:46:50 +0000 (13:46 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix possible NULL dereference

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 12:45:45 +0000 (13:45 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix possible NULL dereference

8 years agofix possible NULL dereference
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 12:43:33 +0000 (13:43 +0100)]
fix possible NULL dereference

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:58:47 +0000 (12:58 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  remove unused var
  use zend_string API
  Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:57:02 +0000 (12:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  remove unused var
  use zend_string API
  Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed

8 years agoremove unused var
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:49:32 +0000 (12:49 +0100)]
remove unused var

8 years agouse zend_string API
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:45:19 +0000 (12:45 +0100)]
use zend_string API

8 years agoFixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:36:14 +0000 (12:36 +0100)]
Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed

8 years agofix test portability
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:18:55 +0000 (12:18 +0100)]
fix test portability

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:01:23 +0000 (12:01 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix test for 32bits (int -> float)
  fix test for 32bits (int -> float)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 11:00:39 +0000 (12:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test for 32bits (int -> float)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
commit | commitdiff | tree
Anatol Belski [Wed, 1 Feb 2017 10:59:44 +0000 (11:59 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test for 32bits (int -> float)

8 years agofix test for 32bits (int -> float)
commit | commitdiff | tree
Remi Collet [Wed, 1 Feb 2017 09:25:30 +0000 (10:25 +0100)]
fix test for 32bits (int -> float)

(cherry picked from commit 0f1ae93bfa2feb3d0fd0b8d3036148df8ef856e2)

8 years agofix test for 32bits (int -> float)
commit | commitdiff | tree
Remi Collet [Wed, 1 Feb 2017 09:25:30 +0000 (10:25 +0100)]
fix test for 32bits (int -> float)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Remi Collet [Wed, 1 Feb 2017 09:25:54 +0000 (10:25 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix test for 32bits (int -> float)

8 years agofix test for 32bits (int -> float)
commit | commitdiff | tree
Remi Collet [Wed, 1 Feb 2017 09:25:30 +0000 (10:25 +0100)]
fix test for 32bits (int -> float)

8 years agoRefactor HashContext into an object.
commit | commitdiff | tree
=?UTF-8?q?Rouven=20We=C3=9Fling?= [Tue, 27 Dec 2016 01:22:54 +0000 (17:22 -0800)]
Refactor HashContext into an object.

This allows better type hinting as well as potentially adding
methods in a followup diff.

Original patch by Rouven Weßling (github.com/realityking)
Heavily modified by Sara Golemon (github.com/sgolemon)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 17:29:47 +0000 (18:29 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add a primitive debug facility to sendmail

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 17:28:29 +0000 (18:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add a primitive debug facility to sendmail

8 years agoadd a primitive debug facility to sendmail
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 17:25:36 +0000 (18:25 +0100)]
add a primitive debug facility to sendmail

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 13:23:19 +0000 (14:23 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert "backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0"

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 13:22:30 +0000 (14:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0"

8 years agoRevert "backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0"
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 13:21:20 +0000 (14:21 +0100)]
Revert "backport 51e1da6ea1e663908302e162ced1b7a8cb5aee05 into 7.0"

This reverts commit 8da87563122e4d14208b2827fd6b2807578677ec.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Tue, 31 Jan 2017 12:51:47 +0000 (12:51 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  bump versions

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Tue, 31 Jan 2017 12:48:31 +0000 (12:48 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  bump versions for next in dev

8 years agobump versions
commit | commitdiff | tree
Joe Watkins [Tue, 31 Jan 2017 12:48:05 +0000 (12:48 +0000)]
bump versions

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 10:21:01 +0000 (11:21 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  bump versions for next in dev

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 10:20:10 +0000 (11:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  bump versions for next in dev

8 years agobump versions for next in dev
commit | commitdiff | tree
Anatol Belski [Tue, 31 Jan 2017 10:18:23 +0000 (11:18 +0100)]
bump versions for next in dev

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Tue, 31 Jan 2017 05:36:28 +0000 (05:36 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  removed additional ";" from run-tests.php

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Tue, 31 Jan 2017 05:36:16 +0000 (05:36 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  removed additional ";" from run-tests.php

8 years agoremoved additional ";" from run-tests.php
commit | commitdiff | tree
Rodrigo Prado [Mon, 30 Jan 2017 22:06:09 +0000 (20:06 -0200)]
removed additional ";" from run-tests.php

8 years agoRemove zend_version() checks from tests
commit | commitdiff | tree
Nikita Popov [Mon, 30 Jan 2017 21:33:17 +0000 (22:33 +0100)]
Remove zend_version() checks from tests

8 years agoRemove ZEND_CHANGES and README.namespaces
commit | commitdiff | tree
Nikita Popov [Mon, 30 Jan 2017 21:28:45 +0000 (22:28 +0100)]
Remove ZEND_CHANGES and README.namespaces

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 21:36:56 +0000 (22:36 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 21:35:46 +0000 (22:35 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 21:35:14 +0000 (22:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 21:34:14 +0000 (22:34 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Sara Golemon [Mon, 30 Jan 2017 17:03:01 +0000 (09:03 -0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Securely zero the hash context key

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Sara Golemon [Mon, 30 Jan 2017 17:02:42 +0000 (09:02 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Securely zero the hash context key

8 years agoSecurely zero the hash context key
commit | commitdiff | tree
Sara Golemon [Mon, 30 Jan 2017 16:57:17 +0000 (08:57 -0800)]
Securely zero the hash context key

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 11:47:29 +0000 (12:47 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73983 crash on finish work with phar in cli + opcache

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 11:46:11 +0000 (12:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73983 crash on finish work with phar in cli + opcache

8 years agoFixed bug #73983 crash on finish work with phar in cli + opcache
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 11:25:50 +0000 (12:25 +0100)]
Fixed bug #73983 crash on finish work with phar in cli + opcache

The file_cache_only option causes the storage to be per process,
furthermore the arena is destroyed per request. Thus, zend_string's
can't survive between request and the permanent flag should not
be set. This is already done with the file cache part, but the
persistency part is used in various scenarios and should respect
this case as well. In this particular bug, the pcre pattern cache
needs to survive between requests and uses pattern strings as hash
keys. One more case relevant here would be various situations where
the flow disables the use of shared memory.

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Joe Watkins [Mon, 30 Jan 2017 11:26:51 +0000 (11:26 +0000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Joe Watkins [Mon, 30 Jan 2017 11:26:37 +0000 (11:26 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)

8 years agoMerge branch 'pull-request/2348' into PHP-7.0
commit | commitdiff | tree
Joe Watkins [Mon, 30 Jan 2017 11:26:02 +0000 (11:26 +0000)]
Merge branch 'pull-request/2348' into PHP-7.0

* pull-request/2348:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)

8 years agofix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
commit | commitdiff | tree
jhdxr [Mon, 30 Jan 2017 09:48:00 +0000 (17:48 +0800)]
fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 10:42:46 +0000 (11:42 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  move id initialization into ctor

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 10:41:59 +0000 (11:41 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  move id initialization into ctor

8 years agomove id initialization into ctor
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 10:40:23 +0000 (11:40 +0100)]
move id initialization into ctor

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 00:59:02 +0000 (01:59 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix system id initialization for multiple threads

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 00:57:27 +0000 (01:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix system id initialization for multiple threads

8 years agofix system id initialization for multiple threads
commit | commitdiff | tree
Anatol Belski [Mon, 30 Jan 2017 00:54:36 +0000 (01:54 +0100)]
fix system id initialization for multiple threads

8 years agoMerge branch 'PHP-7.1'
commit | commitdiff | tree
Jakub Zelenka [Sun, 29 Jan 2017 20:46:20 +0000 (20:46 +0000)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
commit | commitdiff | tree
Jakub Zelenka [Sun, 29 Jan 2017 20:44:51 +0000 (20:44 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

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