diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-19 17:05:48 +0100 |
| commit | e63a8540a60e95aa5bd8e269add1b02afcc1b79b (patch) | |
| tree | b83a144eec24cc81adab0b9a778f7a730d8df79e /sapi/apache2handler/php_apache.h | |
| parent | 7a4cc73641bb3eb878f7184bcbd026ee663cf2a9 (diff) | |
| parent | 53071e647049f099f7f7a0771ddb63fc2cdd621c (diff) | |
| download | php-git-e63a8540a60e95aa5bd8e269add1b02afcc1b79b.tar.gz | |
Merge branch 'openssl_error_store' into openssl_aead
Diffstat (limited to 'sapi/apache2handler/php_apache.h')
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 451e4e3e4c..69c01bbe02 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -24,10 +24,16 @@ #include "httpd.h" #include "http_config.h" #include "http_core.h" +#include "http_log.h" #include "php.h" #include "main/php_streams.h" +/* Enable per-module logging in Apache 2.4+ */ +#ifdef APLOG_USE_MODULE +APLOG_USE_MODULE(php7); +#endif + /* Declare this so we can get to it from outside the sapi_apache2.c file */ extern module AP_MODULE_DECLARE_DATA php7_module; @@ -80,7 +86,7 @@ extern zend_module_entry apache2_module_entry; #ifdef ZTS extern int php_apache2_info_id; #define AP2(v) ZEND_TSRMG(php_apache2_info_id, php_apache2_info_struct *, v) -ZEND_TSRMLS_CACHE_EXTERN(); +ZEND_TSRMLS_CACHE_EXTERN() #else extern php_apache2_info_struct php_apache2_info; #define AP2(v) (php_apache2_info.v) |