php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 23:48:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
102,320 Commits 549 Branches 1,485 Tags
a94fc577af6bfef3a623cded5aecc2dbb9710e85
Commit Graph

382 Commits

Author SHA1 Message Date
Xinchen Hui 6bd8ed4dde Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:38 +08:00
Xinchen Hui 3431132f18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal)
 2017-04-10 19:03:09 +08:00
Xinchen Hui 42e576ace2 Fixed bug #74402 (segfault on random_bytes, bin2hex, openssl_seal) 2017-04-10 19:02:50 +08:00
Jakub Zelenka cdc33251d2 Add OpenSSL 1.1.0 support to PHP 7.0 2017-04-07 19:21:33 +01:00
Anatol Belski c3e7a2a461 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "extend skip section"
 2017-04-04 16:25:10 +02:00
Anatol Belski adc49b1d18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "extend skip section"
 2017-04-04 16:23:49 +02:00
Anatol Belski 4ca3468e78 Revert "extend skip section" 
This reverts commit 5136048064.

This is not needed anymore wrt dst handling fix
 2017-04-04 16:21:23 +02:00
Nikita Popov 8aa419c91c Merge branch 'PHP-7.1' 2017-04-02 01:08:42 +02:00
Nikita Popov 32dcc1eef0 Merge branch 'PHP-7.0' into PHP-7.1 2017-04-02 01:08:24 +02:00
Moritz Fain 46d286574b Fixed bug #74341 
Added support for ASN.1 UTCTime without seconds part (being 11 characters
long instead of 13).

Additionally, fixed incorrect handling of DST on systems without gmtoff.
 2017-04-02 01:04:32 +02:00
Anatol Belski a7f2dbf831 skip the test on OpenSSL < 1.1 for now 2017-03-23 03:10:27 +01:00
Anatol Belski 9ecd344cd4 Revert "fix wrong version check" 
This reverts commit 307a4a2315.
 2017-03-22 17:42:44 +01:00
Anatol Belski 307a4a2315 fix wrong version check 2017-03-22 15:54:28 +01:00
Jakub Zelenka 6574d9fb3a Merge branch 'PHP-7.1' 2017-03-20 16:09:26 +00:00
Jakub Zelenka 7dd52cbcdd Merge branch 'PHP-7.0' into PHP-7.1 2017-03-20 16:08:16 +00:00
Jakub Zelenka 6d066dc421 Lower timeout in test for but #72333 2017-03-20 16:07:12 +00:00
Jakub Zelenka bf9ddc7c13 Merge branch 'PHP-7.1' 2017-03-17 19:09:06 +00:00
Jakub Zelenka ebc75dab50 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 19:08:26 +00:00
Jakub Zelenka df135ffa7a Make test 002 for bug #65538 not to use https in cafile 2017-03-17 19:07:32 +00:00
Jakub Zelenka 40d04784bb Merge branch 'PHP-7.1' 2017-03-17 18:13:05 +00:00
Jakub Zelenka b0ba8c68cd Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 18:12:37 +00:00
Jakub Zelenka 53e2c9158d Consume data by server in test for bug #72333 
Client should be able to write more data and prevent time out
 2017-03-17 18:11:50 +00:00
Jakub Zelenka 37da80bf19 Merge branch 'PHP-7.1' 2017-03-16 18:13:37 +00:00
Jakub Zelenka 3becfb9be4 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-16 18:12:54 +00:00
Jakub Zelenka 0c8ad36d92 Make test for bug #72333 a bit more reliable 2017-03-16 18:11:56 +00:00
Jakub Zelenka 117d6a9a14 Merge branch 'PHP-7.1' 2017-03-14 18:47:51 +00:00
Jakub Zelenka b4f0174e5c Merge branch 'PHP-7.0' into PHP-7.1 2017-03-14 18:46:29 +00:00
Jakub Zelenka ba70478a21 Skip bug74159 test for OpenSSL lower than 1.0.1 2017-03-14 18:13:57 +00:00
Jakub Zelenka 8e5d080d54 Tidy up test for bug72333 2017-03-14 18:13:57 +00:00
Jakub Zelenka f0e67d1a56 Speed up test for bug72333 
It reliably fails without the xp_ssl.c so it is good with smaller usleep
 2017-03-14 18:13:57 +00:00
Jakub Zelenka 17e9fc9bfe Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work) 2017-03-14 18:13:57 +00:00
Remi Collet 196ba4e194 Merge branch 'PHP-7.1' 
* PHP-7.1:
  rely on provided openssl.cnf to avoid possible failure with system defaults
 2017-03-13 08:17:59 +01:00
Remi Collet 1ffb1b9597 rely on provided openssl.cnf to avoid possible failure with system defaults 2017-03-13 08:17:42 +01:00
Aaron Piotrowski 5d2a20f25b Merge branch 'PHP-7.1' 2017-02-23 22:56:25 -06:00
Aaron Piotrowski 531fbb88f5 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 22:56:04 -06:00
Aaron Piotrowski ff8a6b1232 Update test for bug #74159 2017-02-23 22:24:59 -06:00
Aaron Piotrowski fb76d81b6c Merge branch 'PHP-7.1' 2017-02-23 21:22:28 -06:00
Aaron Piotrowski c05c65ac80 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-23 21:19:46 -06:00
Aaron Piotrowski e9873d9853 Fix bug #74159 
Thanks to @brzuchal for the patch to xp_ssl.c and @DaveRandom for helping debug the problem.
 2017-02-23 20:59:43 -06:00
Nikita Popov efefb5276b Merge branch 'PHP-7.1' 2017-02-17 21:23:31 +01:00
andrewnester 15b8b124ae Fixed #74099 - Memory leak with openssl_encrypt() 2017-02-17 21:23:16 +01:00
Anatol Belski 2bff68a2f0 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
 2017-02-02 13:07:48 +01:00
Anatol Belski 9b9080e85d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
 2017-02-02 13:06:31 +01:00
Anatol Belski 6fc0ae638a Fixed #74022 PHP Fast CGI crashes when reading from a pfx file. 2017-02-02 12:48:12 +01:00
Joe Watkins 2d42423953 Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:43:59 +00:00
Joe Watkins 0884cffb67 Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:42:57 +00:00
Joe Watkins 7e3a8ef5e1 Merge branch 'pull-request/1755' 
* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse
 2017-01-06 07:41:48 +00:00
Nikita Popov 78132cc424 Merge branch 'PHP-7.1' 2016-12-29 22:07:03 +01:00
Nikita Popov 2497ae031b Don't check for precise length in ecc.phpt 
Again, this can be off by one.
 2016-12-29 22:05:38 +01:00
Nikita Popov 30029d137f Merge branch 'PHP-7.1' 2016-12-29 21:00:34 +01:00