From: Daniel Lowrey <rdlowrey@php.net>
Date: Fri, 21 Feb 2014 16:13:55 +0000 (-0700)
Subject: Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5389d0963c28d3a08609eef787d288f8cb015c5a;p=php

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
---

5389d0963c28d3a08609eef787d288f8cb015c5a