Skip to content

Commit 683efb4

Browse files
author
rjhdby
committed
Merge branch 'master' of https://github.com/php/php-src 
2 parents 7ed6ae9 + be3183e commit 683efb4

File tree

4,848 files changed

+13930
-57222
lines changed

Some content is hidden

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

4,848 files changed

+13930
-57222
lines changed

‎.appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ environment:
3030
matrix:
3131
- THREAD_SAFE: 0
3232
OPCACHE: 0
33+
PARALLEL: -j2
3334
- THREAD_SAFE: 1
3435
OPCACHE: 1
36+
PARALLEL:
3537
INTRINSICS: AVX
3638

3739
services:

‎.editorconfig

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
# http://editorconfig.org/
1+
# https://editorconfig.org/
22

33
root = true
44

5-
[*.{c,h,awk,w32,bat,mk,frag}]
5+
[*]
6+
tab_width = 4
7+
8+
[*.{c,h,y,awk,w32,bat,mk,frag,cpp}]
69
charset = utf-8
710
end_of_line = lf
811
indent_size = 4
912
indent_style = tab
10-
tab_width = 4
1113
trim_trailing_whitespace = true
1214
insert_final_newline = true
1315

14-
[*.{php,phpt}]
16+
[*.{php,phpt,inc}]
1517
charset = utf-8
1618
end_of_line = lf
1719
indent_size = 4
@@ -31,5 +33,15 @@ insert_final_newline = true
3133
charset = utf-8
3234
end_of_line = lf
3335
indent_style = space
34-
trim_trailing_whitespace = false
36+
trim_trailing_whitespace = true
37+
insert_final_newline = true
38+
max_line_length = 80
39+
40+
[COMMIT_EDITMSG]
41+
charset = utf-8
42+
end_of_line = lf
43+
indent_size = 4
44+
indent_style = space
45+
trim_trailing_whitespace = true
3546
insert_final_newline = true
47+
max_line_length = 80

‎.gdbinit

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ define ____printzv_contents
165165
set $type = $zvalue->u1.v.type
166166

167167
# 15 == IS_INDIRECT
168-
if $type > 5 && $type != 15
168+
if $type > 5 && $type < 12
169169
printf "(refcount=%d) ", $zvalue->value.counted->gc.refcount
170170
end
171171

@@ -215,12 +215,8 @@ define ____printzv_contents
215215
if ! $arg1
216216
if $handlers->get_properties == &zend_std_get_properties
217217
if $zobj->properties
218+
printf "\nProperties "
218219
set $ht = $zobj->properties
219-
else
220-
set $ht = &$zobj->ce->properties_info
221-
end
222-
printf "\nProperties "
223-
if $ht
224220
set $ind = $ind + 1
225221
____print_ht $ht 1
226222
set $ind = $ind - 1
@@ -230,7 +226,19 @@ define ____printzv_contents
230226
set $i = $i - 1
231227
end
232228
else
233-
echo "not found"
229+
printf " {\n"
230+
set $ht = &$zobj->ce->properties_info
231+
set $k = 0
232+
set $num = $ht->nNumUsed
233+
while $k < $num
234+
set $p = (Bucket*)($ht->arData + $k)
235+
set $name = $p->key
236+
set $prop = (zend_property_info*)$p->val.value.ptr
237+
set $val = (zval*)((char*)$zobj + $prop->offset)
238+
printf "%s => ", $name->val
239+
printzv $val
240+
set $k = $k + 1
241+
end
234242
end
235243
end
236244
end
@@ -250,17 +258,20 @@ define ____printzv_contents
250258
printf "CONSTANT_AST"
251259
end
252260
if $type == 13
253-
printf "_BOOL"
261+
printf "indirect: "
262+
____printzv $zvalue->value.zv $arg1
254263
end
255264
if $type == 14
256-
printf "CALLABLE"
265+
printf "pointer: %p", $zvalue->value.ptr
257266
end
258267
if $type == 15
259-
printf "indirect: "
260-
____printzv $zvalue->value.zv $arg1
268+
printf "_ERROR"
269+
end
270+
if $type == 16
271+
printf "_BOOL"
261272
end
262273
if $type == 17
263-
printf "pointer: %p", $zvalue->value.ptr
274+
printf "CALLABLE"
264275
end
265276
if $type == 18
266277
printf "ITERABLE"
@@ -269,9 +280,9 @@ define ____printzv_contents
269280
printf "VOID"
270281
end
271282
if $type == 20
272-
printf "_ERROR"
283+
printf "_NUMBER"
273284
end
274-
if $type == 16 || $type > 20
285+
if $type > 20
275286
printf "unknown type %d", $type
276287
end
277288
printf "\n"

‎.gitignore

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ Makefile
8181
Makefile.fragments
8282
Makefile.objects
8383

84-
# Generated by `./buildconf` or `cd ext/name && phpize`
85-
install-sh
86-
missing
87-
mkinstalldirs
88-
8984
# RPM specification file generated by `./configure`
9085
/php.spec
9186

@@ -110,7 +105,6 @@ config.h.in
110105
/ext/iconv/php_iconv_supports_errno.h
111106
/ext/iconv/php_php_iconv_h_path.h
112107
/ext/iconv/php_php_iconv_impl.h
113-
/ext/mbstring/oniguruma/oniguruma.h
114108
/main/build-defs.h
115109
/main/php_config.h.in
116110
/main/php_config.h
@@ -267,7 +261,7 @@ phpt.*
267261
tmp-php.ini
268262

269263
# ------------------------------------------------------------------------------
270-
# Generated by GCC's gcov and LCOV via Makefile.gcov and gcov.php.net
264+
# Generated by GCC's gcov and LCOV via build/Makefile.gcov and gcov.php.net
271265
# ------------------------------------------------------------------------------
272266
*.gcda
273267
*.gcno
@@ -300,6 +294,5 @@ tmp-php.ini
300294
!/ext/fileinfo/libmagic/config.h
301295
!/ext/fileinfo/libmagic.patch
302296
!/ext/fileinfo/magicdata.patch
303-
!/ext/mbstring/oniguruma.patch
304297
!/ext/pcre/pcre2lib/config.h
305298
!/win32/build/Makefile

‎EXTENSIONS

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ COMMENT: Use PostgreSQL 7.0.x or later. PostgreSQL 6.5.3 or less hav
171171
-------------------------------------------------------------------------------
172172
EXTENSION: sqlite3
173173
PRIMARY MAINTAINER: Scott MacVicar <scottmac@php.net> (2008 - 2011)
174-
Christoph M. Becker <cmb@php.net> (2016 - 2018)
174+
Christoph M. Becker <cmb@php.net> (2016 - 2019)
175175
MAINTENANCE: Maintained
176176
STATUS: Working
177177
SINCE: 5.3
@@ -327,7 +327,7 @@ STATUS: Working
327327
-------------------------------------------------------------------------------
328328
EXTENSION: gd
329329
PRIMARY MAINTAINER: Pierre-Alain Joye <pajoye@php.net> (2002 - 2016)
330-
Christoph M. Becker <cmb@php.net> (2015 - 2018)
330+
Christoph M. Becker <cmb@php.net> (2015 - 2019)
331331
MAINTENANCE: Maintained
332332
STATUS: Working
333333
-------------------------------------------------------------------------------
@@ -337,7 +337,7 @@ MAINTENANCE: Unknown
337337
STATUS: Working
338338
-------------------------------------------------------------------------------
339339
EXTENSION: gmp
340-
PRIMARY MAINTAINER: Stanislav Malyshev <stas@php.net> (2000 - 2018)
340+
PRIMARY MAINTAINER: Stanislav Malyshev <stas@php.net> (2000 - 2019)
341341
Antony Dovgal <tony2001@php.net> (2005 - 2010)
342342
MAINTENANCE: Maintained
343343
STATUS: Working
@@ -357,7 +357,7 @@ MAINTENANCE: Maintained
357357
STATUS: Working
358358
-------------------------------------------------------------------------------
359359
EXTENSION: intl
360-
PRIMARY MAINTAINER: Stanislav Malyshev <stas@php.net> (2008 - 2018)
360+
PRIMARY MAINTAINER: Stanislav Malyshev <stas@php.net> (2008 - 2019)
361361
Anatol Belski <ab@php.net> (2017 - 2018)
362362
MAINTENANCE: Maintained
363363
STATUS: Working
@@ -367,6 +367,7 @@ EXTENSION: imap
367367
PRIMARY MAINTAINER: Chuck Hagenbuch <chuck@horde.org> (1999 - 2004)
368368
Ilia Alshanetsky <iliaa@php.net> (2002 - 2010)
369369
Pierre-Alain Joye <pajoye@php.net> (2008 - 2010)
370+
Bishop Bettini (2018 - 2019)
370371
MAINTENANCE: Maintained
371372
STATUS: Working
372373
-------------------------------------------------------------------------------
@@ -419,6 +420,7 @@ EXTENSION: phar
419420
PRIMARY MAINTAINER: Greg Beaver <cellog@php.net> (2008 - 2009)
420421
Marcus Börger <helly@php.net> (2008 - 2008)
421422
Steph Fox <sfox@php.net> (2008 - 2008)
423+
Bishop Bettini (2018 - 2019)
422424
MAINTENANCE: Maintained
423425
STATUS: Working
424426
SINCE: 5.3

‎INSTALL

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ PHP NEWS
33
?? ??? ????, PHP 8.0.0alpha1
44

55
- Core:
6+
. Removed the pdo_odbc.db2_instance_name php.ini directive. (Kalle)
67
. Fixed bug #77619 (Wrong reflection on MultipleIterator::__construct).
78
(Fabien Villepinte)
89

@@ -19,4 +20,7 @@ PHP NEWS
1920
- phpdbg:
2021
. Fixed bug #76596 (phpdbg support for display_errors=stderr). (kabel)
2122

23+
- sodium:
24+
. Fixed bug #77646 (sign_detached() strings not terminated). (Frank)
25+
2226
<<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

‎README.EXT_SKEL

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)