diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-06-09 22:55:43 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-06-09 22:55:43 +0200 |
| commit | 76323fefac7f07326e106bb07ff38ddc4dd5d70b (patch) | |
| tree | 0802ed83490736a0fb2363eeb7519fb2d616f35d /sapi | |
| parent | c007b5bfbaa4f4b66d0195796fc575f672504c1c (diff) | |
| parent | 05a434c9c7ee4a9db399896e68e9ce9e125ddafb (diff) | |
| download | php-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')
| -rw-r--r-- | sapi/apache2handler/php_functions.c | 2 | ||||
| -rw-r--r-- | sapi/cgi/cgi_main.c | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_main.c | 2 | ||||
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 4 |
4 files changed, 5 insertions, 5 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 }; diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 14dccbde1e..a716b7cf3c 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1730,7 +1730,7 @@ static zend_module_entry cgi_module_entry = { NULL, NULL, PHP_MINFO(cgi), - NO_VERSION_YET, + PHP_VERSION, STANDARD_MODULE_PROPERTIES }; diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c index dd6671e102..9916b8bf7c 100644 --- a/sapi/fpm/fpm/fpm_main.c +++ b/sapi/fpm/fpm/fpm_main.c @@ -1528,7 +1528,7 @@ static zend_module_entry cgi_module_entry = { NULL, NULL, PHP_MINFO(cgi), - NO_VERSION_YET, + PHP_VERSION, STANDARD_MODULE_PROPERTIES }; diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index e553ba1ed0..991631081e 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -448,7 +448,7 @@ static int sapi_lsapi_activate() static sapi_module_struct lsapi_sapi_module = { "litespeed", - "LiteSpeed V7.3.2", + "LiteSpeed", php_lsapi_startup, /* startup */ php_module_shutdown_wrapper, /* shutdown */ @@ -1413,7 +1413,7 @@ zend_module_entry litespeed_module_entry = { NULL, NULL, NULL, - NO_VERSION_YET, + PHP_VERSION, STANDARD_MODULE_PROPERTIES }; |