com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Fri, 21 Feb 2014 16:15:53 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76169@lists.php.net to get a copy of this message | ||
Commit: 1268bd6045ea0fce57c5c10a1faca98a70dd692b
Author: Daniel Lowrey <rdlowrey@php.net> Fri, 21 Feb 2014 09:15:53 -0700
Parents: 04a10be9dbb2353362ce922441d910be5926adf2 5389d0963c28d3a08609eef787d288f8cb015c5a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1268bd6045ea0fce57c5c10a1faca98a70dd692b
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Mitigate client-initiated SSL renegotiation DoS
Changed paths:
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
Diff: