summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-06-09 22:55:43 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-06-09 22:55:43 +0200
commit76323fefac7f07326e106bb07ff38ddc4dd5d70b (patch)
tree0802ed83490736a0fb2363eeb7519fb2d616f35d /sapi/apache2handler
parentc007b5bfbaa4f4b66d0195796fc575f672504c1c (diff)
parent05a434c9c7ee4a9db399896e68e9ce9e125ddafb (diff)
downloadphp-git-76323fefac7f07326e106bb07ff38ddc4dd5d70b.tar.gz
Merge branch 'PHP-7.4'
* PHP-7.4: Extend wildcard files section in EditorConfig [ci skip] Simplify LiteSpeed SAPI module version Use PHP_VERSION for zend modules
Diffstat (limited to 'sapi/apache2handler')
-rw-r--r--sapi/apache2handler/php_functions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index ba2400f6a0..c82b93f965 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -559,6 +559,6 @@ zend_module_entry php_apache_module = {
NULL,
NULL,
PHP_MINFO(apache),
- NULL,
+ PHP_VERSION,
STANDARD_MODULE_PROPERTIES
};