]> granicus.if.org Git - php/commit
Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 21 Feb 2014 16:13:55 +0000 (09:13 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 21 Feb 2014 16:13:55 +0000 (09:13 -0700)
commit5389d0963c28d3a08609eef787d288f8cb015c5a
treea6ccfb7a23bf5ae0605cec86bcf4046be94fa767
parentf51555ca581fb120726ba439fd0a4edcad2ae86a
parentb6edbd5897bfa18d6a8ae9a9662efa34abfba39e
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
ext/openssl/xp_ssl.c