granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0f83123 5787f91)

author	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 8 Mar 2021 13:39:38 +0000 (14:39 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Mon, 8 Mar 2021 13:51:45 +0000 (14:51 +0100)
commit	3880b8785be8cec394e7290e0ef4307be0ae596e
tree	60d294cf19484d1237e13e2aa387b3a3042bf21e	tree \| snapshot
parent	0f8312342f3b0a639cd583b53ccdea56019d2685	commit \| diff
parent	5787f91c55a7ebaeb34711d303cfc27f089f58b3	commit \| diff

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #80838: HTTP wrapper waits for HTTP 1 response after HTTP 101

NEWS	diff1 \|	diff2 \|	blob \| history
ext/standard/http_fopen_wrapper.c	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/http/bug80838.phpt	\|	diff2 \|	blob \| history

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