diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
| commit | e3c681aa5cc71122a8d2fae42e6513fc413ccac8 (patch) | |
| tree | 5f1df62f7b666028edb0ee1adf083a52d63df45a /sapi/apache2handler/php_apache.h | |
| parent | fb4e3085cbaa76eb8f28eebf848a81d1c0190067 (diff) | |
| parent | 792e89385ca6fc722a03590722eb7745a2374720 (diff) | |
| download | php-git-e3c681aa5cc71122a8d2fae42e6513fc413ccac8.tar.gz | |
Merge branch 'master' into throw-error-in-extensions
Diffstat (limited to 'sapi/apache2handler/php_apache.h')
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index 489892cb60..69c01bbe02 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/php_apache.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -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) |