]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 792630b 5dcace0)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 05:42:25 +0000 (22:42 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Thu, 5 Mar 2015 05:42:25 +0000 (22:42 -0700)
commit94a70b98a65db700192258addfa627101bbd86c5
treec0469bbdb4624dfc4f31344d3b9afea986c80a10tree | snapshot
parent792630bc50381457cf086340637328ecfa691af4commit | diff
parent5dcace058a1384c8475e144e11310e260235dc3ccommit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68879 (IP Address fields in subjectAltNames not used)
  Fix broken test

Conflicts:
ext/openssl/xp_ssl.c
ext/openssl/xp_ssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.