summaryrefslogtreecommitdiff
path: root/sapi/apache_hooks
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-07-22 15:42:17 +0400
committerDmitry Stogov <dmitry@zend.com>2014-07-22 15:42:17 +0400
commitf2a2fcceceed5bb5851b459af9383d0da14a804b (patch)
tree6e9ac31a58214881ecd1380ba2b739b1dba17ce5 /sapi/apache_hooks
parent821b8bbb397a70151bdd039c072757e0f12fad19 (diff)
parentb39f98cf81cce1eae9f665a5c7f82c93e218a577 (diff)
downloadphp-git-f2a2fcceceed5bb5851b459af9383d0da14a804b.tar.gz
Merge branch 'master' into phpng
* master: fix nmake snap when ext name is different in target dll force atoll macro usage on windows Enable $ replacement in exif, ldap, pdo_pgsql and tidy See bug #67635 NEWS NEWS improve previous, add message during configure Fixed bug #67635 php links to systemd libraries without using pkg-config Improve fix for #66608 Fixed segfault with empty break New added opcodes don't need to be resloved Update NEWS Update NEWS Update NEWS Fixed bug #66827 Session raises E_NOTICE when session name variable is array implemented copy libs of core exts in phpize mode fix copy the ext dll into the prefix path in phpize mode fix default prefix in phpize mode fix file with zero size usage in phpize mode Conflicts: Zend/zend_opcode.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/session/session.c
Diffstat (limited to 'sapi/apache_hooks')
0 files changed, 0 insertions, 0 deletions