]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.2'
Stanislav Malyshev [Tue, 17 Jul 2018 01:52:14 +0000 (18:52 -0700)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix test

6 years agoFix test
Stanislav Malyshev [Tue, 17 Jul 2018 01:52:01 +0000 (18:52 -0700)]
Fix test

6 years agoMerge branch 'PHP-7.2'
Stanislav Malyshev [Mon, 16 Jul 2018 23:54:31 +0000 (16:54 -0700)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Stanislav Malyshev [Mon, 16 Jul 2018 23:53:57 +0000 (16:53 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c

6 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Mon, 16 Jul 2018 23:52:36 +0000 (16:52 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c

6 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 16 Jul 2018 22:13:13 +0000 (15:13 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c

6 years agoFixed bug #76459 windows linkinfo lacks openbasedir check
Anatol Belski [Tue, 3 Jul 2018 12:04:22 +0000 (14:04 +0200)]
Fixed bug #76459 windows linkinfo lacks openbasedir check

6 years agoAdd NEWS
Stanislav Malyshev [Mon, 16 Jul 2018 21:26:31 +0000 (14:26 -0700)]
Add NEWS

6 years agoFixed bug #76459 windows linkinfo lacks openbasedir check
Anatol Belski [Tue, 3 Jul 2018 11:51:31 +0000 (13:51 +0200)]
Fixed bug #76459 windows linkinfo lacks openbasedir check

6 years agoFix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
Stanislav Malyshev [Mon, 2 Jul 2018 05:20:19 +0000 (22:20 -0700)]
Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data

Use MAKERNOTE length as data size.

6 years agoFix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of...
Stanislav Malyshev [Tue, 19 Jun 2018 23:26:36 +0000 (16:26 -0700)]
Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c

6 years agoDeprecate case-insensitive constants
Nikita Popov [Sat, 23 Jun 2018 18:51:49 +0000 (20:51 +0200)]
Deprecate case-insensitive constants

RFC: https://wiki.php.net/rfc/case_insensitive_constant_deprecation

6 years agoRemove use of case-insensitive constants in tests
Nikita Popov [Sat, 23 Jun 2018 18:54:49 +0000 (20:54 +0200)]
Remove use of case-insensitive constants in tests

6 years agoFixed error messages.
Dmitry Stogov [Mon, 16 Jul 2018 14:08:11 +0000 (17:08 +0300)]
Fixed error messages.

6 years agoFlatten strip_tags state machine (GCC overoptimized this function, producing enormpou...
Dmitry Stogov [Mon, 16 Jul 2018 10:22:17 +0000 (13:22 +0300)]
Flatten strip_tags state machine (GCC overoptimized this function, producing enormpous amount of code).

6 years agoMake more tests run and fix SKIPIF sections
Gabriel Caruso [Mon, 16 Jul 2018 03:01:46 +0000 (00:01 -0300)]
Make more tests run and fix SKIPIF sections

6 years agoTest http_response_code function
Gabriel Caruso [Mon, 16 Jul 2018 02:51:16 +0000 (23:51 -0300)]
Test http_response_code function

6 years agoFix failing test upstream
Gabriel Caruso [Mon, 16 Jul 2018 02:40:00 +0000 (23:40 -0300)]
Fix failing test upstream

There was a trailing tab when a error message was generated. Removing
it, test is passing now.

6 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Sun, 15 Jul 2018 21:24:02 +0000 (23:24 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix #73817: Incorrect entries in get_html_translation_table

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 15 Jul 2018 21:09:15 +0000 (23:09 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #73817: Incorrect entries in get_html_translation_table

6 years agoFix #73817: Incorrect entries in get_html_translation_table
Christoph M. Becker [Sun, 15 Jul 2018 21:06:38 +0000 (23:06 +0200)]
Fix #73817: Incorrect entries in get_html_translation_table

Due to incorrect string termination and length handling, several HTML
entities missed the trailing semicolon.

We also fix the obviously wrong expectations in two already existing
tests.

6 years agoSmall tweaks to php scripts
Gabriel Caruso [Sat, 14 Jul 2018 22:37:12 +0000 (19:37 -0300)]
Small tweaks to php scripts

6 years agoSmall tweaks to php scripts
Gabriel Caruso [Mon, 9 Jul 2018 03:56:45 +0000 (00:56 -0300)]
Small tweaks to php scripts

6 years ago[ci skip] Update php.ini-production
Gemorroj [Fri, 13 Jul 2018 21:22:45 +0000 (00:22 +0300)]
[ci skip] Update php.ini-production

remove duplicated strings

6 years agoRegroup the ifdef'd occurrences
Anatol Belski [Sat, 14 Jul 2018 10:51:37 +0000 (12:51 +0200)]
Regroup the ifdef'd occurrences

6 years agoTrail long path support also for deletion
Anatol Belski [Sat, 14 Jul 2018 09:43:46 +0000 (11:43 +0200)]
Trail long path support also for deletion

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Fri, 13 Jul 2018 18:15:17 +0000 (20:15 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Improve test

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 13 Jul 2018 18:14:44 +0000 (20:14 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Improve test

6 years agoImprove test
Anatol Belski [Fri, 13 Jul 2018 18:13:51 +0000 (20:13 +0200)]
Improve test

Ensure the filename is non existent indeed.

6 years agoDistinguish two error messages
Anatol Belski [Fri, 13 Jul 2018 17:01:43 +0000 (19:01 +0200)]
Distinguish two error messages

6 years agoAvoid early allocation
Anatol Belski [Fri, 13 Jul 2018 05:35:33 +0000 (07:35 +0200)]
Avoid early allocation

6 years ago[ci skip] Add dates to maintainer names
Stanislav Malyshev [Mon, 2 Jul 2018 06:49:06 +0000 (23:49 -0700)]
[ci skip] Add dates to maintainer names

The dates are initialized from oldest and newest commit
that can be attributed to that person.

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 12 Jul 2018 17:58:43 +0000 (19:58 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed RecursiveDirectoryIterator with long path or with edge case length

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 12 Jul 2018 17:57:08 +0000 (19:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed RecursiveDirectoryIterator with long path or with edge case length

6 years agoFixed RecursiveDirectoryIterator with long path or with edge case length
Anatol Belski [Thu, 12 Jul 2018 17:49:32 +0000 (19:49 +0200)]
Fixed RecursiveDirectoryIterator with long path or with edge case length

The search path needs to be appended with the wild card. Till now, an
edge case existed, so then if a path is 259 bytes long, which is smaller
_MAX_PATH, the suffix would cause the final search path to become longer
than _MAX_PATH. It is an edge case, when the starting path happens to
have a specific length. If the starting path was longer than _MAX_PATH
or the addition of "\\*" would not exceed _MAX_PATH, the function was
correct. Except for rewind, which was broken in the case of the long
path.

6 years agoFixed tests
Dmitry Stogov [Thu, 12 Jul 2018 14:17:09 +0000 (17:17 +0300)]
Fixed tests

6 years agoMerge zend_class_entry.create_object and zend_class_entry.interface_gets_implemented...
Dmitry Stogov [Thu, 12 Jul 2018 14:09:40 +0000 (17:09 +0300)]
Merge zend_class_entry.create_object and zend_class_entry.interface_gets_implemented into the same memory lacation. The first used only by classes, the second only by magic interfaces.

6 years ago[ci skip] Update next version
Christoph M. Becker [Thu, 12 Jul 2018 13:22:26 +0000 (15:22 +0200)]
[ci skip] Update next version

According to <https://externals.io/message/102762>.

6 years agoFix #33502: Some nullary functions don't check the number of arguments
Christoph M. Becker [Thu, 12 Jul 2018 13:05:56 +0000 (15:05 +0200)]
Fix #33502: Some nullary functions don't check the number of arguments

We add the missing zend_parse_parameters_none() checks for:

* output_reset_rewrite_vars()
* func_num_args()
* gc_status()
* gc_disable()
* gc_enable()
* gc_enabled()
* gc_collect_cycles()
* gc_mem_caches()
* zend_version()

6 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Thu, 12 Jul 2018 11:47:11 +0000 (13:47 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix Travis build

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Thu, 12 Jul 2018 11:46:10 +0000 (13:46 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix Travis build

6 years agoFix Travis build
Christoph M. Becker [Thu, 12 Jul 2018 11:45:30 +0000 (13:45 +0200)]
Fix Travis build

As of commit f9d1d1f[1] we require `sudo`, so we tell Travis about it.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=f9d1d1f>

6 years agoExport stdClass objects using (object) cast (fixes #48016)
Andrea Faulds [Thu, 5 Jul 2018 20:02:59 +0000 (22:02 +0200)]
Export stdClass objects using (object) cast (fixes #48016)

Before this change, var_export()'s output for stdClass objects calls
the non-existent stdClass::__set_state method, and is therefore useless.

This commit makes var_export() output an (object) cast from an array
instead, which when evaluated, will produce a stdClass object. Other
classes see unchanged output.

6 years agoImproved user iterator implementation to reduce zend_class_entry memory consumption...
Dmitry Stogov [Thu, 12 Jul 2018 11:04:14 +0000 (14:04 +0300)]
Improved user iterator implementation to reduce zend_class_entry memory consumption and avoid race condition during resolving/caching of user iterator functions of internal classes in ZTS build.

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Thu, 12 Jul 2018 09:38:18 +0000 (11:38 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix macro

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Thu, 12 Jul 2018 09:37:13 +0000 (11:37 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix macro

6 years agoFix macro
Anatol Belski [Thu, 12 Jul 2018 09:35:00 +0000 (11:35 +0200)]
Fix macro

6 years agoSupport long path also when reading from file cache
Anatol Belski [Thu, 12 Jul 2018 07:26:50 +0000 (09:26 +0200)]
Support long path also when reading from file cache

6 years agoMark conditions unexpected
Anatol Belski [Wed, 11 Jul 2018 16:05:10 +0000 (18:05 +0200)]
Mark conditions unexpected

6 years agoChanged structure of zend_class_entry.trait_aliases and zend_class_entry.trait_preced...
Dmitry Stogov [Wed, 11 Jul 2018 15:56:10 +0000 (18:56 +0300)]
Changed structure of zend_class_entry.trait_aliases and zend_class_entry.trait_precedences to avoid keeping "intermediate" trait references, that are used only during inheritance.

6 years agoMake error messages more speaking
Anatol Belski [Wed, 11 Jul 2018 12:34:18 +0000 (14:34 +0200)]
Make error messages more speaking

6 years agoSwitch to ioutil routines to support long path in file cache
Anatol Belski [Wed, 11 Jul 2018 12:28:57 +0000 (14:28 +0200)]
Switch to ioutil routines to support long path in file cache

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 11 Jul 2018 11:16:04 +0000 (13:16 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix condition

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 11 Jul 2018 11:13:56 +0000 (13:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix condition

6 years agoFix condition
Anatol Belski [Wed, 11 Jul 2018 11:09:20 +0000 (13:09 +0200)]
Fix condition

It looks like the real length limit is 247 bytes, not 248 as documented.

6 years agoFix build with ZEND_RC_DEBUG
Anatol Belski [Wed, 11 Jul 2018 10:19:20 +0000 (12:19 +0200)]
Fix build with ZEND_RC_DEBUG

6 years agoFixed possible assertion/crash when PHP script can't be stored in SHM (e.g. because...
Dmitry Stogov [Wed, 11 Jul 2018 07:35:36 +0000 (10:35 +0300)]
Fixed possible assertion/crash when PHP script can't be stored in SHM (e.g. because another process already did this)

6 years agoRemove these two old and outdated files we never use:
Kalle Sommer Nielsen [Tue, 10 Jul 2018 19:24:54 +0000 (21:24 +0200)]
Remove these two old and outdated files we never use:

 * OBJECTS2_HOWTO is rather outdated and the wiki contains much of this
 * ZendCore.dep is an old leftover from the previous Windows build system

6 years ago[ci skip] Fix typos
Christoph M. Becker [Tue, 10 Jul 2018 15:03:48 +0000 (17:03 +0200)]
[ci skip] Fix typos

6 years ago[ci skip] Document changes to php_add[c]slashes
Christoph M. Becker [Tue, 10 Jul 2018 14:04:14 +0000 (16:04 +0200)]
[ci skip] Document changes to php_add[c]slashes

6 years agoFix #76574: use of undeclared identifiers INT_MAX and LONG_MAX
Christoph M. Becker [Tue, 10 Jul 2018 12:28:28 +0000 (14:28 +0200)]
Fix #76574: use of undeclared identifiers INT_MAX and LONG_MAX

As of Oniguruma 6.4.0 <limits.h> is required, so we have to add a check
for this header file to set the respective macro.

6 years agoAvoid copying
Dmitry Stogov [Tue, 10 Jul 2018 10:17:33 +0000 (13:17 +0300)]
Avoid copying

6 years ago[skip ci] Update NEWS
Anatol Belski [Tue, 10 Jul 2018 09:53:04 +0000 (11:53 +0200)]
[skip ci] Update NEWS

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 10 Jul 2018 09:52:24 +0000 (11:52 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS

6 years ago[ci skip] Update NEWS
Anatol Belski [Tue, 10 Jul 2018 09:51:49 +0000 (11:51 +0200)]
[ci skip] Update NEWS

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

* PHP-7.1:
  [ci skip] Update NEWS

6 years ago[ci skip] Update NEWS
Anatol Belski [Tue, 10 Jul 2018 09:50:33 +0000 (11:50 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 10 Jul 2018 09:20:50 +0000 (11:20 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #76524 - ZipArchive memory leak

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 10 Jul 2018 09:19:54 +0000 (11:19 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #76524 - ZipArchive memory leak

6 years agoFix bug #76524 - ZipArchive memory leak
timurib [Mon, 25 Jun 2018 11:14:26 +0000 (14:14 +0300)]
Fix bug #76524 - ZipArchive memory leak

Bugfix #76524: Free up zip internal state and adjust the tests for Windows

Bugfix #76524: Fix possible use after free for libzip 1.3.1

Bugfix #76524: Make the test independent of platform

6 years agoUse ZVAL_COPY_DEREF()
Dmitry Stogov [Tue, 10 Jul 2018 09:11:10 +0000 (12:11 +0300)]
Use ZVAL_COPY_DEREF()

6 years agoAvoid useless copying
Dmitry Stogov [Tue, 10 Jul 2018 09:03:32 +0000 (12:03 +0300)]
Avoid useless copying

6 years agoRemoved deprecated condition
Dmitry Stogov [Tue, 10 Jul 2018 08:04:10 +0000 (11:04 +0300)]
Removed deprecated condition

6 years agoOptimization
Dmitry Stogov [Mon, 9 Jul 2018 21:04:44 +0000 (00:04 +0300)]
Optimization

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 9 Jul 2018 19:25:19 +0000 (21:25 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Sync callback signature with libxml2 2.9.8

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 9 Jul 2018 19:24:51 +0000 (21:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync callback signature with libxml2 2.9.8

6 years agoSync callback signature with libxml2 2.9.8
Anatol Belski [Mon, 9 Jul 2018 19:21:41 +0000 (21:21 +0200)]
Sync callback signature with libxml2 2.9.8

6 years agoSkip test on incompatible servers
Anatol Belski [Mon, 9 Jul 2018 14:39:07 +0000 (16:39 +0200)]
Skip test on incompatible servers

6 years agoAvoid useless checks for public functions
Dmitry Stogov [Mon, 9 Jul 2018 14:30:14 +0000 (17:30 +0300)]
Avoid useless checks for public functions

6 years agoCombined few checks into one
Dmitry Stogov [Mon, 9 Jul 2018 14:29:34 +0000 (17:29 +0300)]
Combined few checks into one

6 years agoAvoid reloading
Dmitry Stogov [Mon, 9 Jul 2018 13:28:13 +0000 (16:28 +0300)]
Avoid reloading

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 9 Jul 2018 13:15:08 +0000 (15:15 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Add missing flag

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 9 Jul 2018 13:14:30 +0000 (15:14 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Add missing flag

6 years agoAdd missing flag
Anatol Belski [Mon, 9 Jul 2018 13:12:52 +0000 (15:12 +0200)]
Add missing flag

6 years agoEliminated check
Dmitry Stogov [Mon, 9 Jul 2018 12:18:09 +0000 (15:18 +0300)]
Eliminated check

6 years agoMove to size_t for string length
Anatol Belski [Mon, 9 Jul 2018 11:34:04 +0000 (13:34 +0200)]
Move to size_t for string length

6 years agoRemove conflicting declaration
Anatol Belski [Mon, 9 Jul 2018 10:32:26 +0000 (12:32 +0200)]
Remove conflicting declaration

6 years agoEliminated reference-counting and EG(exception) check
Dmitry Stogov [Mon, 9 Jul 2018 10:20:46 +0000 (13:20 +0300)]
Eliminated reference-counting and EG(exception) check

6 years agoFixed test
Dmitry Stogov [Mon, 9 Jul 2018 09:49:19 +0000 (12:49 +0300)]
Fixed test

6 years agoUze ZVAL_COPY_DEREF() instead of ZVAL_DEREF() and ZVAL_COPY()
Dmitry Stogov [Mon, 9 Jul 2018 09:46:46 +0000 (12:46 +0300)]
Uze ZVAL_COPY_DEREF() instead of ZVAL_DEREF() and ZVAL_COPY()

6 years agoThe session_array global is not used at all, so comment it out for now
Kalle Sommer Nielsen [Mon, 9 Jul 2018 02:21:46 +0000 (04:21 +0200)]
The session_array global is not used at all, so comment it out for now

6 years agoAdded test to accompany the FILTER_SANITIZE_ADD_SLASHES filter
Kalle Sommer Nielsen [Mon, 9 Jul 2018 01:59:35 +0000 (03:59 +0200)]
Added test to accompany the FILTER_SANITIZE_ADD_SLASHES filter

6 years agoAdded the 'add_slashes' sanitization filter (FILTER_SANITIZE_ADD_SLASHES) as an alias...
Kalle Sommer Nielsen [Mon, 9 Jul 2018 01:58:20 +0000 (03:58 +0200)]
Added the 'add_slashes' sanitization filter (FILTER_SANITIZE_ADD_SLASHES) as an alias to 'magic_quotes' (FILTER_SANITIZE_MAGIC_QUOTES) so we can move past our "magical" legacy.

6 years agoFix #76594: Bus Error due to unaligned access in zend_ini.c OnUpdateLong
Christoph M. Becker [Sun, 8 Jul 2018 22:54:36 +0000 (00:54 +0200)]
Fix #76594: Bus Error due to unaligned access in zend_ini.c OnUpdateLong

Since commit ea83b69[1] changed the type of mbstring.strict_detection
from `long` to `zend_bool`, we have to update the `on_modify` callback
as well.

[1] http://git.php.net/?p=php-src.git;a=commit;h=ea83b69883f3f77fd27e4663fa854c88f141ab41

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Sun, 8 Jul 2018 18:34:58 +0000 (20:34 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix C++11 and up compatibility for zend_finite and more

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Sun, 8 Jul 2018 18:32:52 +0000 (20:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix C++11 and up compatibility for zend_finite and more

6 years agoFix C++11 and up compatibility for zend_finite and more
Anatol Belski [Sun, 8 Jul 2018 18:20:08 +0000 (20:20 +0200)]
Fix C++11 and up compatibility for zend_finite and more

C++11 puts isfinite, isinf, isnan and a lot of other stuff into the
std namespace. Thus, if a C++11 or newer source is compiled, these
symbols won't be available. A good solution would be to include cmath,
but depending on a particular compiler that might remove even more
stuff from the global namespace, so such a fix should only target master.
For now, just keep these defines same for C++11 and upper, as the actual
C++ code should use symbols from the std namespace anyway. This
especially concerns older GCC versions like at least 4 and 5, which are
used by default in the LTS Linux distros.

6 years agoMerge branch 'PHP-7.2'
Anatol Belski [Sat, 7 Jul 2018 15:33:47 +0000 (17:33 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed regex for checking libzip static lib

6 years agoFixed regex for checking libzip static lib
Dylan K. Taylor [Sat, 7 Jul 2018 09:14:31 +0000 (10:14 +0100)]
Fixed regex for checking libzip static lib

This bug caused linking issues in debug mode (see bug [#76564](https://bugs.php.net/bug.php?id=76564))

This issue affects PHP 7.2 and master.

6 years ago[ci skip] Fix EOL
Anatol Belski [Fri, 6 Jul 2018 17:07:11 +0000 (19:07 +0200)]
[ci skip] Fix EOL