]> granicus.if.org Git - php/log
php
9 years agoFix undefined symbol error when compiling with LLVM
Stanislav Malyshev [Sat, 17 Oct 2015 00:23:18 +0000 (17:23 -0700)]
Fix undefined symbol error when compiling with LLVM

Basically, LLVM in default mode treats inline in a way incompatible
with GCC in c89 mode, which leads to undefined symbol errors.
See more here: http://stackoverflow.com/questions/12844729/linking-error-for-inline-functions

9 years agoupdate NEWS and UPGRADING
Ferenc Kovacs [Fri, 16 Oct 2015 17:01:22 +0000 (19:01 +0200)]
update NEWS and UPGRADING

9 years agoMerge branch 'pr-1567'
Ferenc Kovacs [Fri, 16 Oct 2015 16:22:02 +0000 (18:22 +0200)]
Merge branch 'pr-1567'

* pr-1567:
  initialize *str
  calling getenv() without arguments should return the environment variables as an array

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 16 Oct 2015 15:45:55 +0000 (17:45 +0200)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70678 (PHP7 returns true when false is expected)
Felipe Pena [Sun, 11 Oct 2015 15:08:34 +0000 (12:08 -0300)]
Fixed bug #70678 (PHP7 returns true when false is expected)

Cherry-pick from master.

9 years agosync config.w32 with sha3 implementation
Anatol Belski [Fri, 16 Oct 2015 10:18:35 +0000 (12:18 +0200)]
sync config.w32 with sha3 implementation

9 years agoAdd missing NEWS entry, copyright notice, and vim settings
Sara Golemon [Fri, 16 Oct 2015 07:17:59 +0000 (00:17 -0700)]
Add missing NEWS entry, copyright notice, and vim settings

Should have gone with d244b54c67cc2725283b78d4bb128501ae7910d3

9 years agoImplement SHA3 hashing algorithm
Sara Golemon [Fri, 16 Oct 2015 02:13:04 +0000 (19:13 -0700)]
Implement SHA3 hashing algorithm

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 15 Oct 2015 20:14:55 +0000 (22:14 +0200)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70430
Nikita Popov [Mon, 12 Oct 2015 20:05:19 +0000 (22:05 +0200)]
Fixed bug #70430

9 years agoReindent zend_yytnamerr
Nikita Popov [Thu, 15 Oct 2015 19:23:29 +0000 (21:23 +0200)]
Reindent zend_yytnamerr

Separating this whitespace change from the next diff.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 15 Oct 2015 10:47:13 +0000 (18:47 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70715 (Segmentation fault inside soap client)
Xinchen Hui [Thu, 15 Oct 2015 10:46:57 +0000 (18:46 +0800)]
Fixed bug #70715 (Segmentation fault inside soap client)

9 years agoMerge branch 'PHP-7.0'
Sara Golemon [Thu, 15 Oct 2015 05:45:21 +0000 (22:45 -0700)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Scan through a range of ports in case 31338 is busy

9 years agoScan through a range of ports in case 31338 is busy
Sara Golemon [Thu, 15 Oct 2015 05:42:38 +0000 (22:42 -0700)]
Scan through a range of ports in case 31338 is busy

ext/standard/tests/network/ud4loop.phpt hardcodes port 31338.
If that fails to bind, try a few more (up to 31499) before giving up.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 15 Oct 2015 02:19:55 +0000 (10:19 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70709 (SOAP Client generates Segfault)
Xinchen Hui [Thu, 15 Oct 2015 02:19:43 +0000 (10:19 +0800)]
Fixed bug #70709 (SOAP Client generates Segfault)

9 years agoMerge branch 'PHP-7.0'
Ferenc Kovacs [Wed, 14 Oct 2015 22:55:52 +0000 (00:55 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  prepare for 5.6.15RC1

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 14 Oct 2015 22:54:59 +0000 (00:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  prepare for 5.6.15RC1

9 years agoprepare for 5.6.15RC1
Ferenc Kovacs [Wed, 14 Oct 2015 22:22:12 +0000 (00:22 +0200)]
prepare for 5.6.15RC1

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Wed, 14 Oct 2015 10:10:07 +0000 (12:10 +0200)]
Merge branch 'PHP-7.0'

9 years agoDo not create a fake Closure for real Closures
Bob Weinand [Wed, 14 Oct 2015 10:07:04 +0000 (12:07 +0200)]
Do not create a fake Closure for real Closures
That is solved by just returning the Closure as is, which is safe due to Closures being immutable objects

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 14 Oct 2015 02:31:57 +0000 (10:31 +0800)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'patch-1' of https://github.com/glensc/php-src into PHP-7.0
Xinchen Hui [Wed, 14 Oct 2015 02:31:07 +0000 (10:31 +0800)]
Merge branch 'patch-1' of https://github.com/glensc/php-src into PHP-7.0

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 14 Oct 2015 02:27:59 +0000 (10:27 +0800)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'move-reflection-tests' of https://github.com/Sobak/php-src
Xinchen Hui [Wed, 14 Oct 2015 02:27:37 +0000 (10:27 +0800)]
Merge branch 'move-reflection-tests' of https://github.com/Sobak/php-src

9 years agoMove the tests to proper place
Xinchen Hui [Wed, 14 Oct 2015 02:26:02 +0000 (10:26 +0800)]
Move the tests to proper place

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 14 Oct 2015 02:20:13 +0000 (10:20 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed Conditional jump or move depends on uninitialised value
Xinchen Hui [Wed, 14 Oct 2015 02:19:57 +0000 (10:19 +0800)]
Fixed Conditional jump or move depends on uninitialised value

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Tue, 13 Oct 2015 13:51:42 +0000 (15:51 +0200)]
Merge branch 'PHP-7.0'

9 years agoPrevent memcmp() result truncation
Bob Weinand [Tue, 13 Oct 2015 13:51:23 +0000 (15:51 +0200)]
Prevent memcmp() result truncation
This fixes reported issues with sapi/phpdbg/tests/watch_001.phpt

9 years agophpdbg test info_001.phpt was dependent on auto_globals_jit
Bob Weinand [Tue, 13 Oct 2015 12:40:29 +0000 (14:40 +0200)]
phpdbg test info_001.phpt was dependent on auto_globals_jit

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Tue, 13 Oct 2015 12:21:26 +0000 (15:21 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed incorrect "peak" memory consumption calculation.

9 years agoFixed incorrect "peak" memory consumption calculation.
Dmitry Stogov [Tue, 13 Oct 2015 12:20:17 +0000 (15:20 +0300)]
Fixed incorrect "peak" memory consumption calculation.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 13 Oct 2015 09:49:13 +0000 (11:49 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update UPGRADING

9 years agoupdate UPGRADING
Anatol Belski [Tue, 13 Oct 2015 09:45:34 +0000 (11:45 +0200)]
update UPGRADING

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 13 Oct 2015 09:41:18 +0000 (17:41 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70689 (Exception handler does not work as expected)
Xinchen Hui [Tue, 13 Oct 2015 09:40:58 +0000 (17:40 +0800)]
Fixed bug #70689 (Exception handler does not work as expected)

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Tue, 13 Oct 2015 09:30:14 +0000 (11:30 +0200)]
Merge branch 'PHP-7.0'

9 years agoFix on/off values in phpdbg lexer
Bob Weinand [Tue, 13 Oct 2015 09:29:51 +0000 (11:29 +0200)]
Fix on/off values in phpdbg lexer

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 13 Oct 2015 08:35:33 +0000 (10:35 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  prepare NEWS for next
  update libs_versions.txt

9 years agoprepare NEWS for next
Anatol Belski [Tue, 13 Oct 2015 08:34:30 +0000 (10:34 +0200)]
prepare NEWS for next

9 years agoupdate libs_versions.txt
Anatol Belski [Mon, 12 Oct 2015 18:42:19 +0000 (20:42 +0200)]
update libs_versions.txt

9 years agoinitialize *str
Ferenc Kovacs [Mon, 12 Oct 2015 19:36:21 +0000 (21:36 +0200)]
initialize *str

9 years agocalling getenv() without arguments should return the environment variables as an...
Ferenc Kovacs [Mon, 12 Oct 2015 19:24:19 +0000 (21:24 +0200)]
calling getenv() without arguments should return the environment variables as an array

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Mon, 12 Oct 2015 18:37:55 +0000 (20:37 +0200)]
Merge branch 'PHP-7.0'

9 years agoAdd more tests for closure binding
Nikita Popov [Fri, 9 Oct 2015 21:38:25 +0000 (23:38 +0200)]
Add more tests for closure binding

9 years agoForbid "fake" closure rebinding
Dmitry Stogov [Fri, 9 Oct 2015 16:41:15 +0000 (18:41 +0200)]
Forbid "fake" closure rebinding

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 12 Oct 2015 18:26:34 +0000 (20:26 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  increase API versions

9 years agoincrease API versions
Anatol Belski [Mon, 12 Oct 2015 18:17:22 +0000 (20:17 +0200)]
increase API versions

9 years ago- Fixed missing line-break
Felipe Pena [Mon, 12 Oct 2015 12:54:03 +0000 (09:54 -0300)]
- Fixed missing line-break

9 years agoMerge branch 'master' of git.php.net:php-src
Felipe Pena [Mon, 12 Oct 2015 12:07:49 +0000 (09:07 -0300)]
Merge branch 'master' of git.php.net:php-src

9 years ago- Revert change, no check is needed there
Felipe Pena [Mon, 12 Oct 2015 12:07:28 +0000 (09:07 -0300)]
- Revert change, no check is needed there

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 12 Oct 2015 09:29:07 +0000 (11:29 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fork test for ICU 56.1
  fork test for ICU-56.1
  fix test for ICU-56.1

9 years agofork test for ICU 56.1
Anatol Belski [Mon, 12 Oct 2015 09:20:51 +0000 (11:20 +0200)]
fork test for ICU 56.1

9 years agofork test for ICU-56.1
Anatol Belski [Mon, 12 Oct 2015 09:16:27 +0000 (11:16 +0200)]
fork test for ICU-56.1

9 years agofix test for ICU-56.1
Anatol Belski [Mon, 12 Oct 2015 09:10:04 +0000 (11:10 +0200)]
fix test for ICU-56.1

9 years agoMerge branch 'PHP-5.6'
Matteo Beccati [Mon, 12 Oct 2015 07:47:09 +0000 (09:47 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Matteo Beccati [Mon, 12 Oct 2015 07:47:02 +0000 (09:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test

9 years agofix test
Anatol Belski [Wed, 30 Sep 2015 10:18:32 +0000 (12:18 +0200)]
fix test

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 12 Oct 2015 02:44:45 +0000 (10:44 +0800)]
Merge branch 'PHP-7.0'

9 years agoDouble declaration
Xinchen Hui [Mon, 12 Oct 2015 02:42:04 +0000 (10:42 +0800)]
Double declaration

9 years ago- Fixed bug #70678 (PHP7 returns true when false is expected)
Felipe Pena [Sun, 11 Oct 2015 15:08:34 +0000 (12:08 -0300)]
- Fixed bug #70678 (PHP7 returns true when false is expected)

9 years ago- Fixed regression when calling func_get_args() from global scope
Felipe Pena [Sun, 11 Oct 2015 13:30:44 +0000 (10:30 -0300)]
- Fixed regression when calling func_get_args() from global scope

9 years agoMove ext/reflection tests into the proper directory
Sobak [Sun, 11 Oct 2015 06:41:21 +0000 (08:41 +0200)]
Move ext/reflection tests into the proper directory

9 years agofix ftok() export
Anatol Belski [Sat, 10 Oct 2015 16:59:22 +0000 (18:59 +0200)]
fix ftok() export

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Sat, 10 Oct 2015 16:39:47 +0000 (18:39 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix stack overflow

9 years agofix stack overflow
Anatol Belski [Tue, 22 Sep 2015 19:12:05 +0000 (21:12 +0200)]
fix stack overflow

9 years agoupdate UPGRADING
Anatol Belski [Sat, 10 Oct 2015 16:20:56 +0000 (18:20 +0200)]
update UPGRADING

9 years agoreplace typedef by an appropriate include
Anatol Belski [Sat, 10 Oct 2015 11:17:15 +0000 (13:17 +0200)]
replace typedef by an appropriate include

9 years agorename header
Anatol Belski [Fri, 25 Sep 2015 09:43:34 +0000 (11:43 +0200)]
rename header

9 years agofix macro name
Anatol Belski [Fri, 25 Sep 2015 09:37:43 +0000 (11:37 +0200)]
fix macro name

9 years agoenable ftok implementation
Anatol Belski [Tue, 22 Sep 2015 19:26:33 +0000 (21:26 +0200)]
enable ftok implementation

9 years agoinitial ftok() implementation for win32
Anatol Belski [Tue, 22 Sep 2015 19:13:37 +0000 (21:13 +0200)]
initial ftok() implementation for win32

9 years agofix stack overflow
Anatol Belski [Tue, 22 Sep 2015 19:12:05 +0000 (21:12 +0200)]
fix stack overflow

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Sat, 10 Oct 2015 15:26:12 +0000 (17:26 +0200)]
Merge branch 'PHP-7.0'

9 years agoGenerally run all tests in sapi folder by default
Bob Weinand [Sat, 10 Oct 2015 15:24:14 +0000 (17:24 +0200)]
Generally run all tests in sapi folder by default

Turned out that sapi/phpdbg actually wasn't explicitly included as sapi folders were individually selected

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sat, 10 Oct 2015 13:00:58 +0000 (15:00 +0200)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 10 Oct 2015 13:00:41 +0000 (15:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
Zend/zend_closures.c

9 years agoFixed bug #70685
Nikita Popov [Sat, 10 Oct 2015 12:54:14 +0000 (14:54 +0200)]
Fixed bug #70685

Doing a less intrusive variant of the PHP 7.0 fix for 5.6.

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sat, 10 Oct 2015 11:57:52 +0000 (13:57 +0200)]
Merge branch 'PHP-7.0'

9 years agoNormalize rebinding failures
Nikita Popov [Sat, 10 Oct 2015 11:39:26 +0000 (13:39 +0200)]
Normalize rebinding failures

Move all rebinding checks into one function to make sure they stay
in sync. Normalize return value to be NULL for all rebinding
failures, instead of returning an improperly bound closure in some
cases.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 9 Oct 2015 21:49:09 +0000 (23:49 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Implemented file_cache_fallback mechanism

9 years agoImplemented file_cache_fallback mechanism
Anatol Belski [Fri, 9 Oct 2015 21:07:10 +0000 (23:07 +0200)]
Implemented file_cache_fallback mechanism

which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switch to file_cache_only mode in the case a process
failed to map the shared segment at the required address. The
important small part of the SHM will still be mapped, which
allows information exchange between normal processes using SHM
and those using the fallback mechanism.

This is based on Dmitry's, Matt's and mine ideas. So many thanks for
support!

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 9 Oct 2015 21:30:34 +0000 (23:30 +0200)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Fri, 9 Oct 2015 21:28:58 +0000 (23:28 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoImprove previous fix
Nikita Popov [Fri, 9 Oct 2015 21:28:24 +0000 (23:28 +0200)]
Improve previous fix

Don't forbid null binding on plain functions.

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 9 Oct 2015 21:07:10 +0000 (23:07 +0200)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Fri, 9 Oct 2015 21:05:49 +0000 (23:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoFixed bug #70681
Nikita Popov [Fri, 9 Oct 2015 21:01:23 +0000 (23:01 +0200)]
Fixed bug #70681

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Fri, 9 Oct 2015 10:37:00 +0000 (12:37 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update NEWS
  update NEWS
  fix coverage report for datelib

9 years agoupdate NEWS
Anatol Belski [Fri, 9 Oct 2015 10:36:40 +0000 (12:36 +0200)]
update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 9 Oct 2015 10:35:48 +0000 (12:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  fix coverage report for datelib

9 years agoupdate NEWS
Anatol Belski [Fri, 9 Oct 2015 10:35:06 +0000 (12:35 +0200)]
update NEWS

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Fri, 9 Oct 2015 08:49:00 +0000 (11:49 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())

9 years agoFixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())
Dmitry Stogov [Fri, 9 Oct 2015 08:48:13 +0000 (11:48 +0300)]
Fixed bug #70630 (Closure::call/bind() crash with ReflectionFunction->getClosure())

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 8 Oct 2015 23:40:11 +0000 (02:40 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)

9 years agoFixed reference cuntmting for closures (previously we didn't increment reference...
Dmitry Stogov [Thu, 8 Oct 2015 23:39:07 +0000 (02:39 +0300)]
Fixed reference cuntmting for closures (previously we didn't increment reference counter for "internal" closures)

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 8 Oct 2015 23:38:47 +0000 (02:38 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed infinity recurion if we create closure on top of other closure.

9 years agoFixed infinity recurion if we create closure on top of other closure.
Dmitry Stogov [Thu, 8 Oct 2015 23:37:51 +0000 (02:37 +0300)]
Fixed infinity recurion if we create closure on top of other closure.