granicus.if.org Git

]> granicus.if.org Git - php/log

Remi Collet [Mon, 12 Dec 2016 15:27:37 +0000 (16:27 +0100)]

Minor fix macro value

[] results in /**/ which can break some test
e.g. https://github.com/m6w6/ext-http/commit/d9ba7726f77858e626d67d758a87c9caa6f38d2b

commit | commitdiff | tree

Remi Collet [Mon, 12 Dec 2016 15:26:48 +0000 (16:26 +0100)]

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

* 'master' of git.php.net:/php-src: (165 commits)
  Add missing NEWS entry
  Increased number of reserved resources (from 4 to 6)
  Fixed compilation error
  Improved VM stack unwinding on exception. Now zend_throw_exception_hook() is going to be called only when exception is actually thrown and not going to be recalled for each unwinded finction.
  better way to get ACP
  adapt patch for 7.1
  fix datatype for zpp, yet a followup on bug #73679
  Update to SQLite 3.15.2
  update NEWS
  update NEWS
  improve fix for bug #73679 with new capabilities available
  Fixed bug #73679 DOTNET read access violation using invalid codepage
  Fix T_NUM_STRING negation
  fix leaking streams and memory mapped files
  extend errno mapping
  Fixed tests
  Update NEWS
  Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
  Revert "Refix bug #73686"
  Refix bug #73686
  ...

commit | commitdiff | tree

Christoph M. Becker [Mon, 12 Dec 2016 11:31:09 +0000 (12:31 +0100)]

Add missing NEWS entry

commit | commitdiff | tree

Dmitry Stogov [Mon, 12 Dec 2016 08:51:12 +0000 (11:51 +0300)]

Increased number of reserved resources (from 4 to 6)

commit | commitdiff | tree

Dmitry Stogov [Mon, 12 Dec 2016 08:19:04 +0000 (11:19 +0300)]

Fixed compilation error

commit | commitdiff | tree

Dmitry Stogov [Mon, 12 Dec 2016 07:55:32 +0000 (10:55 +0300)]

Improved VM stack unwinding on exception.
Now zend_throw_exception_hook() is going to be called only when exception is actually thrown and not going to be recalled for each unwinded finction.

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:57:31 +0000 (01:57 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
better way to get ACP

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:56:44 +0000 (01:56 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
better way to get ACP

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:54:22 +0000 (01:54 +0100)]

better way to get ACP

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:51:17 +0000 (01:51 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
adapt patch for 7.1

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:50:15 +0000 (01:50 +0100)]

adapt patch for 7.1

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:29:59 +0000 (01:29 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix datatype for zpp, yet a followup on bug #73679

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:29:23 +0000 (01:29 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix datatype for zpp, yet a followup on bug #73679

commit | commitdiff | tree

Anatol Belski [Mon, 12 Dec 2016 00:26:06 +0000 (01:26 +0100)]

fix datatype for zpp, yet a followup on bug #73679

commit | commitdiff | tree

Christoph M. Becker [Sun, 11 Dec 2016 17:48:05 +0000 (18:48 +0100)]

Update to SQLite 3.15.2

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:40:54 +0000 (17:40 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:40:22 +0000 (17:40 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:39:54 +0000 (17:39 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:39:08 +0000 (17:39 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:27:11 +0000 (17:27 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
improve fix for bug #73679 with new capabilities available

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:25:48 +0000 (17:25 +0100)]

improve fix for bug #73679 with new capabilities available

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:09:04 +0000 (17:09 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73679 DOTNET read access violation using invalid codepage

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:07:57 +0000 (17:07 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73679 DOTNET read access violation using invalid codepage

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 16:06:55 +0000 (17:06 +0100)]

Fixed bug #73679 DOTNET read access violation using invalid codepage

commit | commitdiff | tree

Nikita Popov [Sun, 11 Dec 2016 12:34:28 +0000 (13:34 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Sun, 11 Dec 2016 12:31:37 +0000 (13:31 +0100)]

Fix T_NUM_STRING negation

T_NUM_STRING follows the rules of symtable numeric string
conversion. If the offset isn't an integer under those rules, it
is treated as a string. This should apply to negated T_NUM_STRINGs
as well.

commit | commitdiff | tree

Anatol Belski [Sun, 11 Dec 2016 01:52:02 +0000 (02:52 +0100)]

fix leaking streams and memory mapped files

commit | commitdiff | tree

Anatol Belski [Sat, 10 Dec 2016 10:18:34 +0000 (11:18 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
extend errno mapping

commit | commitdiff | tree

Anatol Belski [Sat, 10 Dec 2016 10:17:07 +0000 (11:17 +0100)]

extend errno mapping

commit | commitdiff | tree

Xinchen Hui [Sat, 10 Dec 2016 08:43:38 +0000 (16:43 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed tests

commit | commitdiff | tree

Xinchen Hui [Sat, 10 Dec 2016 08:43:17 +0000 (16:43 +0800)]

Fixed tests

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 14:39:51 +0000 (22:39 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Update NEWS

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 14:39:42 +0000 (22:39 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 14:30:41 +0000 (22:30 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
Revert "Refix bug #73686"

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 14:30:24 +0000 (22:30 +0800)]

Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 14:22:59 +0000 (22:22 +0800)]

Revert "Refix bug #73686"

This reverts commit 4589386026dbf15d980ba0c7c92dc587cead15e8.

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 08:43:45 +0000 (16:43 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Refix bug #73686

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 08:37:22 +0000 (16:37 +0800)]

Refix bug #73686

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 07:56:41 +0000 (15:56 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73646 (mb_ereg_search_init null pointer dereference)

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 07:55:07 +0000 (15:55 +0800)]

Fixed bug #73646 (mb_ereg_search_init null pointer dereference)

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 03:42:11 +0000 (11:42 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 03:41:26 +0000 (11:41 +0800)]

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

* 'PHP-7.1' of git.php.net:/php-src:
fix uninitialized member

commit | commitdiff | tree

Xinchen Hui [Fri, 9 Dec 2016 03:41:08 +0000 (11:41 +0800)]

Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)

commit | commitdiff | tree

Anatol Belski [Thu, 8 Dec 2016 16:18:06 +0000 (17:18 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix uninitialized member

commit | commitdiff | tree

Anatol Belski [Thu, 8 Dec 2016 16:16:48 +0000 (17:16 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix uninitialized member

commit | commitdiff | tree

Anatol Belski [Thu, 8 Dec 2016 16:15:06 +0000 (17:15 +0100)]

fix uninitialized member

commit | commitdiff | tree

Xinchen Hui [Thu, 8 Dec 2016 14:05:17 +0000 (22:05 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed possible false assertion failure

commit | commitdiff | tree

Xinchen Hui [Thu, 8 Dec 2016 14:04:43 +0000 (22:04 +0800)]

Fixed possible false assertion failure

commit | commitdiff | tree

Dmitry Stogov [Thu, 8 Dec 2016 10:37:57 +0000 (13:37 +0300)]

Regenerated zend_vm_execute.h (fixed white spaces)

commit | commitdiff | tree

Ferenc Kovacs [Thu, 8 Dec 2016 06:12:07 +0000 (07:12 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Ferenc Kovacs [Thu, 8 Dec 2016 06:11:11 +0000 (07:11 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Ferenc Kovacs [Thu, 8 Dec 2016 06:09:41 +0000 (07:09 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Ferenc Kovacs [Thu, 8 Dec 2016 06:05:32 +0000 (07:05 +0100)]

update NEWS

commit | commitdiff | tree

Kalle Sommer Nielsen [Thu, 8 Dec 2016 02:50:31 +0000 (03:50 +0100)]

Disable C4101 warnings entirely on Windows

commit | commitdiff | tree

Anatol Belski [Thu, 8 Dec 2016 02:25:40 +0000 (03:25 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
git clean section

commit | commitdiff | tree

Anatol Belski [Thu, 8 Dec 2016 02:24:59 +0000 (03:24 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
git clean section

commit | commitdiff | tree

Anatol Belski [Thu, 8 Dec 2016 02:24:18 +0000 (03:24 +0100)]

git clean section

commit | commitdiff | tree

Nikita Popov [Wed, 7 Dec 2016 22:15:02 +0000 (23:15 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Wed, 7 Dec 2016 22:12:13 +0000 (23:12 +0100)]

Fix propagation of QM_ASSIGN into VERIFY_RETURN_TYPE

VERIFY_RETURN_TYPE uses different formats for the CONST/non-CONST
cases. If we progate a CONST operand into op1, op1 should be
moved to result.

commit | commitdiff | tree

Adam Baratz [Wed, 7 Dec 2016 22:10:36 +0000 (17:10 -0500)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Remove noop param hook
Clean up tabs and whitespace

commit | commitdiff | tree

Adam Baratz [Wed, 7 Dec 2016 22:02:50 +0000 (17:02 -0500)]

Remove noop param hook

commit | commitdiff | tree

Adam Baratz [Wed, 7 Dec 2016 22:01:37 +0000 (17:01 -0500)]

Clean up tabs and whitespace

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 20:24:56 +0000 (21:24 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 20:24:16 +0000 (21:24 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 20:23:37 +0000 (21:23 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 20:22:34 +0000 (21:22 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 20:18:42 +0000 (21:18 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 20:07:14 +0000 (21:07 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement

commit | commitdiff | tree

Dorin Marcoci [Wed, 7 Dec 2016 20:06:11 +0000 (21:06 +0100)]

Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement

commit | commitdiff | tree

Johannes Schlüter [Wed, 7 Dec 2016 16:50:40 +0000 (17:50 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Johannes Schlüter [Wed, 7 Dec 2016 16:50:05 +0000 (17:50 +0100)]

Install ext/json headers

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 15:05:43 +0000 (16:05 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix test compat with MySQL 5.7

commit | commitdiff | tree

Anatol Belski [Wed, 7 Dec 2016 15:04:47 +0000 (16:04 +0100)]

fix test compat with MySQL 5.7

commit | commitdiff | tree

Christoph M. Becker [Wed, 7 Dec 2016 12:50:11 +0000 (13:50 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Christoph M. Becker [Wed, 7 Dec 2016 12:45:18 +0000 (13:45 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Markus Staab [Mon, 5 Dec 2016 19:57:03 +0000 (20:57 +0100)]

Fixed typo in skipif error message

commit | commitdiff | tree

Dmitry Stogov [Wed, 7 Dec 2016 12:13:00 +0000 (15:13 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Check if PHP is in execution state.

commit | commitdiff | tree

Dmitry Stogov [Wed, 7 Dec 2016 12:12:48 +0000 (15:12 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Check if PHP is in execution state.

commit | commitdiff | tree

Dmitry Stogov [Wed, 7 Dec 2016 12:10:59 +0000 (15:10 +0300)]

Check if PHP is in execution state.

commit | commitdiff | tree

Dmitry Stogov [Wed, 7 Dec 2016 11:20:43 +0000 (14:20 +0300)]

Fixed memory leaks caused by exceptions thrown from destructors (fixed test).

commit | commitdiff | tree

Dmitry Stogov [Tue, 6 Dec 2016 22:43:13 +0000 (01:43 +0300)]

Fixed memory leaks caused by exceptions thrown from destructors (one more case).

commit | commitdiff | tree

Dmitry Stogov [Tue, 6 Dec 2016 21:41:07 +0000 (00:41 +0300)]

Fixed memory leaks caused by exceptions thrown from destructors.

commit | commitdiff | tree

Nikita Popov [Tue, 6 Dec 2016 21:26:36 +0000 (22:26 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Tue, 6 Dec 2016 21:25:35 +0000 (22:25 +0100)]

Fix bug #73668

Not bothering to implement special handling to get an accurate
range for this case.

commit | commitdiff | tree

Nikita Popov [Tue, 6 Dec 2016 21:12:01 +0000 (22:12 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Tue, 6 Dec 2016 21:09:44 +0000 (22:09 +0100)]

Factor out common binary op code in range inference

Instead of repeating the same code for binary ops and their
compound assignment variants, factor the range computation out
into a separate function.

commit | commitdiff | tree

Anatol Belski [Tue, 6 Dec 2016 19:27:54 +0000 (20:27 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 6 Dec 2016 19:26:40 +0000 (20:26 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 6 Dec 2016 19:25:27 +0000 (20:25 +0100)]

update NEWS

commit | commitdiff | tree

Bob Weinand [Tue, 6 Dec 2016 17:30:50 +0000 (18:30 +0100)]

Merge branch 'PHP-7.1'