Anatol Belski
660b829ccc
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Followup on 0ec147d3
for another place
Ensure binary mode for OpenSSL I/O
2017-07-24 16:38:05 +02:00
Anatol Belski
e2b61eccb9
Followup on 0ec147d3
for another place
...
which requires also to move the macros into the header
(cherry picked from commit b7eb2c0604
)
2017-07-24 16:33:12 +02:00
Anatol Belski
6918a68d9d
Ensure binary mode for OpenSSL I/O
...
Essential for OpenSSL 1.1.0 on Windows, some issues was revealed earlier
and now by openssl_pkcs12_export_to_file_basic.phpt.
(cherry picked from commit 0ec147d301
)
2017-07-24 16:31:09 +02:00
Anatol Belski
b7eb2c0604
Followup on 0ec147d3
for another place
...
which requires also to move the macros into the header
2017-07-24 16:24:04 +02:00
Anatol Belski
0ec147d301
Ensure binary mode for OpenSSL I/O
...
Essential for OpenSSL 1.1.0 on Windows, some issues was revealed earlier
and now by openssl_pkcs12_export_to_file_basic.phpt.
2017-07-24 15:43:48 +02:00
Anatol Belski
8a6afbef3f
Combine conditions for the automatic interactive console activation
...
as with bug #74979 it seems to have regressions which were not
present before.
2017-07-24 14:47:32 +02:00
Frank Denis
742895f60c
sodium ext: don't reinvent sodium_increment() and sodium_add()
2017-07-24 14:26:05 +02:00
Joe Watkins
52964bbfb2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
openssl: Add openssl_pkcs12_export_to_file tests
2017-07-24 10:47:02 +01:00
Joe Watkins
5816ce330c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
openssl: Add openssl_pkcs12_export_to_file tests
2017-07-24 10:46:52 +01:00
Jelle van der Waa
23c124ec75
openssl: Add openssl_pkcs12_export_to_file tests
...
Add basic tests for openssl_pkcs12_export_to_file.
2017-07-24 10:46:42 +01:00
Issei.M
f1d7857969
Fix typo in UPGRADING for 7.2
2017-07-24 10:44:19 +01:00
Joe Watkins
94e6c72e26
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update PHP 5 version to 7 in header comments
2017-07-24 10:42:48 +01:00
Joe Watkins
642fb44d69
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update PHP 5 version to 7 in header comments
2017-07-24 10:42:35 +01:00
Peter Kokot
c4e11c8ef3
Update PHP 5 version to 7 in header comments
2017-07-24 10:42:15 +01:00
Sara Golemon
a6e4a713ea
Add hash_hmac_algos() for filtered is_crypto methods
2017-07-23 15:17:09 -04:00
Nikita Popov
706f0cf8a0
Update Unicode data for Unicode 10
2017-07-23 16:05:39 +02:00
Nikita Popov
24cfbfd56f
Update ucgendat for more bidi properties
...
Handle them the same way as others -- by classifying as Other
Neutral.
2017-07-23 16:03:11 +02:00
Nikita Popov
077e61fad3
Fixed bug #69267 completely
...
ucgendat.c was assuming that a title-case character is a character
that has both lower and upper-case variants. However, there are
title-case characters that only have a lower-case variant. Use the
Lt general character proprety to determine where in the case map
the character should be placed instead.
2017-07-23 15:30:17 +02:00
Nikita Popov
c0bcd301d3
Another fix for bug #69267
...
mb_strtoupper() was converting lowercase characters into
titlecase characters, instead of uppercase characters. Luckily
there are only very few characters with a distinct titlecase
representation, so this mostly worked out okay...
2017-07-23 15:07:02 +02:00
Nikita Popov
0e4af9192f
Partial fix for bug #69267
...
This pulls in 60a25c72ba389f53b0621ca250bc99f3b295d43f from the
OpenLDAP project.
2017-07-23 14:47:21 +02:00
Nikita Popov
88f752a947
Merge branch 'PHP-7.1' into PHP-7.2
2017-07-23 12:21:51 +02:00
Nikita Popov
f116a88592
Merge branch 'PHP-7.0' into PHP-7.1
2017-07-23 12:21:16 +02:00
Christoph M. Becker
418da85f15
Fix #71606 : Segmentation fault mb_strcut with HTML-ENTITIES
...
The HTML decoding filter uses the `opaque` member of mbfl_convert_filter
as buffer, but there was no copy constructor defined, what caused double
frees when the filter is copied (what happens multiple times in mb_strcut(),
for instance).
2017-07-23 12:19:27 +02:00
Nikita Popov
9af5b7f33d
Fix use after free in mb_send_mail
2017-07-23 11:55:26 +02:00
Anatol Belski
47334646db
fix skipif
2017-07-23 11:08:11 +02:00
Sara Golemon
089f4ff885
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Use compatability zend_isnan() instead of POSIX isnan()
2017-07-22 21:33:28 -04:00
Sara Golemon
a4e3589966
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Use compatability zend_isnan() instead of POSIX isnan()
2017-07-22 21:33:20 -04:00
Sara Golemon
775b4b54d8
Use compatability zend_isnan() instead of POSIX isnan()
...
s/isnan/zend_isnan/g
2017-07-22 21:32:44 -04:00
Sara Golemon
e23c132940
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix compile-time optimization of NAN comparisons
2017-07-22 21:23:29 -04:00
Sara Golemon
1229b0f8cb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix compile-time optimization of NAN comparisons
2017-07-22 21:23:17 -04:00
Sara Golemon
c562d44321
Fix compile-time optimization of NAN comparisons
2017-07-22 21:22:51 -04:00
Frank Denis
401188cbf9
sodium ext: require libsodium >= 1.0.8
...
(but really, 1.0.9 should be the bare minimum)
2017-07-22 22:07:53 +02:00
Frank Denis
c499bd12f7
sodium ext: define crypto_aead_chacha20poly1305_ietf_KEYBYTES if needed
...
Some old libsodium versions didn't had a dedicated constant for the
IETF version of this construction.
2017-07-22 19:57:44 +02:00
Frank Denis
8a2e747a7b
sodium ext: remove redundant and obsolete macros
2017-07-22 17:50:22 +02:00
Nikita Popov
4672411ef5
Fix incorrect propagation of ZEND_BOOL in pass 1
...
BOOL (next to QM_ASSIGN) is one of the opcodes that can assign to
a temporary that is assigned in multiple branches. Pass 1 does
not check for this, so we should not try to handle it at that
point. Block pass and sccp will be able to treat this correctly.
2017-07-22 17:23:50 +02:00
Nikita Popov
96665fbfe0
Fix block removal if there are duplicate successors
2017-07-22 14:53:23 +02:00
Anatol Belski
1e9ad4a307
[ci skip] update NEWS
2017-07-22 14:15:32 +02:00
Anatol Belski
3fc52f1dc4
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
2017-07-22 14:14:22 +02:00
Anatol Belski
c068818ff3
[ci skip] update NEWS
2017-07-22 14:13:51 +02:00
Anatol Belski
e0c0007bd2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
[ci skip] update NEWS
2017-07-22 14:13:25 +02:00
Anatol Belski
ad12da4908
[ci skip] update NEWS
2017-07-22 14:12:45 +02:00
Bob Weinand
76ce874422
Merge branch 'PHP-7.1' into PHP-7.2
2017-07-22 11:16:48 +02:00
Bob Weinand
134e713be2
Merge branch 'PHP-7.0' into PHP-7.1
2017-07-22 11:14:54 +02:00
Bob Weinand
bad5d0d6c5
Fixed bug #74954 (null deref and segfault in zend_generator_resume())
2017-07-22 11:14:00 +02:00
Anatol Belski
14e8f9557b
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
2017-07-22 10:36:58 +02:00
Anatol Belski
4cb1151fff
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
2017-07-22 10:36:31 +02:00
Anatol Belski
e405ff59f9
Fixed bug #74968 PHP crashes when calling mysqli_result::fetch_object with an abstract class
2017-07-22 10:35:26 +02:00
Nikita Popov
3fa76ac54f
Merge branch 'PHP-7.1' into PHP-7.2
2017-07-21 23:22:56 +02:00
Nikita Popov
69ec51eb02
Fix DFG construction for VERIFY_RETURN
...
`use` only contains uses prior to definition. This was not
honoured for VERIFY_RETURN with a temporary operand.
The test case only breaks on PHP 7.2.
2017-07-21 23:20:56 +02:00
Anatol Belski
7ec8b8d49f
remove casts and ensure no out of bounds access
2017-07-21 22:26:37 +02:00