Joe Watkins
cdcfb4903d
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix bug #74457 Wrong reflection on XMLReader::expand
2017-05-02 06:25:59 +01:00
Joe Watkins
6bd30e8f1a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #74457 Wrong reflection on XMLReader::expand
2017-05-02 06:25:21 +01:00
Fabien Villepinte
4c0e50c88a
Fix bug #74457 Wrong reflection on XMLReader::expand
2017-05-02 06:24:46 +01:00
Joe Watkins
6b798e0ea1
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys
2017-05-02 06:22:37 +01:00
Joe Watkins
2735318c7b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys
2017-05-02 06:21:54 +01:00
Fabien Villepinte
f50df1d0e3
Fix bug #74468 wrong reflection on Collator::sortWithSortKeys
2017-05-02 06:20:40 +01:00
Anatol Belski
c0e9c21e98
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Tests to ensure BC with undocumented behavior used in hacks
2017-05-01 18:07:05 +02:00
Anatol Belski
023cbdb2ca
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Tests to ensure BC with undocumented behavior used in hacks
2017-05-01 18:06:09 +02:00
Anatol Belski
a581e64199
Tests to ensure BC with undocumented behavior used in hacks
...
Should become obsolete, once behaviors change.
2017-05-01 18:01:05 +02:00
Nikita Popov
d8aa99ed94
Drop unused variable
2017-05-01 14:16:26 +02:00
Pedro Magalhães
5324fb1f34
Fixed bug #61970 : Allow a child class to restrict access to ctor
2017-05-01 14:15:57 +02:00
Pedro Magalhães
92124f9cdc
Fixed bug #74269 : Strict comparison of initial trait property values
2017-05-01 12:59:27 +02:00
Nikita Popov
f9215b6519
Support showing slow tests in run-tests.php
2017-05-01 12:25:03 +02:00
Sammy Kaye Powers
12300f465e
Add trailing comma syntax support for mixed and unmixed group use lists
...
RFC: https://wiki.php.net/rfc/list-syntax-trailing-commas
2017-05-01 12:19:47 +02:00
Nikita Popov
1f42a50840
Merge branch 'PHP-7.1'
2017-05-01 12:15:49 +02:00
Nikita Popov
e3f411c9f7
Merge branch 'PHP-7.0' into PHP-7.1
2017-05-01 12:15:41 +02:00
Nikita Popov
1967950dc3
Fix typo in SplFixedArray has_dimension implementation
2017-05-01 12:15:26 +02:00
Jakub Zelenka
2bce80150f
Merge branch 'PHP-7.1'
2017-04-30 20:28:38 +01:00
Jakub Zelenka
9622a3be43
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-30 20:27:39 +01:00
Michael Heimpold
d9dfac90bf
Fix compiler warnings when compiled against musl libc
...
musl libc is complaining when <sys/poll.h> is used instead of <poll.h>
so change this.
This issue was reported for OpenWrt/LEDE where musl libc is the standard
C library instead of e.g. glibc, see the following link for the original PR:
https://github.com/openwrt/packages/pull/4263
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
--
v3: refined checks/fallback paths as suggested by @bukka
v2: rebased to resolve merge conflict in main/php_network.h
v1: initial PR
2017-04-30 20:24:56 +01:00
Jakub Zelenka
dccf487b2d
Merge branch 'PHP-7.1'
2017-04-30 19:47:23 +01:00
Jakub Zelenka
6028fe511e
Fix bug #73808 (iv length warning too restrictive for aes-128-ccm)
2017-04-30 19:46:27 +01:00
Andrea Faulds
a398e3e72d
Merge branch 'PHP-7.1'
2017-04-29 16:12:55 +01:00
Andrea Faulds
9891b9ede2
Test ReflectionType support of iterable
2017-04-29 16:12:46 +01:00
Andrea Faulds
44156b3114
Drop ZEND_API from zend_assert_valid_class_name
...
This is a convenience function for internal use and shouldn't have been
exported.
2017-04-29 16:09:08 +01:00
Andrea Faulds
753ae9b7db
Test ReflectionType support of iterable
2017-04-29 14:37:35 +01:00
Anatol Belski
9cec5e2c1d
[ci skip] yet more info for new rm
2017-04-28 19:15:32 +02:00
Anatol Belski
f708f0bb72
use char* as we don't compile with UNICODE anyway
2017-04-28 14:03:06 +02:00
Anatol Belski
e9d5214b85
no vista anymore
2017-04-28 13:41:58 +02:00
Jakub Zelenka
1466a0f840
Merge branch 'PHP-7.1'
2017-04-27 15:46:17 +01:00
Jakub Zelenka
c436fe2426
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-27 15:45:31 +01:00
Jakub Zelenka
a0b9554f94
Fix possible memory leak in openssl_encrypt and openssl_decrypt
2017-04-27 15:44:26 +01:00
Jakub Zelenka
2a6f0b8e61
Merge branch 'PHP-7.1'
2017-04-27 15:13:26 +01:00
Jakub Zelenka
d83d5f4198
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-27 15:11:52 +01:00
Jakub Zelenka
7b392c7154
Prefer using DIRECTORY_SEPARATOR in OpenSSL config path
2017-04-27 15:10:55 +01:00
Jakub Zelenka
e7166ea9be
Add oid_section to the testing openssl.cnf
...
It tests repeated OID addition
2017-04-27 15:09:58 +01:00
Anatol Belski
6a010ad492
Avoid unnecessary string copy
...
which is the case when there's no impersonation.
2017-04-27 16:03:12 +02:00
Anatol Belski
24ae881080
get rid of two strlen calls
2017-04-27 15:41:09 +02:00
Anatol Belski
84b397bf44
Merge branch 'PHP-7.1'
...
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
2017-04-27 11:44:26 +02:00
Anatol Belski
9a07e9e1f8
[ci skip] update NEWS
2017-04-27 11:43:13 +02:00
Anatol Belski
38a65d5ef9
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
[ci skip] update NEWS
2017-04-27 11:39:14 +02:00
Anatol Belski
e67096dbbb
[ci skip] update NEWS
2017-04-27 11:35:00 +02:00
Anatol Belski
2111de0dd7
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Revert "Detect invalid port in xp_socket parse ip address"
Revert "Follow up patch regarding bug #74216 , see bug #74429 "
2017-04-27 11:13:00 +02:00
Anatol Belski
392bcba58d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "Detect invalid port in xp_socket parse ip address"
Revert "Follow up patch regarding bug #74216 , see bug #74429 "
2017-04-27 11:11:41 +02:00
Anatol Belski
09ef61e3ca
Revert "Detect invalid port in xp_socket parse ip address"
...
This reverts commit bab0b99f37
2017-04-27 02:49:12 +02:00
Anatol Belski
bf3e2dce7b
Revert "Follow up patch regarding bug #74216 , see bug #74429 "
...
This reverts commit cda7dcf4ca
2017-04-27 02:49:01 +02:00
Anatol Belski
67b701a607
Merge branch 'PHP-7.1'
...
* PHP-7.1:
sync bin sdk version
2017-04-26 17:07:37 +02:00
Anatol Belski
66dbeb81ba
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
sync bin sdk version
2017-04-26 17:05:56 +02:00
Anatol Belski
36301bd615
sync bin sdk version
2017-04-26 17:04:29 +02:00
Jakub Zelenka
f29e90ff75
Merge branch 'PHP-7.1'
2017-04-26 15:01:27 +01:00
