clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 11:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,534 Commits 493 Branches 1,366 Tags 849 MiB
e031f212b2
Commit Graph

738 Commits

Author SHA1 Message Date
Stanislav Malyshev
c64949626d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
  Fixes memory leak introduced in 2b9af967

Conflicts:
	ext/openssl/openssl.c
 2014-11-30 18:32:56 -08:00
Stanislav Malyshev
25e3e78016 Merge branch 'pull-request/916' 
* pull-request/916:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
 2014-11-30 18:27:37 -08:00
Stanislav Malyshev
8c08124c0e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
 2014-11-30 18:24:23 -08:00
Dominic Luechinger
6048ac32b4 Adds test cases for openssl EC improvements 2014-11-30 18:17:48 -08:00
Dominic Luechinger
5d1cc7d135 Adds better handling of EC keys: OPENSSL_KEYTYPE_EC 
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details

Conflicts:
	ext/openssl/openssl.c
 2014-11-30 18:02:55 -08:00
Anatol Belski
5f65c77e98 Merge branch 'PHP-5.6' 
* PHP-5.6:
  disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows
 2014-11-28 12:25:08 +01:00
Anatol Belski
1552d6ae7b disable ext/openssl/tests/stream_server_reneg_limit.phpt for windows 
This is using the openssl binary which, despite it's contained in the
deps, would probably miss all it's environment. It is just prone to
failure and thus is not worth it.
 2014-11-28 12:24:32 +01:00
Dominic Luechinger
17e98661c6 Adds test cases for openssl EC improvements 2014-11-24 02:31:19 +01:00
Dominic Luechinger
e795675845 Adds better handling of EC keys: OPENSSL_KEYTYPE_EC 
When working with elliptic curve and openssl some functions are not
aware of the different handling.
Improvements:
- Fixes export of EC private keys
- Adds curve information to openssl_pkey_get_details
 2014-11-24 02:04:37 +01:00
Dominic Luechinger
437ab7f1f4 Minor fix: Missing quotes in openssl test case for bug bug64802 2014-11-23 15:15:49 -08:00
Dominic Luechinger
f652ff0544 Minor fix: Missing quotes in openssl test case for bug bug64802 2014-11-23 15:15:17 -08:00
Ferenc Kovacs
d2ab6e1d15 Merge branch 'PHP-5.6' 
* PHP-5.6:
  removing the NEWS entry as we had to revert this fix for now
  Revert "Merge branch 'PHP-5.5' into PHP-5.6"
  Revert "fix TS build"
  Revert "Merge branch 'PHP-5.4' into PHP-5.5"
  Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
  Revert "Bug #41631: Fix regression from first attempt (6569db8)"
 2014-10-15 19:41:27 +02:00
Ferenc Kovacs
feadaaed56 Revert "Merge branch 'PHP-5.5' into PHP-5.6" 
This reverts commit 98e67add15, reversing
changes made to 2cdc1a2b74.
 2014-10-15 19:34:07 +02:00
Ferenc Kovacs
4fb998d42f Revert "fix TS build" 
This reverts commit 84a4041ba4.
 2014-10-15 19:33:47 +02:00
Ferenc Kovacs
7b8222aa44 Revert "Merge branch 'PHP-5.4' into PHP-5.5" 
This reverts commit 30a73658c6, reversing
changes made to 7fac56e072.
 2014-10-15 19:33:31 +02:00
Ferenc Kovacs
528e4166a6 Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams" 
This reverts commit f86b2193a4.
 2014-10-15 19:32:46 +02:00
Ferenc Kovacs
ff91a48f6e Revert "Bug #41631: Fix regression from first attempt (6569db8)" 
This reverts commit 372844918a.
 2014-10-15 19:32:14 +02:00
Tjerk Meesters
7e116a3baa Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68234
 2014-10-15 21:13:13 +08:00
Tjerk Meesters
836a5dfddb Fixed bug #68234 
Certificate will now expire in 2034
 2014-10-15 21:12:13 +08:00
Julien Pauli
6d9c9f8f04 Revert "Bug #41631: Observe socket read timeouts in SSL streams" 
This reverts commit 6569db8808.

Conflicts:
	ext/openssl/xp_ssl.c
 2014-10-15 14:38:12 +02:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Ferenc Kovacs
702829dff5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update the certificate used for the test, as it expired recently
 2014-09-24 13:42:32 +02:00
Ferenc Kovacs
d27f3e7b64 update the certificate used for the test, as it expired recently 2014-09-24 13:40:52 +02:00
Remi Collet
d3bb0ba39f Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68074 Allow to use system cipher list instead of hardcoded value
 2014-09-24 10:36:58 +02:00
Remi Collet
0d776ef87b Fix bug #68074 Allow to use system cipher list instead of hardcoded value 2014-09-24 10:34:55 +02:00
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/ 
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
 2014-09-21 20:49:39 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910 
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
 2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5 Fixed useless or duplicated IS_INTERNED() checks 2014-09-19 15:41:01 +04:00
Daniel Lowrey
13695a5ead Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:25:36 -06:00
Daniel Lowrey
edb2799333 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a Bug #41631: Fix regression from first attempt (6569db8) 2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4 Bug #67965: Fix blocking behavior in non-blocking crypto streams 2014-09-09 07:37:57 -06:00
Johannes Schlüter
dadbbf8945 Fix compilation on systems without ecdh_curve 2014-08-28 00:12:48 +02:00
Anatol Belski
7d6c3e01c9 fix remaining 's' args for openssl 2014-08-28 00:05:29 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Chris Wright
0a1df74895 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:35:28 +01:00
Chris Wright
db03216e62 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix stream_select() issue with OpenSSL buffer
 2014-08-27 16:06:28 +01:00
Chris Wright
30a73658c6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 16:01:18 +01:00
Chris Wright
32be79dcfa Fix stream_select() issue with OpenSSL buffer 
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-27 13:25:50 +01:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
b9514bb8fd master renames phase 6 2014-08-25 21:26:42 +02:00
Anatol Belski
5410282258 Merge branch 'master' of git.php.net:php-src 
# By Daniel Lowrey
# Via Daniel Lowrey
* 'master' of git.php.net:php-src:
  Update NEWS
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
 2014-08-25 20:23:14 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Daniel Lowrey
cc487e6cdf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support
 2014-08-25 19:35:01 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Daniel Lowrey
546a32e2b3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67850: Build when OpenSSL compiled without SSLv3 support

Conflicts:
	ext/openssl/xp_ssl.c
 2014-08-25 18:16:38 +02:00
Daniel Lowrey
640214701c Bug #67850: Build when OpenSSL compiled without SSLv3 support 2014-08-25 17:28:09 +02:00