com php-src: Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6: ext/openssl/x p_ssl.c
| From: | rdlowrey@php.net | Date: | Fri, 21 Feb 2014 16:13:55 +0000 |
| Subject: | com php-src: Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6: ext/openssl/x p_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76167@lists.php.net to get a copy of this message | ||
Commit: 5389d0963c28d3a08609eef787d288f8cb015c5a
Author: Daniel Lowrey <rdlowrey@php.net> Fri, 21 Feb 2014 09:13:55 -0700
Parents: f51555ca581fb120726ba439fd0a4edcad2ae86a b6edbd5897bfa18d6a8ae9a9662efa34abfba39e
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5389d0963c28d3a08609eef787d288f8cb015c5a
Log:
Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'reneg-limit' of https://github.com/rdlowrey/php-src:
Mitigate client-initiated SSL renegotiation DoS
Changed paths:
MM ext/openssl/xp_ssl.c
Diff: