Skip to content

Commit a5e71c8

Browse files
committed
Merge branch 'master' into jit-dynasm
* master: (89 commits) Replace ASN1_STRING_data with ASN1_STRING_get0_data Fix leak in WDDX serialization Travis: Use opcache in release build Implemented FR #71520 Fixed bug #69373 Fix bug #74607: Don't check for bi-directional compatibility in traits Fix bug #55407 Fixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message openssl_pkcs12_read: add missing BIO_free Add basic test for posix_setegid function Set timezone for intl/test/bug74298.phpt Revert "merge PR php#2290: enable opcache in CLI in 7.1+" PCRE_EXTRA_MARK is useful only for preg_replace_callbakc(). Removed branch expectations. Added support for PCRE JIT fast path API Escape value passed to exec() Ignore spurious stderr output from lsof ZVAL_COPY_UNREF() micro-optimization test for ErrorException::getSeverity(); improve dns (checkdnsrr) test coverage test to function forward_static_call_array(); ...
2 parents dfe71ec + 8baf12b commit a5e71c8

File tree

174 files changed

+10582
-879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+10582
-879
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ before_script:
6060

6161
# Run PHPs run-tests.php
6262
script:
63-
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 1 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
63+
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
6464

6565
after_success:
6666
- ccache --show-stats

NEWS

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ PHP NEWS
33
?? ??? ????, PHP 7.2
44

55
- Core:
6-
. Added ZEND_COUNT, ZEND_GET_CLASS, ZEMD_GET_CALLED_CLASS, ZEND_GET_TYPE
7-
instructions, to implement corresponding builtin functions. (Dmitry)
6+
. Added ZEND_COUNT, ZEND_GET_CLASS, ZEND_GET_CALLED_CLASS, ZEND_GET_TYPE,
7+
ZEND_FUNC_NUM_ARGS, ZEND_FUNC_GET_ARGS instructions, to implement
8+
corresponding builtin functions. (Dmitry)
89
. "Countable" interface is moved from SPL to Core. (Dmitry)
910
. Added ZEND_IN_ARRAY instruction, implementing optimized in_array() builtin
1011
function, through hash lookup in flipped array. (Dmitry)
1112
. Removed IS_TYPE_IMMUTABLE (it's the same as COPYABLE & !REFCOUNTED). (Dmitry)
1213
. Removed the sql.safe_mode directive. (Kalle)
1314
. Removed support for Netware. (Kalle)
15+
. Renamed ReflectionClass::isIterateable() to ReflectionClass::isIterable()
16+
(alias original name for BC). (Sara)
1417
. Fixed bug #54535 (WSA cleanup executes before MSHUTDOWN). (Kalle)
1518
. Implemented FR #69791 (Disallow mail header injections by extra headers)
1619
(Yasuo)
@@ -52,6 +55,8 @@ PHP NEWS
5255
a fatal error). (pmmaga)
5356
. Fixed bug #63384 (Cannot override an abstract method with an abstract
5457
method). (pmmaga, wes)
58+
. Fixed bug #74607 (Traits enforce different inheritance rules). (pmmaga)
59+
. Fixed misparsing of abstract unix domain socket names. (Sara)
5560

5661
- BCMath:
5762
. Fixed bug #46564 (bcmod truncates fractionals). (liborm85)
@@ -60,10 +65,20 @@ PHP NEWS
6065
. Fix integer overflows (Joshua Rogers)
6166

6267
- Date:
68+
. Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat).
69+
(kelunik)
6370
. Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
6471
. Fixed bug #74404 (Wrong reflection on DateTimeZone::getTransitions).
6572
(krakjoe)
6673
. Fixed bug #74080 (add constant for RFC7231 format datetime). (duncan3dc)
74+
. Fixed bug #74639 (implement clone for DatePeriod and DateInterval).
75+
(andrewnester)
76+
. Implemented FR #71520 (Adding the DateTime constants to the
77+
DateTimeInterface interface). (Majkl578)
78+
79+
- Dba:
80+
. Fixed bug #72885 (flatfile: dba_fetch() fails to read replaced entry).
81+
(Anatol)
6782

6883
- DOM:
6984
. Fixed bug #67474 (getElementsByTagNameNS filter on default ns). (aboks)
@@ -74,7 +89,8 @@ PHP NEWS
7489

7590
- EXIF:
7691
. Added support for vendor specific tags for the following formats:
77-
Samsung, DJI, Panasonic, Sony, Pentax, Minolta & Sigma/Foveon. (Kalle)
92+
Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon, AGFA,
93+
Kyocera, Ricoh & Epson. (Kalle)
7894
. Fixed bug #72682 (exif_read_data() fails to read all data for some
7995
images). (Kalle)
8096
. Fixed bug #71534 (Type confusion in exif_read_data() leading to heap
@@ -92,6 +108,7 @@ PHP NEWS
92108
(Mike)
93109

94110
- FTP:
111+
. Fixed bug #74598 (ftp:// wrapper ignores context arg). (Sara)
95112
. Implement MLSD for structured listing of directories. (blar)
96113

97114
- GD:
@@ -121,6 +138,7 @@ PHP NEWS
121138
. Added array input support to mb_convert_encoding(). (Yasuo)
122139
. Added array input support to mb_check_encoding(). (Yasuo)
123140
. Fixed bug #69079 (enhancement for mb_substitute_character). (masakielastic)
141+
. Update to oniguruma version 6.3.0. (Remi)
124142

125143
- Mcrypt:
126144
. The deprecated mcrypt extension has been moved to PECL. (leigh)
@@ -136,6 +154,7 @@ PHP NEWS
136154
. Fixed bug #71519 (add serial hex to return value array). (xrobau)
137155

138156
- PCRE:
157+
. Added support for PCRE JIT fast path API. (dmitry)
139158
. Fixed bug #61780 (Inconsistent PCRE captures in match results). (cmb)
140159

141160
- PDO:
@@ -165,6 +184,7 @@ PHP NEWS
165184
(mhagstrand)
166185
. Fixed bug #74196 (phar does not correctly handle names containing dots).
167186
(mhagstrand)
187+
. Fixed bug #74386 (Phar::__construct reflection incorrect). (villfa)
168188

169189
- PHPDBG
170190
. Added extended_value to opcode dump output. (Sara)
@@ -196,6 +216,7 @@ PHP NEWS
196216
. Fixed bug #72979 (money_format stores wrong length AIX). (matthieu.sarter)
197217
. Fixed bug #74300 (unserialize accepts two plus/minus signs for float number exponent part).
198218
(xKerman)
219+
. Fixed bug #74556 (stream_socket_get_name() returns '\0'). (Sara)
199220

200221
- XML:
201222
. Moved utf8_encode() and utf8_decode() to the Standard extension. (Andrea)
@@ -209,6 +230,7 @@ PHP NEWS
209230

210231
- ZIP:
211232
. Add support for encrypted archives. (Remi)
233+
. Use of bundled libzip is deprecated, --with-libzip option is recommended. (Remi)
212234
. Fixed Bug #73803 (Reflection of ZipArchive does not show public properties). (Remi)
213235

214236
<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

UPGRADING

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ PHP 7.2 UPGRADE NOTES
5656
parameter (assoc) is null. Previously JSON_OBJECT_AS_ARRAY was always
5757
ignored.
5858

59-
- PCRE:
60-
. preg_match() and other PCRE functions now distinguish between unmatched
61-
subpatterns and empty matches by reporting NULL and "" (empty string),
62-
respectively. Formerly, either was reported as empty string.
63-
6459
- Session:
6560
. Removed register_globals related code and "!" can be used as $_SESSION key name.
6661
. Session is made to manage session status correctly and prevents invalid operations.
@@ -109,6 +104,9 @@ PHP 7.2 UPGRADE NOTES
109104

110105
- PCRE:
111106
. Added `J` modifier for setting PCRE_DUPNAMES.
107+
. Added `PREG_UNMATCHED_AS_NULL` flag to allow distinguish between unmatched
108+
subpatterns and empty matches by reporting NULL and "" (empty string),
109+
respectively.
112110

113111
- Standard:
114112
. Simplified password hashing API updated to support Argon2i hashes when PHP is compiled with libargon2
@@ -238,7 +236,8 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2
238236

239237
- EXIF:
240238
. Added extended exif tag support for the following formats:
241-
Samsung, DJI, Panasonic, Sony, Pentax, Minolta & Sigma/Foveon.
239+
Samsung, DJI, Panasonic, Sony, Pentax, Minolta, Sigma/Foveon,
240+
AGFA, Kyocera, Ricoh & Epson.
242241

243242
- GD:
244243
. Removed --enable-gd-native-ttf configuration option which was unused as
@@ -277,6 +276,9 @@ See also: https://wiki.php.net/rfc/deprecations_php_7_2
277276
. IMG_EFFECT_MULTIPLY
278277
. IMG_BMP
279278

279+
- PCRE
280+
. PREG_UNMATCHED_AS_NULL
281+
280282
- Standard:
281283
. PASSWORD_ARGON2_DEFAULT_MEMORY_COST
282284
. PASSWORD_ARGON2_DEFAULT_TIME_COST

0 commit comments

Comments
 (0)