]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da05b7e 044eb39)
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Wed, 3 Oct 2018 12:34:08 +0000 (14:34 +0200)
committerAnatol Belski <ab@php.net>
Wed, 3 Oct 2018 12:34:08 +0000 (14:34 +0200)
* PHP-7.1:
  Avoid code duplication and don't miss env restore

1  2 
sapi/cgi/cgi_main.c patch | diff1 | diff2 | blob | history

diff --cc sapi/cgi/cgi_main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.