archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
108868 commits 526 branches 1434 tags 879 MiB
Commit graph

494 commits

Author SHA1 Message Date
Jakub Zelenka
e7166ea9be Add oid_section to the testing openssl.cnf 
It tests repeated OID addition
 2017-04-27 15:09:58 +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
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
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
Jakub Zelenka
488324e315 Merge branch 'PHP-7.1' 2017-04-23 20:33:48 +01: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
Xinchen Hui
6bd8ed4dde Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:38 +08:00
Xinchen Hui
3431132f18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:09 +08:00
Xinchen Hui
42e576ace2 Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal) 2017-04-10 19:02:50 +08:00
Jakub Zelenka
cdc33251d2 Add OpenSSL 1.1.0 support to PHP 7.0 2017-04-07 19:21:33 +01:00
Anatol Belski
c3e7a2a461 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "extend skip section"
 2017-04-04 16:25:10 +02:00
Anatol Belski
adc49b1d18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "extend skip section"
 2017-04-04 16:23:49 +02:00
Anatol Belski
4ca3468e78 Revert "extend skip section" 
This reverts commit 5136048064.

This is not needed anymore wrt dst handling fix
 2017-04-04 16:21:23 +02:00
Nikita Popov
8aa419c91c Merge branch 'PHP-7.1' 2017-04-02 01:08:42 +02:00
Nikita Popov
32dcc1eef0 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-02 01:08:24 +02:00
Moritz Fain
46d286574b Fixed bug #74341 
Added support for ASN.1 UTCTime without seconds part (being 11 characters
long instead of 13).

Additionally, fixed incorrect handling of DST on systems without gmtoff.
 2017-04-02 01:04:32 +02:00
Anatol Belski
a7f2dbf831 skip the test on OpenSSL < 1.1 for now 2017-03-23 03:10:27 +01:00
Anatol Belski
9ecd344cd4 Revert "fix wrong version check" 
This reverts commit 307a4a2315.
 2017-03-22 17:42:44 +01:00
Anatol Belski
307a4a2315 fix wrong version check 2017-03-22 15:54:28 +01:00
Jakub Zelenka
6574d9fb3a Merge branch 'PHP-7.1' 2017-03-20 16:09:26 +00:00
Jakub Zelenka
7dd52cbcdd Merge branch 'PHP-7.0' into PHP-7.1 2017-03-20 16:08:16 +00:00
Jakub Zelenka
6d066dc421 Lower timeout in test for but #72333 2017-03-20 16:07:12 +00:00
Jakub Zelenka
bf9ddc7c13 Merge branch 'PHP-7.1' 2017-03-17 19:09:06 +00:00
Jakub Zelenka
ebc75dab50 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 19:08:26 +00:00
Jakub Zelenka
df135ffa7a Make test 002 for bug #65538 not to use https in cafile 2017-03-17 19:07:32 +00:00
Jakub Zelenka
40d04784bb Merge branch 'PHP-7.1' 2017-03-17 18:13:05 +00:00
Jakub Zelenka
b0ba8c68cd Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 18:12:37 +00:00
Jakub Zelenka
53e2c9158d Consume data by server in test for bug #72333 
Client should be able to write more data and prevent time out
 2017-03-17 18:11:50 +00:00
Jakub Zelenka
37da80bf19 Merge branch 'PHP-7.1' 2017-03-16 18:13:37 +00:00
Jakub Zelenka
3becfb9be4 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-16 18:12:54 +00:00
Jakub Zelenka
0c8ad36d92 Make test for bug #72333 a bit more reliable 2017-03-16 18:11:56 +00:00
Jakub Zelenka
117d6a9a14 Merge branch 'PHP-7.1' 2017-03-14 18:47:51 +00:00
Jakub Zelenka
b4f0174e5c Merge branch 'PHP-7.0' into PHP-7.1 2017-03-14 18:46:29 +00:00
Jakub Zelenka
ba70478a21 Skip bug74159 test for OpenSSL lower than 1.0.1 2017-03-14 18:13:57 +00:00
Jakub Zelenka
8e5d080d54 Tidy up test for bug72333 2017-03-14 18:13:57 +00:00
Jakub Zelenka
f0e67d1a56 Speed up test for bug72333 
It reliably fails without the xp_ssl.c so it is good with smaller usleep
 2017-03-14 18:13:57 +00:00
Jakub Zelenka
17e9fc9bfe Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work) 2017-03-14 18:13:57 +00:00
Remi Collet
196ba4e194 Merge branch 'PHP-7.1' 
* PHP-7.1:
  rely on provided openssl.cnf to avoid possible failure with system defaults
 2017-03-13 08:17:59 +01:00
Remi Collet
1ffb1b9597 rely on provided openssl.cnf to avoid possible failure with system defaults 2017-03-13 08:17:42 +01:00
Aaron Piotrowski
5d2a20f25b Merge branch 'PHP-7.1' 2017-02-23 22:56:25 -06:00
Aaron Piotrowski
531fbb88f5 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 22:56:04 -06:00
Aaron Piotrowski
ff8a6b1232 Update test for bug #74159 2017-02-23 22:24:59 -06:00
Aaron Piotrowski
fb76d81b6c Merge branch 'PHP-7.1' 2017-02-23 21:22:28 -06:00
Aaron Piotrowski
c05c65ac80 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 21:19:46 -06:00