Nikita Popov
daa2b75c76
Fix some sizeof(zend_long) > sizeof(size_t) issues
...
Fix a couple of mistakes that are only relevant if
sizeof(zend_long) > sizeof(size_t).
* Fix cast order in string offset check: Negation should happen
after the (zend_long) cast, otherwise sign extension does not
occur.
* Use Z_UL in zend_inference.
* Use aligned size for HT_USED_SIZE in zend_persist: The issue is
that on x86-32 uint64_t is considered to be 4-aligned, so the
alignment assumption does not hold.
2016-09-05 15:33:02 +02:00
David Walker
750f3d3f65
Improve getaddrinfo implementation
...
* Fix some leaks
* Improve some comparisons and casts
* Raise a notice when an unknown hint is provided
2016-09-05 14:27:31 +02:00
Nikita Popov
b8b47ed49c
Merge branch 'PHP-7.1'
...
[ci skip]
2016-09-05 14:23:54 +02:00
Nikita Popov
a463da7204
Merge branch 'PHP-7.0' into PHP-7.1
...
[ci skip]
2016-09-05 14:22:45 +02:00
Nikita Popov
1cd0c80acf
Merge branch 'PHP-5.6' into PHP-7.0
...
[ci skip]
2016-09-05 14:22:29 +02:00
Nikita Popov
b92cb6b238
Limit editorconfig to C code
...
PHPT files do not follow this.
[ci skip]
2016-09-05 14:22:13 +02:00
Christoph M. Becker
cc8691cc4b
Update UPGRADING wrt. commit c4fe264b
2016-09-05 11:27:46 +02:00
Julien Pauli
345a032769
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Updated NEWS
Updated NEWS
Updated NEWS
2016-09-05 10:19:29 +02:00
Julien Pauli
5f9fe06555
Updated NEWS
2016-09-05 10:19:21 +02:00
Julien Pauli
51de65c20e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Updated NEWS
Updated NEWS
2016-09-05 10:18:57 +02:00
Julien Pauli
d185c2f13a
Updated NEWS
2016-09-05 10:18:39 +02:00
Julien Pauli
14d754d6fd
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Updated NEWS
2016-09-05 10:18:08 +02:00
Julien Pauli
1abbcc8cc5
Updated NEWS
2016-09-05 10:17:56 +02:00
Julien Pauli
2fff8196a4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix #72972 , Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
2016-09-05 10:13:31 +02:00
Julien Pauli
376dcaa39a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix #72972 , Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
2016-09-05 10:13:19 +02:00
Julien Pauli
e5047ac2d2
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix #72972 , Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
2016-09-05 10:12:49 +02:00
Julien Pauli
9834978a8b
Fix #72972 , Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
2016-09-05 10:08:42 +02:00
Stanislav Malyshev
9470cdd4c3
Merge branch 'pull-request/1864'
...
* pull-request/1864:
Tiny tweak for `$header` initialization, it should always be an array
Minor tweaks
2016-09-05 00:51:01 -07:00
Stanislav Malyshev
28bc2d797e
Merge branch 'pull-request/2025'
...
* pull-request/2025:
Change the name of the second parameter of image writer functions
2016-09-05 00:44:01 -07:00
Stanislav Malyshev
6e7d4fdde4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Change the name of the second parameter of image writer functions
2016-09-05 00:43:52 -07:00
Christoph M. Becker
f203de0748
Change the name of the second parameter of image writer functions
...
As of PHP 5.4.0 the second parameter of all image writer functions (except
imagexbm) accepts also a stream resource. Therefore the parameter name
`filename` is inappropriate. We change it to `to` according to what it's
already called in _php_image_output_ctx().
We consider the reflection only related BC break acceptable for a minor version.
2016-09-05 00:43:30 -07:00
Stanislav Malyshev
bd81216768
Merge branch 'pull-request/1958'
...
* pull-request/1958:
Added editorconfig file
2016-09-05 00:41:57 -07:00
Stanislav Malyshev
3e69fa2ad1
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Added editorconfig file
2016-09-05 00:41:29 -07:00
Stanislav Malyshev
0d4411d7c8
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Added editorconfig file
2016-09-05 00:41:26 -07:00
Stanislav Malyshev
4e0605044a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Added editorconfig file
2016-09-05 00:41:23 -07:00
Richard Fussenegger
5c38fbe543
Added editorconfig file
2016-09-05 00:40:58 -07:00
Stanislav Malyshev
7abd0cada0
Merge branch 'pull-request/2018'
...
* pull-request/2018:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:39:46 -07:00
Stanislav Malyshev
2213c43e17
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:39:06 -07:00
Stanislav Malyshev
9650b8e241
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:39:01 -07:00
Stanislav Malyshev
92db92c620
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Implement #47456 : Missing PCRE option 'J'
2016-09-05 00:38:57 -07:00
Christoph M. Becker
39423e425d
Implement #47456 : Missing PCRE option 'J'
...
While it is possible to force the same behavior by setting the internal
option (?J), having a dedicated modifier appears to be useful. After all,
J is even listed on the "Pattern Modifiers" man page[1], but the description
referrs to (?J).
[1] <http://php.net/manual/en/reference.pcre.pattern.modifiers.php >
2016-09-05 00:30:48 -07:00
Stanislav Malyshev
20edfee907
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Recognize TDS versions 7.3 and 7.4
2016-09-05 00:29:24 -07:00
Stanislav Malyshev
f57c059b96
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Recognize TDS versions 7.3 and 7.4
2016-09-05 00:29:21 -07:00
Stanislav Malyshev
b5f9427ca9
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Recognize TDS versions 7.3 and 7.4
2016-09-05 00:29:18 -07:00
Stanislav Malyshev
cee363d609
Merge branch 'pull-request/2061' into PHP-5.6
...
* pull-request/2061:
Recognize TDS versions 7.3 and 7.4
2016-09-05 00:29:11 -07:00
Stanislav Malyshev
a482739cc0
Merge branch 'pull-request/2095'
...
* pull-request/2095:
Use integer placeholders, since values can vary with the TDS version
2016-09-05 00:19:59 -07:00
Stanislav Malyshev
c9b7d0d65b
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Use integer placeholders, since values can vary with the TDS version
2016-09-05 00:19:39 -07:00
Stanislav Malyshev
498e36294e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Use integer placeholders, since values can vary with the TDS version
2016-09-05 00:19:34 -07:00
Stanislav Malyshev
54f6c8d6df
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use integer placeholders, since values can vary with the TDS version
2016-09-05 00:19:26 -07:00
Adam Baratz
84d495055d
Use integer placeholders, since values can vary with the TDS version
2016-09-05 00:17:59 -07:00
Stanislav Malyshev
013425fa37
Merge branch 'PHP-7.1'
...
* PHP-7.1:
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
2016-09-04 23:24:36 -07:00
Stanislav Malyshev
8c16f2262f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
2016-09-04 23:24:31 -07:00
David Carlier
19350b6b73
phpdbg: couple of network function return checks. Possible
...
overflow when copy the socket_path configuration.
2016-09-04 23:18:51 -07:00
Stanislav Malyshev
f856cdb32b
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Same issue as #72926 in another place.
2016-09-04 20:59:00 -07:00
Stanislav Malyshev
defa47b94d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Same issue as #72926 in another place.
2016-09-04 20:58:09 -07:00
Stanislav Malyshev
a2fdf0f413
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Same issue as #72926 in another place.
2016-09-04 20:57:46 -07:00
Stanislav Malyshev
b578580e88
Same issue as #72926 in another place.
2016-09-04 20:49:34 -07:00
Stanislav Malyshev
fca8c2772b
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Sync fix for bug #72910 with current upstream
2016-09-04 19:16:05 -07:00
Stanislav Malyshev
3bfd06061e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Sync fix for bug #72910 with current upstream
2016-09-04 19:15:45 -07:00
Stanislav Malyshev
c3dfe57c23
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Sync fix for bug #72910 with current upstream
2016-09-04 19:15:30 -07:00