Anatol Belski
4752f8a8ed
Merge branch 'PHP-7.2'
...
* PHP-7.2:
fixed Big_endian issue on s390x for stream test cases
2018-01-27 16:45:27 +01:00
Sam Ding
a8c6b36d62
fixed Big_endian issue on s390x for stream test cases
2018-01-27 16:39:03 +01:00
Christoph M. Becker
5d7b2ce961
Merge branch 'PHP-7.2' and add NEWS entry
2018-01-27 13:16:06 +01:00
Christoph M. Becker
96595a232a
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Revert "Fix #75878 : RecursiveTreeIterator::setPostfix has wrong signature"
2018-01-27 13:13:06 +01:00
Christoph M. Becker
a882f95e39
Revert "Fix #75878 : RecursiveTreeIterator::setPostfix has wrong signature"
...
This reverts commit 4bd7658e1b .
To avoid the BC break we apply the fix to master only.
2018-01-27 13:11:30 +01:00
Christoph M. Becker
ce7ef7c282
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix #75878 : RecursiveTreeIterator::setPostfix has wrong signature
2018-01-27 12:46:10 +01:00
Christoph M. Becker
d7a02844f9
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #75878 : RecursiveTreeIterator::setPostfix has wrong signature
2018-01-27 12:41:15 +01:00
Christoph M. Becker
4bd7658e1b
Fix #75878 : RecursiveTreeIterator::setPostfix has wrong signature
2018-01-27 12:33:36 +01:00
Nikita Popov
466196d454
Merge branch 'PHP-7.2'
2018-01-26 22:28:54 +01:00
Nikita Popov
fd255b8878
Merge branch 'PHP-7.1' into PHP-7.2
2018-01-26 22:28:48 +01:00
Philip Prindeville
aad76a9b79
Be consistent in clearing out in php_iconv_string()
2018-01-26 22:28:27 +01:00
Nat Zimmermann
478af26d84
Update mb_preferred_mime_name tests
2018-01-26 22:25:18 +01:00
Nat Zimmermann
6fb78e3017
Add unknown encoding warning test for mb_encoding_aliases
2018-01-26 22:25:18 +01:00
Gabriel Caruso
c0ef58e9fe
Simplify returns in generate-phpt
2018-01-26 22:19:08 +01:00
Nikita Popov
e061a4e9e4
Drop the ext/intl/doc directory
...
Drop outdated documentation stubs. Better intl documentation is
available in the manual...
2018-01-26 22:13:11 +01:00
Anatol Belski
ec0bcecee7
Add RtlSecureZeroMemory to explicit_bzero() compile case
...
just in case one would use the function directly. The use of
ZEND_SECURE_ZERO could be eliminated now, too. Or it can be
kept for BC.
2018-01-26 21:34:31 +01:00
Dmitry Stogov
53eb20f0cb
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Restore initial values on graceful server restart.
2018-01-26 15:25:03 +03:00
Dmitry Stogov
aad12cb49c
Restore initial values on graceful server restart.
2018-01-26 15:22:36 +03:00
Anatol Belski
9edf2e9f96
Show the tidyp name, if it was used
2018-01-25 18:55:54 +01:00
Anatol Belski
b341556ab5
Add missing define after e7da9685
2018-01-25 18:54:37 +01:00
David Carlier
e7da9685cf
Tidy extension update to be able to either use tidy or tidyp at configure time
2018-01-25 18:28:55 +01:00
Anatol Belski
93185218e1
Revoke the gcc only restriction
...
clang at least 5.0 supports GNU style attributes and intrinsic macros.
In general, compilers claiming this functionality should know, what
they do.
2018-01-25 16:24:04 +01:00
Nat Zimmermann
2d1ec6f4b5
Add tests for json_decode with depth below 0
2018-01-24 21:23:24 +01:00
Nikita Popov
2687be6589
Merge branch 'PHP-7.2'
2018-01-24 21:22:50 +01:00
Michael Orlitzky
3fe9e10a1b
ext/session: catch incompatible configure flags earlier.
...
The session extension has a --with-mm flag that tells it to build
the mm backend ("mm" is the name of the library). However, that
backend is not thread-safe, and mod_mm.c will refuse to compile if
the --enable-maintainer-zts flag was also passed to the configure
script.
Rather than crash halfway through the build, this commit adds a check
to the session extension's config.m4 file. If both --with-mm and
--enable-maintainer-zts are "on," then the configure script will
die and explain that they can't be used together.
PHP-bug: 14269
2018-01-24 21:22:15 +01:00
Anatol Belski
b6f66f18ad
Reimplement ASCII conversion using aligned routine
2018-01-24 18:35:40 +01:00
Anatol Belski
92f9fde23a
Macrify the common operation
2018-01-24 18:35:40 +01:00
Derick Rethans
4aa864c4ab
Updated to version 2018.3 (2018c)
2018-01-24 13:57:08 +00:00
Derick Rethans
9b4aa706f1
Empty merge
2018-01-24 13:57:08 +00:00
Derick Rethans
6dbe046154
Updated to version 2018.3 (2018c)
2018-01-24 13:57:07 +00:00
Derick Rethans
3bdcb6cf3e
Empty merge
2018-01-24 13:57:07 +00:00
Derick Rethans
f80e59a566
Updated to version 2018.3 (2018c)
2018-01-24 13:57:06 +00:00
Anatol Belski
7e2a9936d3
Move useful macro into zend_portability.h
2018-01-24 10:14:28 +01:00
Anatol Belski
a6e86f7a3f
Implement intrinsic function resolving per MINIT
2018-01-24 09:33:32 +01:00
Sara Golemon
df4edde870
Remove padding just merged since 7.3 isn't released yet.
...
Also bump PHP_API_VERSION since the struct size has changed.
2018-01-23 11:13:41 -05:00
Sara Golemon
76b63ed149
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix alignment of PG struct cause by ignore_user_abort big endian fix
2018-01-23 11:11:43 -05:00
Sara Golemon
0c22cda951
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix alignment of PG struct cause by ignore_user_abort big endian fix
2018-01-23 11:11:37 -05:00
Sara Golemon
3ffdf6c088
Fix alignment of PG struct cause by ignore_user_abort big endian fix
2018-01-23 11:06:34 -05:00
Sara Golemon
79f9ed9b6f
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
2018-01-23 09:24:54 -05:00
Sara Golemon
0067420049
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
2018-01-23 09:24:47 -05:00
Sara Golemon
e954bafc28
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
2018-01-23 09:24:40 -05:00
Sara Golemon
e88e83d3e5
Use Z_EXPECTED_LONG to initialize FAST_ZPP parsing loop
2018-01-23 09:24:10 -05:00
Sara Golemon
81425be70b
Merge branch 'PHP-7.2'
...
* PHP-7.2:
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
2018-01-23 08:59:30 -05:00
Sara Golemon
871066523e
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
2018-01-23 08:58:53 -05:00
Sara Golemon
d46d53a7bc
BigEndian fix for ignore_user_abort. Use zend_bool to match OnUpdateBool
2018-01-23 08:58:19 -05:00
Dmitry Stogov
5e8aa036f2
Access extra data stored in zval through macros
2018-01-23 12:56:22 +03:00
Christoph M. Becker
5b4b4d33b2
Update to SQLite 3.22.0
2018-01-22 23:42:36 +01:00
Anatol Belski
e239c5e19b
Merge branch 'PHP-7.2'
...
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
2018-01-22 19:15:53 +01:00
Anatol Belski
4626c28e9c
[ci skip] Update NEWS
2018-01-22 19:15:30 +01:00
Anatol Belski
b8f14008eb
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
[ci skip] Update NEWS
2018-01-22 19:15:02 +01:00