mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-24 01:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
117,307 Commits 503 Branches 1,387 Tags 845 MiB
7e7a85e881
Commit Graph

1567 Commits

Author SHA1 Message Date
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
Máté Kocsis
c3cf01b553
Fix #78880: Yet another batch of spelling errors 2020-01-16 12:04:00 +01:00
Máté Kocsis
bbcfa66e06
Use RETURN_THROWS() after zend_fetch_resource*() 2020-01-03 19:20:56 +01:00
Máté Kocsis
345703724c
Use RETURN_THROWS() during ZPP in most of the extensions 
Except for some bigger ones: reflection, sodium, spl
 2019-12-31 11:46:11 +01:00
Máté Kocsis
27e83d0fb8
Add union return types for function stubs 2019-11-11 14:54:55 +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
Nikita Popov
c849438bd0 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #78775
 2019-11-05 12:16:17 +01:00
Nikita Popov
3e41ade638 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #78775
 2019-11-05 12:16:09 +01:00
Nikita Popov
747cb46244 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #78775
 2019-11-05 12:15:44 +01:00
Nikita Popov
4f984a2fdb Fixed bug #78775 
Clear the OpenSSL error queue before performing SSL stream operations.
As we don't control all code that could possibly be using OpenSSL,
we can't rely on the error queue being empty.
 2019-11-05 12:13:46 +01:00
Christoph M. Becker
34defbb784 Accept int parameter in the first place 
This is more liberal then before, where that parameter (if given) had
to be IS_LONG, while now it would be converted to int according to weak
typing rules.  This is, however, more what a developer would expect.
 2019-11-01 19:15:48 +01:00
Máté Kocsis
2204dbde3b Add missing ZPP checks 
Closes GH-4878.
 2019-11-01 15:26:52 +01:00
Christoph M. Becker
5dd5f1bc4a Finish OpenSSL arginfo stubs 2019-11-01 15:21:28 +01:00
Máté Kocsis
9493893412 Cleanup return values when parameter parsing is unsuccessful 2019-10-30 16:05:20 +01:00
Rimvydas Zilinskas
e4593c51ff Add more openssl stubs 
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
 2019-10-30 11:20:48 +01:00
Gabriel Caruso
95181553c8
Add missing zend_parse_parameters_none() checks 
Closes GH-4796.
 2019-10-08 23:10:18 +02: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
Gabriel Caruso
5d6e923d46
Remove mention of PHP major version in Copyright headers 
Closes GH-4732.
 2019-09-25 14:51:43 +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
Rimvydas Zilinskas
31d7f9763b Add partial openssl stubs 
Closes GH-4509.
 2019-08-10 22:19:16 +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
890a97c6d2 Merge branch 'PHP-7.4' 2019-07-24 16:41:44 +02:00
Nikita Popov
626bc0e7cc Remove php_openssl_cipher_get_version() 
This was added in 7.1 when add_assoc_string mistakenly accepted
a char* rather than const char* parameter and is no longer needed.
We can use SSL_CIPHER_get_version() directly.
 2019-07-24 16:41:20 +02:00
Nikita Popov
a1e2c8870e Merge branch 'PHP-7.4' 2019-07-22 17:26:01 +02:00
Nikita Popov
d59aac58b3 Report errors from stream read and write operations 
The php_stream_read() and php_stream_write() functions now return
an ssize_t value, with negative results indicating failure. Functions
like fread() and fwrite() will return false in that case.

As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams
should not be regarded as error conditions, and be reported as
successful zero-length reads/writes instead. The handling of EINTR
remains unclear and is internally inconsistent (e.g. some code-paths
will automatically retry on EINTR, while some won't).

I'm landing this now to make sure the stream wrapper ops API changes
make it into 7.4 -- however, if the user-facing changes turn out to
be problematic we have the option of clamping negative returns to
zero in php_stream_read() and php_stream_write() to restore the
old behavior in a relatively non-intrusive manner.
 2019-07-22 17:17:28 +02:00
Peter Kokot
f888f4cf4f Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix internals upgrading log
  Remove HAVE_DSA_DEFAULT_METHOD
 2019-07-22 16:04:20 +02:00
Peter Kokot
4b03e102c5 Remove HAVE_DSA_DEFAULT_METHOD 
Last usage removed via 6a81363405.

Closes GH-4455
 2019-07-22 16:02:55 +02:00
Nikita Popov
97b84a3694 Merge branch 'PHP-7.4' 2019-07-03 12:37:17 +02:00
Nikita Popov
a023eb3967 Merge branch 'PHP-7.3' into PHP-7.4 2019-07-03 12:37:12 +02:00
Nikita Popov
af3c854074 Merge branch 'PHP-7.2' into PHP-7.3 2019-07-03 12:36:50 +02:00
Nikita Popov
0e48e35e04 Fixed bug #78231 2019-07-03 12:36:06 +02:00
Nikita Popov
d8b2b070ec Merge branch 'PHP-7.4' 2019-06-21 15:08:20 +02:00
Nikita Popov
021bb35aec Merge branch 'PHP-7.3' into PHP-7.4 2019-06-21 15:08:12 +02:00
Nikita Popov
66e4b78519 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-21 15:07:59 +02:00
Nikita Popov
99f3e0f0ed Fix PKCS12 leak in openssl 2019-06-21 15:07:37 +02:00
Nikita Popov
c939a67866 Fix d leak in ecc openssl_pkey_new 2019-06-21 15:07:32 +02:00
Nikita Popov
dfe6f0c1c6 Fix netscape spki leak in openssl 2019-06-21 15:07:26 +02:00
Nikita Popov
a0da2fb2b7 Fix X509 leak in openssl_pkcs7_verify() 2019-06-21 15:07:18 +02:00
Nikita Popov
e0bafc6da4 Fix CSR leaks in openssl 2019-06-21 15:07:10 +02:00
Nikita Popov
90cb3743be Free cert in php_openssl_load_stream_cafile() 
X509_STORE_add_cert() increments the refcount of the cert, so we
should free it here.
 2019-06-21 15:07:00 +02:00
Nikita Popov
1834994d0d Merge branch 'PHP-7.4' 2019-06-21 12:56:48 +02:00