]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1fcb9e 79354ba)
Merge remote-tracking branch 'origin/master' into native-tls
authorAnatol Belski <ab@php.net>
Wed, 17 Dec 2014 16:46:48 +0000 (17:46 +0100)
committerAnatol Belski <ab@php.net>
Wed, 17 Dec 2014 16:46:48 +0000 (17:46 +0100)
* origin/master:
  fix integral constant overflow warning
  Use HUGE PAGES for opcahce SHM, if available.

1  2 
Zend/zend_compile.h patch | diff1 | diff2 | blob | history

diff --cc Zend/zend_compile.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.