]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 11 Jan 2018 16:50:27 +0000 (19:50 +0300)]
Reorder zend_op_array fields for better data locality and packing
Dmitry Stogov [Thu, 11 Jan 2018 16:15:52 +0000 (19:15 +0300)]
Get rid of zend_op_array.early_binding
Dmitry Stogov [Thu, 11 Jan 2018 14:27:26 +0000 (17:27 +0300)]
Revert "Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse." (this patch is incomplete or wrong)
This reverts commit
781e1573afdc7c336b3577ceabc9c65cafea17e8 .
Anatol Belski [Thu, 11 Jan 2018 13:34:28 +0000 (14:34 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix test for libtidy 5.6.0
Anatol Belski [Thu, 11 Jan 2018 13:33:59 +0000 (14:33 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix test for libtidy 5.6.0
Anatol Belski [Thu, 11 Jan 2018 13:28:09 +0000 (14:28 +0100)]
Fix test for libtidy 5.6.0
libtidy 5.6.0 remove the language option from the library, it is only
supported on cli. Prior to that, this option was not used in the
library. Thus, exclude the option presence from test.
Dmitry Stogov [Thu, 11 Jan 2018 13:25:28 +0000 (16:25 +0300)]
Use ZEND_CLOSURE_OBJECT() macro to resolve closure op_array to closure object through address calculation, instead of op_array->prototype reuse.
Christoph M. Becker [Thu, 11 Jan 2018 12:14:37 +0000 (13:14 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #75799 (arg of get_defined_functions is optional)
Christoph M. Becker [Thu, 11 Jan 2018 12:12:19 +0000 (13:12 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75799 (arg of get_defined_functions is optional)
Gabriel Caruso [Wed, 10 Jan 2018 21:49:13 +0000 (19:49 -0200)]
Fixed bug #75799 (arg of get_defined_functions is optional)
Anatol Belski [Thu, 11 Jan 2018 11:40:01 +0000 (12:40 +0100)]
Revert "Add possibility to lower timer resolution"
This reverts commit
c3717d9aecbe65cb2e5778a24a91e9eaf638639e .
The final mitigation of the consequences with spectre should be
discussed more also with the regard to the happenings on the
developments. Right now a preliminary mitigation might be wrong or
suboptimal, thus reverting this.
Dmitry Stogov [Thu, 11 Jan 2018 09:15:34 +0000 (12:15 +0300)]
Avoid, most offten unnecessary, memory load.
Anatol Belski [Wed, 10 Jan 2018 16:50:09 +0000 (17:50 +0100)]
Add possibility to lower timer resolution
The recently discovered security flaw Spectre requires a high resolution
timer. To the today's knowledge, PHP can't be used to create an attack for
this flaw. Still some concerns were raised, that there might be impact in
shared hosting environments. This patch adds a possibility to reduce the
timer resolution by an ini setting, thus giving administrators full
control. Especially, as the flaw was also demonstrated by an abuse of
the JS engine in a browser, Firefox reduced several time sources to 20us.
Any programming language, that doesn't compile to JIT, won't be able to
produce an attack vector for Meltdown and Spectre, at least by todays
knowledge. There are also other factors that say that the security
concern on the hrtime feature is to the big part not justified, still we
aim JIT in the future. Thus, adding a possibility to control the timer
resolution is a good and small enough tradeoff for safety and future.
Dmitry Stogov [Wed, 10 Jan 2018 16:14:52 +0000 (19:14 +0300)]
Mark FETCH_OBJ_R and INIT_METHOD_CALL as HOT_OBJ for (UNUSED+CONST and CV+CONST)
Dmitry Stogov [Wed, 10 Jan 2018 16:00:38 +0000 (19:00 +0300)]
Added abiliy to mark object specific handlers with most often used operand types as HOT. (UNUSED+CONST and CV+CONST)
Dmitry Stogov [Wed, 10 Jan 2018 12:12:03 +0000 (15:12 +0300)]
Convert "sparse switch" statements into sequences of "if" with the most probable conditions first
Dmitry Stogov [Wed, 10 Jan 2018 11:23:43 +0000 (14:23 +0300)]
Strength reduction
Dmitry Stogov [Wed, 10 Jan 2018 11:11:23 +0000 (14:11 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
minor optimize on strstr
Xinchen Hui [Wed, 10 Jan 2018 10:24:03 +0000 (18:24 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
cleanup
Xinchen Hui [Wed, 10 Jan 2018 10:22:59 +0000 (18:22 +0800)]
minor optimize on strstr
Dmitry Stogov [Wed, 10 Jan 2018 09:37:13 +0000 (12:37 +0300)]
Added expectation
Dmitry Stogov [Wed, 10 Jan 2018 09:03:04 +0000 (12:03 +0300)]
cleanup
Dmitry Stogov [Wed, 10 Jan 2018 07:15:55 +0000 (10:15 +0300)]
Remove HashTable holes in functions and class tables.
Dmitry Stogov [Tue, 9 Jan 2018 23:22:07 +0000 (02:22 +0300)]
Fixed whitespaces
Dmitry Stogov [Tue, 9 Jan 2018 20:17:10 +0000 (23:17 +0300)]
Removed unused array
Nikita Popov [Tue, 9 Jan 2018 19:25:19 +0000 (20:25 +0100)]
Merge branch 'PHP-7.2'
Nikita Popov [Tue, 9 Jan 2018 19:24:25 +0000 (20:24 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 9 Jan 2018 19:20:31 +0000 (20:20 +0100)]
Fixed bug #75786
SEND_UNPACK on iterators was duplicating references in-place,
which effectively leaks the original value and causes an off-by-one
refcount on the duplicated value.
Replace this with a deref, as an actual duplication is not even
needed in this case.
Nikita Popov [Tue, 9 Jan 2018 17:44:44 +0000 (18:44 +0100)]
Merge branch 'PHP-7.2'
Nikita Popov [Tue, 9 Jan 2018 17:44:20 +0000 (18:44 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 16 Dec 2017 20:11:40 +0000 (21:11 +0100)]
Backport narrowing fix to 7.1
This is a cherry-pick of
8a4532319dfae83ff16b2d2bbfeed062924c3c27 .
Dmitry Stogov [Tue, 9 Jan 2018 12:08:18 +0000 (15:08 +0300)]
Allow commas in specializer conditions
Xinchen Hui [Tue, 9 Jan 2018 08:23:38 +0000 (16:23 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Update NEWS
Fixed bug #75781 (substr_count incorrect result)
Xinchen Hui [Tue, 9 Jan 2018 08:23:26 +0000 (16:23 +0800)]
Update NEWS
Xinchen Hui [Tue, 9 Jan 2018 08:21:13 +0000 (16:21 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #75781 (substr_count incorrect result)
Xinchen Hui [Tue, 9 Jan 2018 08:20:19 +0000 (16:20 +0800)]
Fixed bug #75781 (substr_count incorrect result)
Dmitry Stogov [Tue, 9 Jan 2018 07:53:37 +0000 (10:53 +0300)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed possible incorrect "mark" usage
Dmitry Stogov [Tue, 9 Jan 2018 07:30:00 +0000 (10:30 +0300)]
Fixed possible incorrect "mark" usage
Xinchen Hui [Mon, 8 Jan 2018 04:57:02 +0000 (12:57 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Implement high resolution monotonic timer function hrtime()
Xinchen Hui [Mon, 8 Jan 2018 04:55:57 +0000 (12:55 +0800)]
remove false dup
Anatol Belski [Sun, 7 Jan 2018 14:55:12 +0000 (15:55 +0100)]
Implement high resolution monotonic timer function hrtime()
Xinchen Hui [Sun, 7 Jan 2018 12:03:49 +0000 (20:03 +0800)]
Use stack allocated zvals
Xinchen Hui [Sun, 7 Jan 2018 11:46:21 +0000 (19:46 +0800)]
Use GC_ADDREF
Xinchen Hui [Sun, 7 Jan 2018 06:17:47 +0000 (14:17 +0800)]
Fixed bug while dealing with ADD_ARRAY_ELEMENT against an existing const array
David Carlier [Mon, 18 Dec 2017 22:34:37 +0000 (22:34 +0000)]
Avoid abs() type mismatch warnings
timelib_time z field was mistakenly promoted to 64 bits types in
one place. Otherwise silence warning with explicit cast down to int.
David Carlier [Sat, 30 Dec 2017 09:44:53 +0000 (09:44 +0000)]
net/if.h requires sys/socket.h on OpenBSD
This led to a detection failure of this particular header.
Gabriel Caruso [Thu, 4 Jan 2018 06:42:48 +0000 (04:42 -0200)]
Remove trailing whitespace in C++ files
[ci skip]
Bishop Bettini [Sat, 6 Jan 2018 02:49:52 +0000 (21:49 -0500)]
PHP 7.1 is the new hotness
PHP 7.0 entered security fix phase.
[ci skip]
Xinchen Hui [Fri, 5 Jan 2018 07:05:47 +0000 (15:05 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed typo
Xinchen Hui [Fri, 5 Jan 2018 07:05:05 +0000 (15:05 +0800)]
Change assertion
Kalle Sommer Nielsen [Fri, 5 Jan 2018 06:30:45 +0000 (07:30 +0100)]
Fixed typo
Xinchen Hui [Fri, 5 Jan 2018 04:58:28 +0000 (12:58 +0800)]
Optimized FETCH_CLASS before INSTANCEOF out if possible
Xinchen Hui [Fri, 5 Jan 2018 04:54:20 +0000 (12:54 +0800)]
Fixed test
Xinchen Hui [Fri, 5 Jan 2018 04:29:39 +0000 (12:29 +0800)]
Fixed wrongly const replacing on partial array
Anatol Belski [Thu, 4 Jan 2018 17:23:31 +0000 (18:23 +0100)]
Don't prevent loading odbc and pdo_odbc for tests
Anatol Belski [Thu, 4 Jan 2018 16:31:59 +0000 (17:31 +0100)]
Re-enable ODBC tests
Anatol Belski [Thu, 4 Jan 2018 15:10:37 +0000 (16:10 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Fix tests
Anatol Belski [Thu, 4 Jan 2018 15:09:51 +0000 (16:09 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tests
Anatol Belski [Thu, 4 Jan 2018 15:08:41 +0000 (16:08 +0100)]
Fix tests
Kalle Sommer Nielsen [Thu, 4 Jan 2018 07:58:27 +0000 (08:58 +0100)]
Added a <in deps path> for includes and libs on configure
Kalle Sommer Nielsen [Thu, 4 Jan 2018 07:16:20 +0000 (08:16 +0100)]
Fix macro for Windows
Kalle Sommer Nielsen [Thu, 4 Jan 2018 07:14:41 +0000 (08:14 +0100)]
Use PHP_WIN32
Kalle Sommer Nielsen [Thu, 4 Jan 2018 07:11:34 +0000 (08:11 +0100)]
Kill the references to C:\winnt (Windows 2000), which we don't support, also remove the note about Windows NT based OS, as we only support NT anyway
Xinchen Hui [Thu, 4 Jan 2018 06:13:08 +0000 (14:13 +0800)]
Merge branch 'clean-up' of https://github.com/carusogabriel/php-src
* 'clean-up' of https://github.com/carusogabriel/php-src:
Trailing whitespaces on Zend
Trailing whitespaces on win32
Trailing whitespaces on sapi/*
Trailing whitespaces on ext/*
Xinchen Hui [Thu, 4 Jan 2018 05:50:34 +0000 (13:50 +0800)]
Added entry on UPGRADING
Xinchen Hui [Thu, 4 Jan 2018 05:45:11 +0000 (13:45 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Happy new year (Update copyright to 2018)
Happy new year (Update copyright to 2018)
Revert "Enable ODBC tests on AppVeyor"
Enable ODBC tests on AppVeyor
Skip on Travis-CI
Extend skip section
2018
missing changelog entries + fix version and date
missing changelog entries
2018
Trailing whitespaces
Gabriel Caruso [Thu, 4 Jan 2018 04:41:57 +0000 (02:41 -0200)]
Trailing whitespaces on Zend
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
Gabriel Caruso [Thu, 4 Jan 2018 04:41:26 +0000 (02:41 -0200)]
Trailing whitespaces on win32
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
Gabriel Caruso [Thu, 4 Jan 2018 04:39:54 +0000 (02:39 -0200)]
Trailing whitespaces on sapi/*
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
Gabriel Caruso [Thu, 4 Jan 2018 04:38:32 +0000 (02:38 -0200)]
Trailing whitespaces on ext/*
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
Lior Kaplan [Wed, 3 Jan 2018 23:02:17 +0000 (01:02 +0200)]
Happy new year (Update copyright to 2018)
Lior Kaplan [Wed, 3 Jan 2018 22:58:17 +0000 (00:58 +0200)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Happy new year (Update copyright to 2018)
Lior Kaplan [Wed, 3 Jan 2018 22:48:45 +0000 (00:48 +0200)]
Happy new year (Update copyright to 2018)
Anatol Belski [Wed, 3 Jan 2018 20:05:56 +0000 (21:05 +0100)]
Revert "Enable ODBC tests on AppVeyor"
This reverts commit
b0db19e2231f23fc4bd3138aad8eee5dce98ece1 .
More test fixes needed to evaluate.
Anatol Belski [Wed, 3 Jan 2018 19:28:16 +0000 (20:28 +0100)]
Enable ODBC tests on AppVeyor
Anatol Belski [Wed, 3 Jan 2018 17:36:34 +0000 (18:36 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Skip on Travis-CI
Anatol Belski [Wed, 3 Jan 2018 17:36:10 +0000 (18:36 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip on Travis-CI
Anatol Belski [Wed, 3 Jan 2018 17:32:33 +0000 (18:32 +0100)]
Skip on Travis-CI
The current doc states max ram for a test VM would be 7.5G, the
currently used container image has even less. This skip should be
revisited, as the available memory amount shifts. The way of checking
/proc/meminfo doesn't work reliably on containers at least, thus
skipping explicitly on Travis-CI makes sense.
Anatol Belski [Wed, 3 Jan 2018 15:56:42 +0000 (16:56 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Extend skip section
Anatol Belski [Wed, 3 Jan 2018 15:56:00 +0000 (16:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Extend skip section
Anatol Belski [Wed, 3 Jan 2018 15:54:14 +0000 (16:54 +0100)]
Extend skip section
The test requires some untrivial amount of RAM. Added a simple check for
the system free RAM to avoid false positive fails.
Remi Collet [Wed, 3 Jan 2018 14:13:18 +0000 (15:13 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
2018
Remi Collet [Wed, 3 Jan 2018 14:13:10 +0000 (15:13 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
2018
Remi Collet [Wed, 3 Jan 2018 14:13:03 +0000 (15:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
2018
Remi Collet [Wed, 3 Jan 2018 14:12:56 +0000 (15:12 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
2018
Remi Collet [Wed, 3 Jan 2018 14:12:39 +0000 (15:12 +0100)]
2018
Remi Collet [Wed, 3 Jan 2018 14:10:25 +0000 (15:10 +0100)]
Merge branch 'PHP-7.2'
* PHP-7.2:
missing changelog entries + fix version and date
missing changelog entries
2018
Remi Collet [Wed, 3 Jan 2018 14:10:09 +0000 (15:10 +0100)]
missing changelog entries + fix version and date
Remi Collet [Wed, 3 Jan 2018 14:07:36 +0000 (15:07 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
missing changelog entries
2018
Remi Collet [Wed, 3 Jan 2018 14:07:18 +0000 (15:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
2018
Remi Collet [Wed, 3 Jan 2018 14:07:09 +0000 (15:07 +0100)]
missing changelog entries
Remi Collet [Wed, 3 Jan 2018 14:04:48 +0000 (15:04 +0100)]
2018
Gabriel Caruso [Sun, 31 Dec 2017 04:35:25 +0000 (05:35 +0100)]
Trailing whitespaces
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
Xinchen Hui [Wed, 3 Jan 2018 10:28:03 +0000 (18:28 +0800)]
Enable replacing const to INSTANCEOF
Xinchen Hui [Wed, 3 Jan 2018 08:08:20 +0000 (16:08 +0800)]
Merge branch 'instanceof-const' of https://github.com/nikic/php-src
* 'instanceof-const' of https://github.com/nikic/php-src:
Return false for instanceof on literal
Xinchen Hui [Wed, 3 Jan 2018 08:02:15 +0000 (16:02 +0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Happy new year (Update copyright to 2018)
Conflicts:
ext/phar/LICENSE
Xinchen Hui [Wed, 3 Jan 2018 08:00:34 +0000 (16:00 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Happy new year (Update copyright to 2018)
Xinchen Hui [Wed, 3 Jan 2018 07:59:05 +0000 (15:59 +0800)]
Merge branch 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src into PHP-7.1
* 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src:
Happy new year (Update copyright to 2018)
Ferenc Kovacs [Tue, 2 Jan 2018 23:36:55 +0000 (00:36 +0100)]
Merge branch 'PHP-7.2'
Ferenc Kovacs [Tue, 2 Jan 2018 23:35:50 +0000 (00:35 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2