archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
122692 commits 526 branches 1434 tags 873 MiB
Commit graph

635 commits

Author SHA1 Message Date
Christoph M. Becker
85657b486f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #62890: default_socket_timeout=-1 causes connection to timeout
 2020-06-09 16:47:00 +02:00
Christoph M. Becker
eadd980706 Fix #62890: default_socket_timeout=-1 causes connection to timeout 
While unencrypted connections ignore negative timeouts, SSL/TLS
connections did not special case that, and so always failed due to
timeout.
 2020-06-09 16:45:34 +02:00
Eliot Lear
8583b8a9bf Add support for Cryptographic Message Syntax (CMS) 
It add CMS (RFC 5652) support, which is an update to PKCS7.  The functions
are analogous BUT NOT IDENTICAL to openssl_pkcs7*.  In particular, support for
different encodings (PEM, DER, SMIME) is now available.
 2020-06-07 16:58:34 +01:00
Nicolas Frandeboeuf
170d63ec62 openssl: Fix openssl_pkcs12_export_to_file extracerts test 
Same as https://github.com/php/php-src/pull/2681/files but for openssl_pkcs12_export_to_file

Closes GH-5665
 2020-06-05 22:28:01 +02:00
Christoph M. Becker
0b04b9347f Enclose contents of CLEAN sections in PHP tags 
We also place the CLEAN sections before EXPECT(F), and remove
extraneous clean-ups.
 2020-04-29 09:07:53 +02:00
Christoph M. Becker
919adcf161 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Enable error diagnostic for check_default_conf_path.phpt
 2020-04-01 19:21:46 +02:00
Christoph M. Becker
71e1d37938 Enable error diagnostic for check_default_conf_path.phpt 
Otherwise we have no clue why the test failed, if the regex didn't
match.
 2020-04-01 19:20:35 +02:00
Máté Kocsis
01b266aac4
Improve error messages of various extensions 
Closes GH-5278
 2020-03-23 18:59:04 +01:00
Máté Kocsis
960318ed95
Change argument error message format 
Closes GH-5211
 2020-02-26 15:00:08 +01:00
George Peter Banyard
1fdc53bc96 Remove deprecated capture_session_meta OpenSSL stream context 
Closes GH-5200
 2020-02-26 03:09:13 +01:00
Máté Kocsis
ac0853eb26
Make type error messages more consistent 
Closes GH-5092
 2020-02-17 14:22:17 +01:00
Nikita Popov
f8d795820e Reindent phpt files 2020-02-03 22:52:20 +01:00
Christoph M. Becker
7cb1a706bb Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #79145: openssl memory leak
 2020-01-21 16:21:39 +01:00
Christoph M. Becker
16a8a608d5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79145: openssl memory leak
 2020-01-21 16:20:04 +01:00
Christoph M. Becker
9eff906a02 Fix #79145: openssl memory leak 
We must increase the refcount of `return_value` only if `cert` is a
resource; this is already done in `php_openssl_evp_from_zval()`,
though.
 2020-01-21 16:17:25 +01:00
Máté Kocsis
99db00b1f2
Fix #78880 Another round 2020-01-19 18:28:43 +01:00
Máté Kocsis
d1764ca330
Make error messages more consistent by fixing capitalization 
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
 2020-01-17 14:52:46 +01:00
Máté Kocsis
afdaa91170
Fix #78880: Final spelling fixes 2020-01-16 19:14:31 +01:00
Fabien Villepinte
a555cc0b3d Clean DONE tags from tests 
Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.

Closes GH-4872.
 2019-11-07 21:31:47 +01:00
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