granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 58273f6 b351ec8)

author	Joe Watkins <krakjoe@php.net>
	Sat, 7 Jan 2017 10:15:15 +0000 (10:15 +0000)
committer	Joe Watkins <krakjoe@php.net>
	Sat, 7 Jan 2017 10:15:15 +0000 (10:15 +0000)
commit	5ae45ef99374b02a676faaad5384ec8c0784d185
tree	e3e60f1b4ea16f384d0da4817dfa505fe57de944	tree \| snapshot
parent	58273f631b062fa0268fe7824feec92e72f5bda0	commit \| diff
parent	b351ec8bafe98d9a005aa6465557f7a2aaf8d8b0	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix memleaks from #1755 and some pre-existing ones

ext/openssl/openssl.c

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