Commit Graph

102684 Commits

Author SHA1 Message Date
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
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
286ee99088 Merge branch 'PHP-7.1'
* PHP-7.1:
  rely on bundle config, instead of system one
2017-04-26 14:42:02 +02: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
e7af9273f5 Merge branch 'PHP-7.1'
* PHP-7.1:
  skip the test on OpenSSL < 1.1 for now
2017-04-26 14:39:23 +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
Remi Collet
6f9700ae99 Merge branch 'PHP-7.1'
* PHP-7.1:
  bump version after release
2017-04-26 14:38:29 +02:00
Joe Watkins
91a0d48675
bump version after release 2017-04-25 16:49:20 +01:00
Anatol Belski
294f6168ed Merge branch 'PHP-7.1'
* PHP-7.1:
  move next
2017-04-25 14:08:17 +02: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
c8eeb05698 Merge branch 'PHP-7.1'
* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS
2017-04-25 14:01:42 +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
bbf0a9d8a7 Merge branch 'PHP-7.1'
* PHP-7.1:
  Follow up patch regarding bug #74216, see bug #74429
2017-04-25 13:00:10 +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
eb68c0d525 Merge branch 'PHP-7.1'
* PHP-7.1:
  don't backup older deps after upgrades
  update SDK version for AppVeyor
2017-04-24 22:14:30 +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
Anatol Belski
dca2a855c8 prefer OpenSSL 1.1 with 7.2 as that's what is default 2017-04-24 18:39:04 +02:00
Anatol Belski
e9dd511ec6 [ci skip] more upgrading notes 2017-04-24 18:15:15 +02:00
Anatol Belski
0e1b2ae4f3 [ci skip] move item to right section 2017-04-24 18:15:14 +02:00
Jakub Zelenka
2e727b9be1 Merge branch 'PHP-7.1' 2017-04-24 17:14:22 +01: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
8f20eb0ea1 Remove --enable-one-shot as it's dead already for long
The usable option is --with-mp, the implementation is available since 7.0.
2017-04-24 17:54:50 +02:00
Anatol Belski
632d68f5f9 Merge branch 'PHP-7.1'
* PHP-7.1:
  Support also no,shared configure arg vals by default
2017-04-24 16:22:57 +02: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
347b880ee4 Merge branch 'PHP-7.1' 2017-04-23 21:07:31 +01: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