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

1546 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
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
Nikita Popov
e7ef2b52db Merge branch 'PHP-7.3' into PHP-7.4 2019-06-21 12:56:12 +02:00
Nikita Popov
414db07bdb Merge branch 'PHP-7.2' into PHP-7.3 2019-06-21 12:55:12 +02:00
Niklas Keller
fea9f93166 Fix memory leak in TLS matches_san_list 2019-06-21 12:54:30 +02:00
Nikita Popov
bd73332f50 Merge branch 'PHP-7.4' 2019-06-14 15:38:27 +02:00
Rosen Penev
32e6d08dcd Fix compilation without deprecated OpenSSL 1.1 APIs 2019-06-14 15:38:12 +02:00
Dmitry Stogov
e029cc4dd4 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Cheaper checks for exceptions thrown from __toString()
 2019-06-06 02:23:17 +03:00
Dmitry Stogov
457392fa64 Cheaper checks for exceptions thrown from __toString() 2019-06-06 01:47:22 +03: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
6b57898057 Merge branch 'PHP-7.4' 2019-06-03 15:15:35 +02:00
Nikita Popov
829f18b48d Merge branch 'PHP-7.3' into PHP-7.4 2019-06-03 15:15:22 +02:00
Nikita Popov
37bba7a678 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-03 15:15:07 +02:00
Nikita Popov
ac60007bec Clear errors after SSL_CTX_load_verify_locations() 
We report our own errors here. Make sure these don't clog up the
error queue.
 2019-06-03 15:14:01 +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
Nikita Popov
bb3421b554 Merge branch 'PHP-7.4' 2019-05-31 17:00:31 +02:00