clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,286 Commits 491 Branches 1,363 Tags 837 MiB
2735318c7b
Commit Graph

100286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
6028fe511e Fix bug #73808 (iv length warning too restrictive for aes-128-ccm) 2017-04-30 19:46:27 +01:00
Andrea Faulds
9891b9ede2 Test ReflectionType support of iterable 2017-04-29 16:12:46 +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
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
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
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
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
a1e74a9e0e Merge branch 'PHP-7.0' into PHP-7.1 2017-04-26 15:00:49 +01:00
Jakub Zelenka
c0203c0ceb Do not add already added object to the internal OpenSSL table 
This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.
 2017-04-26 14:59:15 +01:00
Remi Collet
3f6d9fe9cc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  rely on bundle config, instead of system one
 2017-04-26 14:41:54 +02:00
Remi Collet
f639b64dca rely on bundle config, instead of system one 2017-04-26 14:41:40 +02:00
Remi Collet
7962185ded Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  skip the test on OpenSSL < 1.1 for now
 2017-04-26 14:39:14 +02:00
Anatol Belski
8cfaea656c skip the test on OpenSSL < 1.1 for now 2017-04-26 14:39:03 +02:00
Joe Watkins
91a0d48675
bump version after release 2017-04-25 16:49:20 +01:00
Anatol Belski
8c50a1a3e2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  move next
 2017-04-25 14:07:36 +02:00
Anatol Belski
53a702c020 move next 2017-04-25 14:06:17 +02:00
Anatol Belski
7d560514fc [ci skip] update NEWS 2017-04-25 14:01:00 +02:00
Anatol Belski
bf2fc2800e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-04-25 14:00:10 +02:00
Anatol Belski
6aac86ec29 [ci skip] update NEWS 2017-04-25 13:59:20 +02:00
Anatol Belski
faf19a7756 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Follow up patch regarding bug #74216, see bug #74429
 2017-04-25 12:59:22 +02:00
Sara Golemon
cda7dcf4ca Follow up patch regarding bug #74216, see bug #74429 
While the case in bug #74429 is not documented and is only worky due to
an implementation bug, the strength seems to breach some real world
apps. Given this patch doesn't impact the initial security fix for
bug #74216, it is reasonable to let the apps keep working. As mentioned
in the ticket, this behavior is a subject to change in future versions
and should not be abused.
 2017-04-25 12:52:48 +02:00
Anatol Belski
44fdae4360 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  don't backup older deps after upgrades
  update SDK version for AppVeyor
 2017-04-24 22:12:26 +02:00
Anatol Belski
6afcd6c86a don't backup older deps after upgrades 2017-04-24 22:10:32 +02:00
Anatol Belski
e969966468 update SDK version for AppVeyor 2017-04-24 22:08:45 +02:00
Jakub Zelenka
7260f65c62 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-24 17:12:55 +01:00
Jakub Zelenka
9fa347997a Fix bug #73833 (null character not allowed in openssl_pkey_get_private) 2017-04-24 17:11:36 +01:00
Anatol Belski
f504e9eb72 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Support also no,shared configure arg vals by default
 2017-04-24 16:22:16 +02:00
Anatol Belski
f7b8322b14 Support also no,shared configure arg vals by default 
This indirectly fixes bug #74398 where --with-extname is expected to be
configured shared with our default dependency package. With a non
default deps, it still can be enforced --with-extname=static
 2017-04-24 15:46:22 +02:00
Jakub Zelenka
d37c4b0948 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-23 21:06:45 +01:00
Jakub Zelenka
dd36541f2c Add missing NEWS entries for 7.0.19 2017-04-23 21:03:35 +01:00
Anatol Belski
b720160444 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  extend zlib export required for the recent libpng
 2017-04-23 21:34:31 +02:00
Anatol Belski
f3c4e2f5bf extend zlib export required for the recent libpng 2017-04-23 21:33:14 +02:00
Jakub Zelenka
ba83b18ce3 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-23 20:31:24 +01:00
Jakub Zelenka
366b1640d0 Fix bug #73711 (Segfault in openssl_pkey_new when generating DSA or DH key) 2017-04-23 20:30:14 +01:00