]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 57a6209 8a7e2f8)
Merge branch 'PHP-5.6'
authorkrakjoe <joe.watkins@live.co.uk>
Wed, 1 Jan 2014 13:01:41 +0000 (13:01 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Wed, 1 Jan 2014 13:01:41 +0000 (13:01 +0000)
commit9e4ab7c53fecb096ce0956c4aa138912ab80fa5a
treef6d269d1f6630bb08806069a4d66b5ca98f207b8tree | snapshot
parent57a62090515e7c4561b832aad4068aaff437ff5dcommit | diff
parent8a7e2f8dd2116ff6ada654e301c593accf337250commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix #66375 bad logic in sapi header callback routine
main/SAPI.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.