com php-src: Merge branch 'PHP-5.6': ext/openssl/openssl.c ext/openssl/xp_ssl.c
| From: | Tjerk Anne Meesters | Date: | Thu, 31 Jul 2014 04:18:19 +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-79687@lists.php.net to get a copy of this message | ||
Commit: a41a16c5cd5af985be349d0cad8d0ad37698aae1
Author: Tjerk Meesters <datibbaw@php.net> Thu, 31 Jul 2014 12:18:19 +0800
Parents: 33ce329f57c039c45c6c5ab3239bcb9354f87ac3 8f345a7148dc396722dd48e25f17146975a04a63
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a41a16c5cd5af985be349d0cad8d0ad37698aae1
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Moved streams related functions to xp_ssl.c
Changed paths:
MM ext/openssl/openssl.c
MM ext/openssl/xp_ssl.c
Diff: