Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8cfe0db

Browse files
authored
Merge branch 'master' into wip/pkg-config
2 parents c823689 + 51dde97 commit 8cfe0db

File tree

3,965 files changed

+1427876
-184640
lines changed

Some content is hidden

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

3,965 files changed

+1427876
-184640
lines changed

.appveyor.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
2+
version: "{branch}.build.{build}"
3+
4+
image: Visual Studio 2015
5+
6+
branches:
7+
except:
8+
- PHP-5.6
9+
- PHP-7.0
10+
11+
skip_commits:
12+
files:
13+
- NEWS
14+
- UPGRADING*
15+
- README.*
16+
17+
clone_depth: 64
18+
19+
cache:
20+
- c:\build-cache
21+
- c:\build-cache\sdk -> .appveyor.yml
22+
23+
environment:
24+
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
25+
PHP_BUILD_OBJ_DIR: c:\obj
26+
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
27+
PHP_BUILD_SDK_BRANCH: php-sdk-2.0.0beta1
28+
# ext and env setup for tests
29+
#MYSQL_TEST_PASSWD: Password12!
30+
#MYSQL_TEST_USER: root
31+
#PDO_MYSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=root password=Password12!"
32+
#PDO_MYSQL_TEST_USER: root
33+
#PDO_MYSQL_TEST_PASS: Password12!
34+
#PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
35+
#PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
36+
#build permutations
37+
matrix:
38+
- THREAD_SAFE: 0
39+
OPCACHE: 0
40+
- THREAD_SAFE: 1
41+
OPCACHE: 1
42+
43+
services:
44+
# the setup scripts have to be touched, once some other db version is used
45+
- mysql
46+
- postgresql95
47+
48+
platform:
49+
- x64
50+
# - x86
51+
52+
build_script:
53+
- appveyor\build.bat
54+
55+
test_script:
56+
- appveyor\test.bat
57+

.editorconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
; http://editorconfig.org/
2+
3+
root = true
4+
5+
[*.{c,h}]
6+
charset = UTF-8
7+
end_of_line = LF
8+
indent_size = 4
9+
indent_style = tab
10+
insert_final_newline = true
11+
tab_width = 4
12+
trim_trailing_whitespace = true
13+
14+
[*.yml]
15+
indent_size = 2
16+
indent_style = space

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ config.cache
5656
config.h.in
5757
config.log
5858
config.nice
59-
config.nice.bat
6059
config.status
6160
config.sub
6261
config_vars.mk
@@ -148,6 +147,7 @@ tests/*/*/*.sh
148147
*/tests/*/*/*.sh
149148
*/*/tests/*.diff
150149
*/*/tests/*.out
150+
*/*/tests/*.out.png
151151
*/*/tests/*.php
152152
*/*/tests/*.exp
153153
*/*/tests/*.log
@@ -284,3 +284,4 @@ win32/*.positions
284284
win32/ext
285285
win32/phpts.def
286286
win32/wsyslog.h
287+
config.*.bat

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ addons:
88
- re2c
99
- libgmp-dev
1010
- libicu-dev
11-
- libmcrypt-dev
1211
- libtidy-dev
1312
- libenchant-dev
1413
- libaspell-dev

CODING_STANDARDS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ User Functions/Methods Naming Conventions
165165
'foobar'
166166
'foo_bar'
167167

168-
Internal Function Naming Convensions
168+
Internal Function Naming Conventions
169169
----------------------
170170

171171
1. Functions that are part of the external API should be named

EXTENSIONS

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ STATUS: Working
108108
SINCE: 5.1
109109
-------------------------------------------------------------------------------
110110
EXTENSION: pdo_dblib
111-
PRIMARY MAINTAINER: Unknown
112-
MAINTENANCE: Odd fixes
111+
PRIMARY MAINTAINER: Adam Baratz <[email protected]>
112+
MAINTENANCE: Maintained
113113
STATUS: Working
114114
SINCE: 5.1
115115
-------------------------------------------------------------------------------
@@ -132,7 +132,7 @@ STATUS: Working
132132
SINCE: 5.1
133133
-------------------------------------------------------------------------------
134134
EXTENSION: pdo_oci
135-
PRIMARY MAINTAINER: Unknown
135+
PRIMARY MAINTAINER: Christopher Jones <[email protected]>
136136
MAINTENANCE: Odd fixes
137137
STATUS: Working
138138
SINCE: 5.1
@@ -262,6 +262,12 @@ PRIMARY MAINTAINER: Derick Rethans <[email protected]>
262262
MAINTENANCE: Maintained
263263
STATUS: Working
264264
-------------------------------------------------------------------------------
265+
EXTENSION: enchant
266+
PRIMARY MAINTAINER: Unknown
267+
MAINTENANCE: Maintained
268+
STATUS: Working
269+
SINCE: 5.3
270+
-------------------------------------------------------------------------------
265271
EXTENSION: exif
266272
PRIMARY MAINTAINER: Marcus Boerger <[email protected]>
267273
MAINTENANCE: Maintained
@@ -281,7 +287,7 @@ STATUS: Working
281287
SINCE: 5.2
282288
-------------------------------------------------------------------------------
283289
EXTENSION: ftp
284-
PRIMARY MAINTAINER: Stefan Esser <[email protected]>
290+
PRIMARY MAINTAINER: Unknown
285291
MAINTENANCE: Odd fixes
286292
STATUS: Working
287293
-------------------------------------------------------------------------------
@@ -338,11 +344,6 @@ PRIMARY MAINTAINER: Rui Hirokawa <[email protected]>
338344
MAINTENANCE: Maintained
339345
STATUS: Working
340346
-------------------------------------------------------------------------------
341-
EXTENSION: mcrypt
342-
PRIMARY MAINTAINER: Derick Rethans <[email protected]>
343-
MAINTENANCE: Maintained
344-
STATUS: Working
345-
-------------------------------------------------------------------------------
346347
EXTENSION: opcache
347348
PRIMARY MAINTAINER: Dmitry Stogov <[email protected]>, Xinchen Hui <[email protected]>
348349
MAINTENANCE: Maintained

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--------------------------------------------------------------------
22
The PHP License, version 3.01
3-
Copyright (c) 1999 - 2016 The PHP Group. All rights reserved.
3+
Copyright (c) 1999 - 2017 The PHP Group. All rights reserved.
44
--------------------------------------------------------------------
55

66
Redistribution and use in source and binary forms, with or without

NEWS

Lines changed: 105 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,117 @@
11
PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
3-
?? ??? 2016, PHP 7.1.0
3+
?? ??? ????, PHP 7.2
4+
5+
- Calendar:
6+
. Fix integer overflows (Joshua Rogers)
47

58
- Core:
6-
. Implemented safe execution timeout handling, that prevents rundom crashes
7-
after "Maximum execution time exceeded" error. (Dmitry)
8-
. Fixed bug #62210 (Exceptions can leak temporary variables). (Dmitry, Bob)
9-
. Fixed bug #62814 (It is possible to stiffen child class members visibility).
10-
(Nikita)
11-
. Fixed bug #69989 (Generators don't participate in cycle GC). (Nikita)
12-
. Fixed bug #71572 (String offset assignment from an empty string inserts
13-
null byte). (Francois)
14-
. Implemented the RFC `Support Class Constant Visibility`. (Sean DuBois,
15-
Reeze Xia, Dmitry)
16-
. Added void return type. (Andrea)
17-
. Added support for negative string offsets in string offset syntax and
18-
various string functions. (Francois)
19-
. Added a form of the list() construct where keys can be specified. (Andrea)
20-
. Number operators taking numeric strings now emit E_NOTICEs or E_WARNINGs
21-
when given malformed numeric strings. (Andrea)
22-
. (int), intval() where $base is 10 or unspecified, settype(), decbin(),
23-
decoct(), dechex(), integer operators and other conversions now always
24-
respect scientific notation in numeric strings. (Andrea)
25-
26-
- FTP:
27-
. Implemented FR #55651 (Option to ignore the returned FTP PASV address).
28-
(abrender at elitehosts dot com)
29-
30-
- Intl:
31-
. Added IntlTimeZone::getWindowsID() and
32-
IntlTimeZone::getIDForWindowsID(). (Sara)
33-
34-
- Hash:
35-
. Added SHA3 fixed mode algorithms (224, 256, 384, and 512 bit). (Sara)
36-
37-
- JSON:
38-
. Escaped U+2028 and U+2029 when JSON_UNESCAPED_UNICODE is supplied as
39-
json_encode options and added JSON_UNESCAPED_LINE_TERMINATORS to restore
40-
the previous behaviour. (Eddie Kohler)
41-
42-
- PDO_Firebird:
43-
. Fixed bug #60052 (Integer returned as a 64bit integer on X86_64). (Mariuz)
44-
45-
- Pgsql:
46-
. Implemented FR #31021 (pg_last_notice() is needed to get all notice
47-
messages). (Yasuo)
48-
. Implemented FR #48532 (Allow pg_fetch_all() to index numerically). (Yasuo)
9+
. Removed IS_TYPE_IMMUTABLE (it's the same as COPYABLE & !REFCOUNTED). (Dmitry)
10+
. Removed the sql.safe_mode directive. (Kalle)
11+
. Removed support for Netware. (Kalle)
12+
. Fixed bug #54535 (WSA cleanup executes before MSHUTDOWN). (Kalle)
13+
. Implemented FR #69791 (Disallow mail header injections by extra headers)
14+
(Yasuo)
15+
. Implemented FR #49806 (proc_nice() for Windows). (Kalle)
16+
. Fix pthreads detection when cross-compiling (ffontaine)
17+
. Fixed memory leaks caused by exceptions thrown from destructors. (Bob,
18+
Dmitry).
19+
. Fixed bug #73215 (uniqid() should use better random source). (Yasuo)
20+
. Fixed bug #73337 (try/catch not working with two exceptions inside a same
21+
operation). (Dmitry)
22+
. Implemented FR #72768 (Add ENABLE_VIRTUAL_TERMINAL_PROCESSING flag for
23+
php.exe). (Michele Locati)
24+
. Implemented "Convert numeric keys in object/array casts" RFC, fixes
25+
bugs #53838, #61655, #66173, #70925, #72254, etc. (Andrea)
26+
. Raised minimum supported Windows versions to Windows 7/Server 2008 R2.
27+
(Anatol)
28+
29+
- Date:
30+
. Fixed bug #69587 (DateInterval properties and isset). (jhdxr)
31+
32+
- DOM:
33+
. Fixed bug #67474 (getElementsByTagNameNS filter on default ns). (aboks)
34+
35+
- EXIF:
36+
. Added support for vendor specific tags for the following formats:
37+
Samsung, DJI, Panasonic, Sony, Pentax, Minolta & Sigma/Foveon. (Kalle)
38+
. Fixed bug #72682 (exif_read_data() fails to read all data for some
39+
images). (Kalle)
40+
. Fixed bug #71534 (Type confusion in exif_read_data() leading to heap
41+
overflow in debug mode). (hlt99 at blinkenshell dot org, Kalle)
42+
. Fixed bug #68547 (Exif Header component value check error).
43+
(sjh21a at gmail dot com, Kalle)
44+
. Fixed bug #66443 (Corrupt EXIF header: maximum directory nesting level
45+
reached for some cameras). (Kalle)
46+
. Fixed Redhat bug #1362571 (PHP not returning full results for
47+
exif_read_data function). (Kalle)
48+
49+
- FPM:
50+
. Configuration to limit fpm slow log trace callers. (Sannis)
51+
52+
- GD:
53+
. Implemented imageresolution as getter and setter (Christoph)
54+
55+
- GMP:
56+
. Fixed bug #70896 (gmp_fact() silently ignores non-integer input). (Sara)
57+
58+
- Mbstring:
59+
. Implemented request #66024 (mb_chr() and mb_ord()). (Masakielastic, Yasuo)
60+
. Implemented request #65081 (mb_scrub()). (Masakielastic, Yasuo)
61+
. Implemented request #69086 (enhancement for mb_convert_encoding() that
62+
handles multibyte replacement char nicely). (Masakielastic, Yasuo)
63+
. Added array input support to mb_convert_encoding(). (Yasuo)
64+
. Added array input support to mb_check_encoding(). (Yasuo)
65+
. Fixed bug #69079 (enhancement for mb_substitute_character). (masakielastic)
66+
67+
- Mcrypt:
68+
. The deprecated mcrypt extension has been moved to PECL. (leigh)
69+
70+
- mysqlnd:
71+
. Fixed bug #73800 (sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE).
72+
(vanviegen)
73+
74+
- OpenSSL:
75+
. Fixed bug #71519 (add serial hex to return value array). (xrobau)
76+
77+
- PCRE:
78+
. Fixed bug #61780 (Inconsistent PCRE captures in match results). (cmb)
79+
80+
- PDO:
81+
. Add "Sent SQL" to debug dump for emulated prepares. (Adam Baratz)
82+
83+
- PDO_DBlib:
84+
. Fixed bug #73234 (Emulated statements let value dictate parameter type).
85+
(Adam Baratz)
86+
. Fixed bug #73396 (bigint columns are returned as strings). (Adam Baratz)
4987

5088
- Session:
51-
. Improved fix for bug #68063 (Empty session IDs do still start sessions).
52-
(Yasuo)
53-
. Fixed bug #71038 (session_start() returns TRUE on failure).
54-
Session save handlers must return 'string' always for successful read.
55-
i.e. Non-existing session read must return empty string. PHP 7.0 is made
56-
not to tolerate buggy return value. (Yasuo)
57-
. Fixed bug #71394 (session_regenerate_id() must close opened session on
58-
errors). (Yasuo)
89+
. Fixed bug #73461 (Prohibit session save handler recursion). (Yasuo)
90+
. PR #2233 Removed register_globals related code and "!" can be used as $_SESSION key name. (Yasuo)
91+
. Improved bug #73100 fix. 'user' save handler can only be set by session_set_save_handler()
92+
. Fixed bug #69582 (session not readable by root in CLI). (EvgeniySpinov)
93+
94+
- SOAP:
95+
. Fixed bug #69137 (Peer verification fails when using a proxy with SoapClient)
96+
(Keith Smiley)
5997

6098
- SQLite3:
61-
. Implemented FR #71159 (Upgraded bundled SQLite lib to 3.9.2). (Laruence)
99+
. Update to Sqlite 3.15.2. (cmb)
62100

63101
- Standard:
64-
. Fixed bug #71100 (long2ip() doesn't accept integers in strict mode).
65-
(Laruence)
66-
. Implemented FR #55716 (Add an option to pass a custom stream context to
67-
get_headers()). (Ferenc)
68-
. Additional validation for parse_url() for login/pass components).
69-
(Ilia) (Julien)
70-
. Implemented FR #69359 (Provide a way to fetch the current environment
71-
variables). (Ferenc)
72-
. unpack() function accepts an additional optional argument $offset. (Dmitry)
102+
. Add subject to mail log. (tomsommer)
103+
. Fixed bug #31875 (get_defined_functions additional param to exclude
104+
disabled functions). (willianveiga)
105+
. Fixed bug #69442 (closing of fd incorrect when PTS enabled). (jaytaph)
106+
107+
- XML:
108+
. Moved utf8_encode() and utf8_decode() to the Standard extension. (Andrea)
109+
. Fixed bug #72135 (malformed XML causes fault) (edgarsandi)
110+
111+
- XMLRPC:
112+
. Use Zend MM for allocation in bundled libxmlrpc (Joe)
113+
114+
- ZIP:
115+
. Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb)
73116

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

README.GIT-RULES

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,26 @@ Having said that, here are the organizational rules::
3838
6. Test your changes before committing them. We mean it. Really.
3939
To do so use "make test".
4040

41-
7. For development use the --enable-maintainer-zts switch to ensure your
42-
code handles TSRM correctly and doesn't break for those who need that.
41+
7. For development use the --enable-debug switch to avoid memory leaks
42+
and the --enable-maintainer-zts switch to ensure your code handles
43+
TSRM correctly and doesn't break for those who need that.
4344

4445
Currently we have the following branches in use::
4546

4647
master The active development branch.
4748

49+
PHP-7.1 Is used to release the PHP 7.1.x series. This is a prerelease
50+
version.
51+
52+
PHP-7.0 Is used to release the PHP 7.0.x series. This is a current
53+
stable version and is open for bugfixes only.
54+
4855
PHP-5.6 Is used to release the PHP 5.6.x series. This is a current
4956
stable version and is open for bugfixes only.
5057

51-
PHP-5.5 Is used to release the PHP 5.5.x series. This is an old
52-
stable version and is open for security fixes only.
58+
PHP-5.5 This branch is closed.
5359

54-
PHP-5.4 Is used to release the PHP 5.4.x series. This is an old
55-
stable version and is open for security fixes only.
60+
PHP-5.4 This branch is closed.
5661

5762
PHP-5.3 This branch is closed.
5863

0 commit comments

Comments
 (0)