granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 78e2375 231a311)

author	Anatol Belski <ab@php.net>
	Mon, 29 Sep 2014 15:29:00 +0000 (17:29 +0200)
committer	Anatol Belski <ab@php.net>
	Mon, 29 Sep 2014 15:29:00 +0000 (17:29 +0200)
commit	b428dc761deb46be0e137e6c9c43b743bd95ce83
tree	c6c3dc4b566be67bab207530a871e70e954ebef8	tree \| snapshot
parent	78e23758b7efa10d7f7957534c101e344c880545	commit \| diff
parent	231a311ecbfc2e680a4353ff6738024e52e02326	commit \| diff

Merge branch 'PHP-5.6'

* PHP-5.6:
increase the polling period to not to break existing behaviours

main/streams/plain_wrapper.c

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