php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 12:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
115,813 Commits 547 Branches 1,481 Tags
375ceefec00df23c71bbc164e272ff41f68c91bc
Commit Graph

566 Commits

Author SHA1 Message Date
Christoph M. Becker
e2338208aa Merge branch 'PHP-7.4' 
* PHP-7.4:
  Update regarding changed OpenSSL default config path
 2019-10-01 09:16:51 +02:00
Christoph M. Becker
59ac81f81e Update regarding changed OpenSSL default config path 2019-10-01 09:14:58 +02:00
Christoph M. Becker
789e8e174a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Add missing SKIPIF (openssl)
 2019-09-04 08:43:51 +02:00
Fabien Villepinte
7aece45f4d Add missing SKIPIF (openssl) 
Co-Authored-By: Gabriel Caruso <carusogabriel34@gmail.com>
 2019-09-04 08:43:32 +02:00
Nikita Popov
699b465da2 Fixed bug #78391 2019-08-09 15:03:40 +02:00
Nikita Popov
4276d669d2 Merge branch 'PHP-7.4' 2019-08-09 15:02:57 +02:00
Nikita Popov
69a771346a Fixed bug #78391 2019-08-09 15:02:44 +02:00
Nikita Popov
7686b0b889 Merge branch 'PHP-7.4' 2019-06-05 14:53:50 +02:00
Nikita Popov
a31f46421d Allow exceptions in __toString() 
RFC: https://wiki.php.net/rfc/tostring_exceptions

And convert some object to string conversion related recoverable
fatal errors into Error exceptions.

Improve exception safety of internal code performing string
conversions.
 2019-06-05 14:25:07 +02:00
Nikita Popov
7013e8be85 Merge branch 'PHP-7.4' 2019-06-03 18:59:21 +02:00
Nikita Popov
117f7720be Prevent use of TLS 1.3 in stream_server_reneg_limit.phpt 
TLS 1.3 does not support renegotiation, make sure this test does
not use it.
 2019-06-03 18:58:52 +02:00
Nikita Popov
1df8175b61 Convert fetch_resource warnings into TypeErrors 
More type checks that are not part of zpp and should generate a
TypeError in PHP 8.
 2019-06-03 09:17:12 +02:00
Jakub Zelenka
29d79dc2e5 Merge branch 'PHP-7.4' 2019-06-02 19:15:00 +01:00
Jakub Zelenka
4feddd59dc Merge branch 'PHP-7.3' into PHP-7.4 2019-06-02 19:14:37 +01:00
Jakub Zelenka
8f69ca8dcd Merge branch 'PHP-7.2' into PHP-7.3 2019-06-02 19:13:18 +01:00
Jakub Zelenka
2e02579474 Fix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c) 
It also fixes invalid setting of tag length
 2019-06-02 19:10:56 +01:00
Peter Kokot
08e7e6ffe6 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove unused variable
 2019-05-10 01:05:24 +02:00
Peter Kokot
1ab3704143 Remove unused variable 2019-05-10 01:05:19 +02:00
Jakub Zelenka
187872503a Merge branch 'PHP-7.4' 2019-05-05 21:06:58 +01:00
Jakub Zelenka
b348c46e29 Merge branch 'PHP-7.3' into PHP-7.4 2019-05-05 21:06:30 +01:00
Jakub Zelenka
36a7d9fca4 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-05 21:05:55 +01:00
Jakub Zelenka
9977de0028 Fix OpenSSL online test for ca context 
The php.net is redirected to https so use nginx.org
 2019-05-05 21:04:28 +01:00
Jakub Zelenka
5b7acc64eb Merge branch 'PHP-7.4' 2019-04-28 18:51:36 +01:00
Jakub Zelenka
3c056a9e75 Enable TLS 1.3 by default 2019-04-28 17:37:43 +01:00
Jakub Zelenka
c2e9c71e36 Fix tests and logic for TLS 1.3 2019-04-28 17:37:43 +01:00
codarrenvelvindron
5c05f5e6d3 Added tls 1.3 support for PHP 2019-04-28 17:37:43 +01:00
Peter Kokot
6426420f61 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace dirname(__FILE__) by __DIR__ in tests
 2019-03-15 23:36:47 +01:00
Fabien Villepinte
26dfce7f36 Replace dirname(__FILE__) by __DIR__ in tests 2019-03-15 22:55:30 +01:00
Nikita Popov
852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00
Gabriel Caruso
6c4e2079c0 Use EXPECT when possible 
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
 2019-03-11 00:05:44 -03:00
Jakub Zelenka
bc57efb78f Merge branch 'PHP-7.3' into PHP-7.4 2019-03-10 16:36:55 +00:00
Jakub Zelenka
f8850ccd85 Speed up TLS wrapper test for min and max versions 2019-03-10 16:36:13 +00:00
Jakub Zelenka
ee4fa7d482 Merge branch 'PHP-7.2' into PHP-7.3 2019-03-10 16:34:58 +00:00
Jakub Zelenka
769d2d9b62 Speed up TLS wrapper tests when SSLv3 disabled 
If SSLv3 is disabled in OpenSSL, then sslv3 is not available so the accept
times out. This commit removes the extra accept if SSLv3 is disabled.
 2019-03-10 16:23:44 +00:00
Jakub Zelenka
20af026acd Merge branch 'PHP-7.3' into PHP-7.4 2019-02-24 13:15:17 +00:00
Jakub Zelenka
900d4cdb9e Merge branch 'PHP-7.2' into PHP-7.3 2019-02-24 13:14:36 +00:00
Jakub Zelenka
043ce4c8a1 Revert "Disable bug77390.phpt" 
This reverts commit 139492b1ae.
 2019-02-24 13:12:38 +00:00
Jakub Zelenka
01c00953ff Print empty string in test for but 77390 just once 2019-02-24 13:11:27 +00:00
Jakub Zelenka
c814b34b1d Use spaces instead of tabs in bug 77390 test 2019-02-24 13:05:43 +00:00
Nikita Popov
139492b1ae Disable bug77390.phpt 
This is causing a lot of spurious failures on AppVeyor.
 2019-02-22 17:39:43 +01:00
Nikita Popov
4f2b46dbaf Merge branch 'PHP-7.3' into PHP-7.4 2019-02-20 12:12:11 +01:00
Nikita Popov
b3e0e555c8 Merge branch 'PHP-7.2' into PHP-7.3 2019-02-20 12:11:56 +01:00
Abyr Valg
74888bede8 OpenSSL: Improve non-blocking eof test 2019-02-20 12:11:30 +01:00
Nikita Popov
c0e15a3b7f Implement fine-grained conflict handling 
Tests can specify conflict keys, either in --CONFLICTS-- or
a per-directory CONFLICTS file. Non-conflicting tests may be run
in parallel.
 2019-02-20 11:20:40 +01:00
Enrico Zimuel
f57acf08aa Added test for openssl_pkcs12_export_to_file_error 2019-02-10 20:18:17 +01:00
Jakub Zelenka
9be6b16983 Merge branch 'PHP-7.3' 2019-01-25 14:16:57 +00:00
Jakub Zelenka
0da13086bd Merge branch 'PHP-7.2' into PHP-7.3 2019-01-25 14:16:08 +00:00
Jakub Zelenka
dc2ffdeed7 Fix bug #77390 (feof might hang on TLS streams in case of fragmented TLS records) 
Simplified version of the fix from Abyl Valg so credit to him.
 2019-01-25 14:13:11 +00:00
Jakub Zelenka
d9b29029f9 Update and integrate openssl client proxy test 2019-01-25 14:09:55 +00:00
Abyr Valg
0c84c2ef50 Add a test for fragmented SSL packets 2019-01-25 14:09:55 +00:00