php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,633 Commits 549 Branches 1,484 Tags
0f1ae93bfa2feb3d0fd0b8d3036148df8ef856e2
Commit Graph

1180 Commits

Author SHA1 Message Date
Jakub Zelenka 4a72d340a3 Merge branch 'PHP-7.1' 2017-01-25 19:56:19 +00:00
Jakub Zelenka 519b0dc886 Fix bug #73978 (openssl_decrypt triggers bug in PDO) 2017-01-25 19:55:05 +00:00
Leigh 2a9ee3c6f6 Merge branch 'PHP-7.1' 2017-01-18 15:04:19 +00:00
Leigh 85589ca660 Add php_openssl_store_errors to bailouts 2017-01-18 15:02:52 +00:00
Leigh 9c5a1c8ae9 Merge branch 'PHP-7.1' 2017-01-18 14:48:36 +00:00
Leigh d2f07edf71 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 14:47:49 +00:00
Leigh e7e96fe2e0 Change free to OPENSSL_free 2017-01-18 14:45:41 +00:00
Joe Watkins a1fd706d7d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Remove more TSRMLS_CC macros
 2017-01-18 10:00:26 +00:00
Thomas Punt 9977bdf9b3 Remove more TSRMLS_CC macros 2017-01-18 10:00:15 +00:00
Xinchen Hui b012d48a3f Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
 2017-01-09 16:30:55 +08:00
Xinchen Hui 697809d425 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
 2017-01-09 16:30:48 +08:00
Xinchen Hui f7cb79431f Fixed bug #73854 (Always true condition in php_openssl_sockop_io) 2017-01-09 16:30:00 +08:00
Anatol Belski 97ac819c2b Merge branch 'PHP-7.1' 
* PHP-7.1:
  move various places to the centralized OpenSSL setup routine
  use the new API for opaque symbol in OpenSSL 1.1.x
  implement basic config support for OpenSSL 1.1.x
 2017-01-08 00:39:53 +01:00
Anatol Belski bf14ecc0d8 use the new API for opaque symbol in OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Anatol Belski df1e1fdcb9 implement basic config support for OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Joe Watkins c9c8a301fa Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix memleaks from #1755 and some pre-existing ones
 2017-01-07 10:15:37 +00:00
Joe Watkins 5ae45ef993 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix memleaks from #1755 and some pre-existing ones
 2017-01-07 10:15:15 +00:00
Leigh 21f287915c Remove superfluous variable reinit 2017-01-07 09:43:05 +00:00
Leigh 62e9e1fecd Some commentary, change free method 2017-01-06 15:49:15 +00:00
Leigh 9a0dac124e Conditionally free depending on how assignment happened 2017-01-06 15:24:37 +00:00
Leigh 053b966134 Fix memleaks from #1755 and some pre-existing ones 2017-01-06 14:58:54 +00: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
Sammy Kaye Powers dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers 478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Sammy Kaye Powers 9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06: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
Nikita Popov 7746ed9d5f Merge branch 'PHP-7.0' into PHP-7.1 2016-12-29 21:00:14 +01:00
Nikita Popov 78675ebd9a Fix flaky openssl_pkey_new test 
Public key size may vary by one bit... switch to using %d for
key sizes.
 2016-12-29 20:59:28 +01:00
Bob Weinand 1f474fddbb Merge branch 'PHP-7.1' 
Also inline alpn_ctx in openssl_netstream_data (no need for the extra allocation there)
 2016-12-22 23:40:24 +01:00
Bob Weinand 7b133e074c Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 23:34:51 +01:00
Bob Weinand ac1372d811 Fix alpn_ctx leaking in openssl 2016-12-22 23:34:07 +01:00
Anatol Belski e1ef67625a Merge branch 'PHP-7.1' 
* PHP-7.1:
  extend skip section
 2016-12-14 19:57:44 +01:00
Anatol Belski 382ec5cf9e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  extend skip section
 2016-12-14 19:56:19 +01:00
Anatol Belski 5136048064 extend skip section 
The day light offset is calculated based on the system TZ, so with
an unsuitable one there's no way to workaround the false positives.
 2016-12-14 19:53:55 +01:00
Anatol Belski 89c61768f7 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix ident
 2016-12-04 21:00:34 +01:00
Anatol Belski 69c3859368 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix ident
 2016-12-04 20:59:56 +01:00
Anatol Belski 69fbc751ff fix ident 2016-12-04 20:59:12 +01:00
Anatol Belski e72f6f0b65 Merge branch 'PHP-7.1' 
* PHP-7.1:
  enforce the test ini usage for the child process
  Fix session upgrade documentation
 2016-12-04 14:03:17 +01:00
Anatol Belski dfd776b326 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  enforce the test ini usage for the child process
 2016-12-04 14:02:37 +01:00
Anatol Belski 10a2ceef3b enforce the test ini usage for the child process 2016-12-04 14:01:40 +01:00
Jakub Zelenka 42155c3631 Merge branch 'PHP-7.1' 2016-11-27 19:00:57 +00:00
Jakub Zelenka 0ebdf3625e Do not add extra timeval entropy when OpenSSL 1.1 used 
It is already added by OpenSSL so it is not needed
 2016-11-27 19:00:05 +00:00
Jakub Zelenka 202e95e18f Merge branch 'PHP-7.1' 2016-11-27 18:57:35 +00:00
Jakub Zelenka 0f4216298f Clean up and fix php_openssl_dh_pub_from_priv 2016-11-27 18:54:28 +00:00
Matteo Beccati fa7dca5a78 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix occasionaly failing test
 2016-11-27 10:21:05 +01:00
Matteo Beccati 461add8adf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix occasionaly failing test
 2016-11-27 10:20:50 +01:00