diff -r 964224e9b8d9 sapi/apache2handler/config.m4 --- a/sapi/apache2handler/config.m4 Tue Dec 11 18:05:31 2018 +0000 +++ b/sapi/apache2handler/config.m4 Tue Dec 11 18:08:50 2018 +0000 @@ -68,20 +68,20 @@ if test -z `$APXS -q SYSCONFDIR`; then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php7" + -i -n php" else APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -S SYSCONFDIR='$APXS_SYSCONFDIR' \ - -i -a -n php7" + -i -a -n php" fi case $host_alias in *aix*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" - PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) + PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; *darwin*) @@ -102,7 +102,7 @@ INSTALL_IT="$INSTALL_IT $SAPI_SHARED" ;; *) - PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) + PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS) INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL" ;; esac diff -r 964224e9b8d9 sapi/apache2handler/mod_php7.c --- a/sapi/apache2handler/mod_php7.c Tue Dec 11 18:05:31 2018 +0000 +++ b/sapi/apache2handler/mod_php7.c Tue Dec 11 18:08:50 2018 +0000 @@ -23,7 +23,7 @@ #include "php.h" #include "php_apache.h" -AP_MODULE_DECLARE_DATA module php7_module = { +AP_MODULE_DECLARE_DATA module php_module = { STANDARD20_MODULE_STUFF, create_php_config, /* create per-directory config structure */ merge_php_config, /* merge per-directory config structures */ diff -r 964224e9b8d9 sapi/apache2handler/php.sym --- a/sapi/apache2handler/php.sym Tue Dec 11 18:05:31 2018 +0000 +++ b/sapi/apache2handler/php.sym Tue Dec 11 18:08:50 2018 +0000 @@ -1,1 +1,1 @@ -php7_module +php_module diff -r 964224e9b8d9 sapi/apache2handler/php_apache.h --- a/sapi/apache2handler/php_apache.h Tue Dec 11 18:05:31 2018 +0000 +++ b/sapi/apache2handler/php_apache.h Tue Dec 11 18:08:50 2018 +0000 @@ -29,11 +29,11 @@ /* Enable per-module logging in Apache 2.4+ */ #ifdef APLOG_USE_MODULE -APLOG_USE_MODULE(php7); +APLOG_USE_MODULE(php); #endif /* Declare this so we can get to it from outside the sapi_apache2.c file */ -extern module AP_MODULE_DECLARE_DATA php7_module; +extern module AP_MODULE_DECLARE_DATA php_module; /* A way to specify the location of the php.ini dir in an apache directive */ extern char *apache2_php_ini_path_override; diff -r 964224e9b8d9 sapi/apache2handler/sapi_apache2.c --- a/sapi/apache2handler/sapi_apache2.c Tue Dec 11 18:05:31 2018 +0000 +++ b/sapi/apache2handler/sapi_apache2.c Tue Dec 11 18:08:50 2018 +0000 @@ -55,7 +55,7 @@ #define PHP_MAGIC_TYPE "application/x-httpd-php" #define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source" -#define PHP_SCRIPT "php7-script" +#define PHP_SCRIPT "php-script" /* A way to specify the location of the php.ini dir in an apache directive */ char *apache2_php_ini_path_override = NULL; @@ -548,7 +548,7 @@ HashTable config; } php_conf_rec; zend_string *str; - php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php7_module); + php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php_module); ZEND_HASH_FOREACH_STR_KEY(&c->config, str) { zend_restore_ini_entry(str, ZEND_INI_STAGE_SHUTDOWN); @@ -577,7 +577,7 @@ #define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req); - conf = ap_get_module_config(r->per_dir_config, &php7_module); + conf = ap_get_module_config(r->per_dir_config, &php_module); /* apply_config() needs r in some cases, so allocate server_context early */ ctx = SG(server_context);