]> granicus.if.org Git - php/commitdiff
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)
* 'reneg-limit' of https://github.com/rdlowrey/php-src:
  Mitigate client-initiated SSL renegotiation DoS

1  2 
ext/openssl/xp_ssl.c

Simple merge