granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2f70038 a55bcaa)

author	Remi Collet <remi@php.net>
	Wed, 29 Aug 2018 12:41:27 +0000 (14:41 +0200)
committer	Remi Collet <remi@php.net>
	Wed, 29 Aug 2018 12:41:27 +0000 (14:41 +0200)
commit	404a97dd5728b3c91122066d2a5c5f7433fad4c8
tree	ba07acceea4d55f830e188078744388e1cb5d23e	tree \| snapshot
parent	2f7003847d3b48ea89fdec2bd5388085cf6b4d0e	commit \| diff
parent	a55bcaa14ddba2df0c0f9c7f4444fc9d9f6564fd	commit \| diff

Merge branch 'PHP-7.3'

* PHP-7.3:
Revert "Support fixed address mmap without replacement"
Revert "Don't report mmap failure if it is expected"

Zend/zend_alloc.c

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