]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37897e2 e919501)
Merge branch 'PHP-5.5' into PHP-5.6
authorkrakjoe <joe.watkins@live.co.uk>
Wed, 1 Jan 2014 13:01:06 +0000 (13:01 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Wed, 1 Jan 2014 13:01:06 +0000 (13:01 +0000)
* PHP-5.5:
  fix #66375 bad logic in sapi header callback routine

1  2 
main/SAPI.c patch | diff1 | diff2 | blob | history

diff --cc main/SAPI.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.