summaryrefslogtreecommitdiff
path: root/sapi/apache2handler/php_apache.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-10-15 12:09:14 +0200
committerAnatol Belski <ab@php.net>2014-10-15 12:09:14 +0200
commitd6d856b6db68b152a9cf72d16324a10180735bee (patch)
tree00c23c2b2581a0c2151e566e16ce8756c0207d29 /sapi/apache2handler/php_apache.h
parent98a8481e5e6bb111e8bb17af929f6fdbda308cb9 (diff)
parent52b93004d070ff59a1ed6dcd91c8b08935fc1c04 (diff)
downloadphp-git-d6d856b6db68b152a9cf72d16324a10180735bee.tar.gz
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: Fixed ext/standard/tests/strings/pack64_32.phpt failure (In PHP7, we must not free array of arguments recieved using "+")
Diffstat (limited to 'sapi/apache2handler/php_apache.h')
0 files changed, 0 insertions, 0 deletions