diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2015-02-09 15:14:47 -0500 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2015-02-09 15:14:47 -0500 |
| commit | 712712e8d69b48d4c2c7a2e6da6d01bd53286e0b (patch) | |
| tree | 2383fa1fb1c65adef2c8e427bc67844a5b497882 /sapi/apache/php_apache_http.h | |
| parent | f0d9d1828b694ee3df3bd2d4b6f14933f641bd98 (diff) | |
| parent | fb2314798e28b4970cb35497ebc615dffc48d930 (diff) | |
| download | php-git-712712e8d69b48d4c2c7a2e6da6d01bd53286e0b.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'sapi/apache/php_apache_http.h')
0 files changed, 0 insertions, 0 deletions