granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: af26a28 aa3a5f7)

author	Adam Harvey <aharvey@php.net>
	Fri, 13 Jun 2014 00:40:51 +0000 (17:40 -0700)
committer	Adam Harvey <aharvey@php.net>
	Fri, 13 Jun 2014 00:40:51 +0000 (17:40 -0700)
commit	82231b5d895b67652c14ecb0ffddc8239777c175
tree	c265919b5d1c052c451ecd796aaccf6b8ea515b5	tree \| snapshot
parent	af26a28ac0d217b2d30409373dd54e070566b173	commit \| diff
parent	aa3a5f7681060b9fe7839479d4b4355ccaa10e5e	commit \| diff

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Keep 308-399 HTTP response codes when header('Location:') is called.

NEWS	diff1 \|	diff2 \|	blob \| history
main/SAPI.c	diff1 \|	diff2 \|	blob \| history

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