]> granicus.if.org Git - php/log
php
6 years agoAvoid double copying and string length recalculation
Dmitry Stogov [Tue, 6 Mar 2018 18:19:18 +0000 (21:19 +0300)]
Avoid double copying and string length recalculation

6 years ago[ci skip] Fix reference notation in protos
Christoph M. Becker [Tue, 6 Mar 2018 12:22:39 +0000 (13:22 +0100)]
[ci skip] Fix reference notation in protos

6 years ago[ci skip] Use float instead of double in proto
Gabriel Caruso [Mon, 26 Feb 2018 01:24:45 +0000 (22:24 -0300)]
[ci skip] Use float instead of double in proto

6 years agoFixed bug #76050
Dmitry Stogov [Tue, 6 Mar 2018 00:31:06 +0000 (03:31 +0300)]
Fixed bug #76050

6 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Tue, 6 Mar 2018 00:00:46 +0000 (03:00 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 5 Mar 2018 23:47:01 +0000 (02:47 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.

6 years agoReplaced usafe reference from SHM to process memory with SHM to SHM reference.
Dmitry Stogov [Mon, 5 Mar 2018 23:43:26 +0000 (02:43 +0300)]
Replaced usafe reference from SHM to process memory with SHM to SHM reference.

6 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 5 Mar 2018 22:02:31 +0000 (01:02 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 5 Mar 2018 22:00:14 +0000 (01:00 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.

6 years agoDon't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_...
Dmitry Stogov [Mon, 5 Mar 2018 21:56:16 +0000 (00:56 +0300)]
Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup().
Keeping pointer to a function in SHM is not safe because of ASLR.

6 years agoMerge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
Dmitry Stogov [Mon, 5 Mar 2018 21:47:40 +0000 (00:47 +0300)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:php-src:
  Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD

6 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 5 Mar 2018 21:47:05 +0000 (00:47 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed invalid destructor

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 5 Mar 2018 21:46:40 +0000 (00:46 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed invalid destructor

6 years agoFixed invalid destructor
Dmitry Stogov [Mon, 5 Mar 2018 21:46:19 +0000 (00:46 +0300)]
Fixed invalid destructor

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 5 Mar 2018 21:39:06 +0000 (22:39 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 5 Mar 2018 21:38:03 +0000 (22:38 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD

6 years agoFixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD
Anatol Belski [Mon, 5 Mar 2018 21:35:58 +0000 (22:35 +0100)]
Fixed bug #76044 'date: illegal option -- -' in ./configure on FreeBSD

6 years agoAST is not COPYABLE anymore and its reference-counter doesn't have to be initialized...
Dmitry Stogov [Mon, 5 Mar 2018 21:30:25 +0000 (00:30 +0300)]
AST is not COPYABLE anymore and its reference-counter doesn't have to be initialized by 2.

6 years agoSet and keep HASH_FLAG_STATIC_KEYS for all HashTables stored in SHM (or file cache).
Dmitry Stogov [Mon, 5 Mar 2018 21:00:13 +0000 (00:00 +0300)]
Set and keep HASH_FLAG_STATIC_KEYS for all HashTables stored in SHM (or file cache).

6 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 5 Mar 2018 20:38:15 +0000 (23:38 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed invalid destructor

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 5 Mar 2018 20:33:53 +0000 (23:33 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed invalid destructor

6 years agoFixed invalid destructor
Dmitry Stogov [Mon, 5 Mar 2018 20:33:08 +0000 (23:33 +0300)]
Fixed invalid destructor

6 years agoTypo
Dmitry Stogov [Mon, 5 Mar 2018 17:45:26 +0000 (20:45 +0300)]
Typo

6 years agoReverted e6d6fcedf71a658c49b7c2eb55305cf5970ec681 and overdesign introduced in ae64dd...
Dmitry Stogov [Mon, 5 Mar 2018 17:20:58 +0000 (20:20 +0300)]
Reverted e6d6fcedf71a658c49b7c2eb55305cf5970ec681 and overdesign introduced in ae64dd6d566de448d20232436e1aba25c611357c.
Now we have just indexex, pointers and linked list od unused buffers.

6 years agoFix incorrect GC_NUM2ADDR usage
Nikita Popov [Mon, 5 Mar 2018 15:29:46 +0000 (16:29 +0100)]
Fix incorrect GC_NUM2ADDR usage

Both first_unused and GC_MAX_UNCOMPRESSED are addresses, so we
should compare them directly.

6 years agoMerge branch 'PHP-7.2'
Nikita Popov [Mon, 5 Mar 2018 14:33:34 +0000 (15:33 +0100)]
Merge branch 'PHP-7.2'

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 5 Mar 2018 14:32:39 +0000 (15:32 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoRevert "Fixed bug #75961 (Strange references behavior)"
Nikita Popov [Mon, 5 Mar 2018 14:28:58 +0000 (15:28 +0100)]
Revert "Fixed bug #75961 (Strange references behavior)"

This reverts commit 94e9d0a2ae76bad712495d820d3962e401085fef.

This code needs to be mindful about modifications to the array
happening during callback execution. It was written in a way that
only accessed the reference, which is guaranteed not to move. The
changed implementation instead accesses the array slot, leading to
use-after-free.

Run ext/standard/tests/array/bug61967.phpt under valgrind to see
the issue.

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 5 Mar 2018 14:22:11 +0000 (15:22 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Include username into the file cache path

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 5 Mar 2018 14:21:31 +0000 (15:21 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Include username into the file cache path

6 years agoInclude username into the file cache path
Anatol Belski [Mon, 5 Mar 2018 14:16:55 +0000 (15:16 +0100)]
Include username into the file cache path

6 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 5 Mar 2018 13:21:20 +0000 (16:21 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed "opcache.file_cache_fallback" mode.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 5 Mar 2018 13:15:38 +0000 (16:15 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed "opcache.file_cache_fallback" mode.

6 years agoFixed "opcache.file_cache_fallback" mode.
Dmitry Stogov [Mon, 5 Mar 2018 13:01:43 +0000 (16:01 +0300)]
Fixed "opcache.file_cache_fallback" mode.

It's not safe to change value of ZCG(accel_directives).file_cache_only, becuse it might be altered by INI subsystem.
Use global variable instead.

6 years agoSeparate duplicated code into a zend_ini_parse_bool() function.
Dmitry Stogov [Mon, 5 Mar 2018 08:51:58 +0000 (11:51 +0300)]
Separate duplicated code into a zend_ini_parse_bool() function.

6 years agoFix empty value
Anatol Belski [Fri, 2 Mar 2018 22:10:02 +0000 (23:10 +0100)]
Fix empty value

6 years agoReflect native instruction set in snap filename
Anatol Belski [Fri, 2 Mar 2018 19:39:41 +0000 (20:39 +0100)]
Reflect native instruction set in snap filename

6 years agoAdd intrinsics info to configure output
Anatol Belski [Fri, 2 Mar 2018 17:11:49 +0000 (18:11 +0100)]
Add intrinsics info to configure output

6 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Fri, 2 Mar 2018 16:21:04 +0000 (17:21 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix #76041: null pointer access crashed php

6 years agoFix #76041: null pointer access crashed php
Christoph M. Becker [Fri, 2 Mar 2018 16:18:45 +0000 (17:18 +0100)]
Fix #76041: null pointer access crashed php

We must not draw anti-aliased lines on palette images, because that is
not supported by `gdImageSetAAPixelColor()` and it wouldn't make much
sense to support it, due to the limitation to at most 256 colors.

6 years agoSwitch to better GC address representation
Dmitry Stogov [Fri, 2 Mar 2018 14:36:18 +0000 (17:36 +0300)]
Switch to better GC address representation

6 years agoMake distinct between indexes/numbers, GC addresses and pointers to gc_root_buffers.
Dmitry Stogov [Fri, 2 Mar 2018 14:02:29 +0000 (17:02 +0300)]
Make distinct between indexes/numbers, GC addresses and pointers to gc_root_buffers.
Perform conversion through macros.

6 years agocorrect condition for leaks in run-tests.php
Joe Watkins [Fri, 2 Mar 2018 12:22:12 +0000 (13:22 +0100)]
correct condition for leaks in run-tests.php

6 years agoMerge branch 'master' of git://github.com/php/php-src
Joe Watkins [Fri, 2 Mar 2018 12:15:22 +0000 (13:15 +0100)]
Merge branch 'master' of git://github.com/php/php-src

6 years agoadd ability to show valgrind output with --show-mem
Joe Watkins [Fri, 2 Mar 2018 12:14:35 +0000 (13:14 +0100)]
add ability to show valgrind output with --show-mem

6 years agoGC API cleanup
Dmitry Stogov [Fri, 2 Mar 2018 08:02:21 +0000 (11:02 +0300)]
GC API cleanup

6 years agoAdded NEWS entry
Dmitry Stogov [Fri, 2 Mar 2018 07:17:49 +0000 (10:17 +0300)]
Added NEWS entry

6 years agoMerge branch 'gc-buffer-dynamic4'
Dmitry Stogov [Fri, 2 Mar 2018 07:16:08 +0000 (10:16 +0300)]
Merge branch 'gc-buffer-dynamic4'

* gc-buffer-dynamic4:
  Switch to siple "commpression" scheme
  micro-optimization
  Cleanup
  Tunning for fast paths
  Cleanup
  Improve GC color checks
  Implemented simple adaptive GC threshold selection.
  GC improvement

6 years agoSwitch to siple "commpression" scheme
Dmitry Stogov [Fri, 2 Mar 2018 07:01:08 +0000 (10:01 +0300)]
Switch to siple "commpression" scheme

6 years agoCombines common codes
Xinchen Hui [Fri, 2 Mar 2018 02:32:15 +0000 (10:32 +0800)]
Combines common codes

6 years agomicro-optimization
Dmitry Stogov [Thu, 1 Mar 2018 22:53:59 +0000 (01:53 +0300)]
micro-optimization

6 years agoCleanup
Dmitry Stogov [Thu, 1 Mar 2018 22:42:42 +0000 (01:42 +0300)]
Cleanup

6 years agoGet rid of casts
Anatol Belski [Thu, 1 Mar 2018 19:52:09 +0000 (20:52 +0100)]
Get rid of casts

6 years agoTunning for fast paths
Dmitry Stogov [Thu, 1 Mar 2018 14:38:32 +0000 (17:38 +0300)]
Tunning for fast paths

6 years agoImprove help message
Anatol Belski [Thu, 1 Mar 2018 12:04:19 +0000 (13:04 +0100)]
Improve help message

6 years agoCleanup
Dmitry Stogov [Thu, 1 Mar 2018 12:51:50 +0000 (15:51 +0300)]
Cleanup

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 1 Mar 2018 11:15:20 +0000 (12:15 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Remove TSRMLS_*

6 years agoRemove TSRMLS_*
Anatol Belski [Thu, 1 Mar 2018 11:12:11 +0000 (12:12 +0100)]
Remove TSRMLS_*

6 years agoAttempt to fix build with gcc-4.8
Xinchen Hui [Thu, 1 Mar 2018 10:34:39 +0000 (18:34 +0800)]
Attempt to fix build with gcc-4.8

6 years agoImprove GC color checks
Dmitry Stogov [Thu, 1 Mar 2018 08:55:26 +0000 (11:55 +0300)]
Improve GC color checks

6 years agoImplemented simple adaptive GC threshold selection.
Dmitry Stogov [Thu, 1 Mar 2018 08:04:28 +0000 (11:04 +0300)]
Implemented simple adaptive GC threshold selection.

6 years agoAttempt to fix build again
Xinchen Hui [Thu, 1 Mar 2018 07:05:50 +0000 (15:05 +0800)]
Attempt to fix build again

seems if a cpu supports avx2 but not ssse3, the build will fail. but how
could that possible... :<

6 years agoAttempt to fix build reported fails in containers
Xinchen Hui [Thu, 1 Mar 2018 03:22:26 +0000 (11:22 +0800)]
Attempt to fix build reported fails in containers

6 years agoGC improvement
Dmitry Stogov [Thu, 1 Mar 2018 00:17:21 +0000 (03:17 +0300)]
GC improvement

6 years agoMerge branch 'PHP-7.2'
Joe Watkins [Wed, 28 Feb 2018 11:23:38 +0000 (12:23 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  fix news date

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Wed, 28 Feb 2018 11:23:08 +0000 (12:23 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  fix news date

6 years agofix news date
Joe Watkins [Wed, 28 Feb 2018 11:10:58 +0000 (12:10 +0100)]
fix news date

6 years agoTunning for new GC_TYPE_INFO layout
Dmitry Stogov [Wed, 28 Feb 2018 10:25:29 +0000 (13:25 +0300)]
Tunning for new GC_TYPE_INFO layout

6 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Wed, 28 Feb 2018 10:07:15 +0000 (18:07 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Fixed bug #76025 (Segfault while throwing exception in error_handler).

6 years agoUpdate NEWS
Xinchen Hui [Wed, 28 Feb 2018 10:07:05 +0000 (18:07 +0800)]
Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Wed, 28 Feb 2018 10:06:49 +0000 (18:06 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #76025 (Segfault while throwing exception in error_handler).

6 years agoFixed bug #76025 (Segfault while throwing exception in error_handler).
Xinchen Hui [Wed, 28 Feb 2018 10:06:37 +0000 (18:06 +0800)]
Fixed bug #76025 (Segfault while throwing exception in error_handler).

6 years agotypo
Dmitry Stogov [Wed, 28 Feb 2018 07:16:51 +0000 (10:16 +0300)]
typo

6 years agoMerge branch 'PHP-7.2'
George Wang [Wed, 28 Feb 2018 04:34:01 +0000 (23:34 -0500)]
Merge branch 'PHP-7.2'

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
George Wang [Wed, 28 Feb 2018 04:33:36 +0000 (23:33 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agorevert last change, for PHP7 no need to do strlen() + 1 for hash look up.
George Wang [Wed, 28 Feb 2018 04:31:43 +0000 (23:31 -0500)]
revert last change, for PHP7 no need to do strlen() + 1 for hash look up.

6 years agoMerge branch 'PHP-7.2'
George Wang [Wed, 28 Feb 2018 04:21:32 +0000 (23:21 -0500)]
Merge branch 'PHP-7.2'

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
George Wang [Wed, 28 Feb 2018 04:21:04 +0000 (23:21 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years ago[BUGFIX] calling php_ini_activate_per_host_config() with correct name length.
George Wang [Wed, 28 Feb 2018 04:18:51 +0000 (23:18 -0500)]
[BUGFIX] calling php_ini_activate_per_host_config() with correct name length.

6 years agoMerge remote-tracking branch 'origin/PHP-7.2'
Bob Weinand [Wed, 28 Feb 2018 01:36:18 +0000 (02:36 +0100)]
Merge remote-tracking branch 'origin/PHP-7.2'

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Wed, 28 Feb 2018 01:35:44 +0000 (02:35 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix pcntl build on mac
Bob Weinand [Wed, 28 Feb 2018 01:13:28 +0000 (02:13 +0100)]
Fix pcntl build on mac

Apparently on mac WIF*(x) macros resolve to (*(int*)&x) (_W_INT macro in sys/wait.h), forcing the value to be a lvalue

6 years agoFixed build (extern php_stripslashes)
Bob Weinand [Wed, 28 Feb 2018 00:47:29 +0000 (01:47 +0100)]
Fixed build (extern php_stripslashes)

6 years agoSimplify GC_FLAGS cand CG_INFO checks
Dmitry Stogov [Tue, 27 Feb 2018 23:36:50 +0000 (02:36 +0300)]
Simplify GC_FLAGS cand CG_INFO checks

6 years agoMerge branch 'PHP-7.2'
Ferenc Kovacs [Tue, 27 Feb 2018 23:08:14 +0000 (00:08 +0100)]
Merge branch 'PHP-7.2'

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 27 Feb 2018 23:05:10 +0000 (00:05 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 27 Feb 2018 23:02:48 +0000 (00:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

6 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 27 Feb 2018 23:00:12 +0000 (00:00 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

6 years ago5.6.35 is next
Ferenc Kovacs [Tue, 27 Feb 2018 22:57:06 +0000 (23:57 +0100)]
5.6.35 is next

6 years agoChange CG_TYPE_INFO() layout to provide more room for GC_INFO()
Dmitry Stogov [Tue, 27 Feb 2018 21:53:30 +0000 (00:53 +0300)]
Change CG_TYPE_INFO() layout to provide more room for GC_INFO()

6 years agoUse macros to update specific parts of GC_TYPE_INFO() (direct assignments to GC_TYPE...
Dmitry Stogov [Tue, 27 Feb 2018 21:52:12 +0000 (00:52 +0300)]
Use macros to update specific parts of GC_TYPE_INFO() (direct assignments to GC_TYPE(), GC_FLAGS() and GC_INFO() are prohibited)

6 years agoConstify readonly var
Anatol Belski [Tue, 27 Feb 2018 19:50:37 +0000 (20:50 +0100)]
Constify readonly var

6 years agoMerge branch 'PHP-7.2'
George Wang [Tue, 27 Feb 2018 18:57:06 +0000 (13:57 -0500)]
Merge branch 'PHP-7.2'

Conflicts:
sapi/litespeed/lsapi_main.c

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
George Wang [Tue, 27 Feb 2018 18:56:19 +0000 (13:56 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agorelease LiteSpeed SAPI 7.0.
George Wang [Tue, 27 Feb 2018 18:54:28 +0000 (13:54 -0500)]
release LiteSpeed SAPI 7.0.
add CRIU support.
add support for [PATH=] and [HOST=] sections in php.ini

6 years agoCompletely hide GC implementation details into zend_gc.c
Dmitry Stogov [Mon, 26 Feb 2018 09:49:58 +0000 (12:49 +0300)]
Completely hide GC implementation details into zend_gc.c

6 years agoRevert "[ci skip] Add missing return types to protos"
Christoph M. Becker [Tue, 27 Feb 2018 16:40:03 +0000 (17:40 +0100)]
Revert "[ci skip] Add missing return types to protos"

This reverts commit a2c7c46d5ef5b9fc945d7b655d31d5c9f1a72d34.

Since apparently there have been some mistakes in this commit, and it's
not clear yet how to solve them, we're reverting for now.

6 years agoGet rid of IS_OBJ_USE_GUARDS and IS_OBJ_HAS_GUARDS flags
Dmitry Stogov [Tue, 27 Feb 2018 14:38:56 +0000 (17:38 +0300)]
Get rid of IS_OBJ_USE_GUARDS and IS_OBJ_HAS_GUARDS flags

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 27 Feb 2018 10:51:40 +0000 (11:51 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  7.0.29 next

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 27 Feb 2018 10:51:10 +0000 (11:51 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  7.0.29 next