]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4921c1f 81c29af)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 14 Feb 2014 17:53:47 +0000 (10:53 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 14 Feb 2014 17:53:47 +0000 (10:53 -0700)
* PHP-5.6:
  Fix segfault accessing context when no context assigned

Conflicts:
ext/openssl/xp_ssl.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.