Skip to content

Commit 6e3600f

Browse files
nikicnikic
committed
Remove major version from apache module
1 parent 480fa42 commit 6e3600f

File tree

12 files changed

+21
-21
lines changed

12 files changed

+21
-21
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ missing
8787
mkinstalldirs
8888

8989
# RPM specification file generated by `./configure`
90-
/php7.spec
90+
/php.spec
9191

9292
# Directories for shared object files and headers generated by `./configure`
9393
include/

‎Makefile.global‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ clean:
119119

120120
distclean: clean
121121
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
122-
rm -f php7.spec main/build-defs.h scripts/phpize
122+
rm -f php.spec main/build-defs.h scripts/phpize
123123
rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
124124
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
125125
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html

‎README.UNIX-BUILD-SYSTEM‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ module, program, etc).
108108

109109
For example for APXS:
110110

111-
PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php7.c php_apache.c)
111+
PHP_SELECT_SAPI(apache, shared, sapi_apache.c mod_php.c php_apache.c)
112112

113113

114114

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
15501550
$php_shtool mkdir -p scripts
15511551
$php_shtool mkdir -p scripts/man1
15521552

1553-
ALL_OUTPUT_FILES="php7.spec main/build-defs.h \
1553+
ALL_OUTPUT_FILES="php.spec main/build-defs.h \
15541554
scripts/phpize scripts/man1/phpize.1 \
15551555
scripts/php-config scripts/man1/php-config.1 \
15561556
$PHP_OUTPUT_FILES"

php7.spec.in renamed to php.spec.in

File renamed without changes.

‎sapi/apache2handler/config.m4‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,20 @@ if test "$PHP_APXS2" != "no"; then
6868
if test -z `$APXS -q SYSCONFDIR`; then
6969
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
7070
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
71-
-i -n php7"
71+
-i -n php"
7272
else
7373
APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
7474
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
7575
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
7676
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
7777
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
78-
-i -a -n php7"
78+
-i -a -n php"
7979
fi
8080

8181
case $host_alias in
8282
*aix*)
8383
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
84-
PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
84+
PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
8585
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
8686
;;
8787
*darwin*)
@@ -97,12 +97,12 @@ if test "$PHP_APXS2" != "no"; then
9797
fi
9898
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
9999
PHP_SUBST(MH_BUNDLE_FLAGS)
100-
PHP_SELECT_SAPI(apache2handler, bundle, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
101-
SAPI_SHARED=libs/libphp7.so
100+
PHP_SELECT_SAPI(apache2handler, bundle, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
101+
SAPI_SHARED=libs/libphp.so
102102
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
103103
;;
104104
*)
105-
PHP_SELECT_SAPI(apache2handler, shared, mod_php7.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
105+
PHP_SELECT_SAPI(apache2handler, shared, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
106106
INSTALL_IT="$INSTALL_IT $SAPI_LIBTOOL"
107107
;;
108108
esac

‎sapi/apache2handler/config.w32‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if (PHP_APACHE2HANDLER != "no") {
1010
CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2") &&
1111
CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\lib\\apache2")
1212
) {
13-
SAPI('apache2handler', 'mod_php7.c sapi_apache2.c apache_config.c php_functions.c',
13+
SAPI('apache2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c',
1414
'php' + PHP_VERSION + 'apache2.dll',
1515
'/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
1616
} else {
@@ -28,7 +28,7 @@ if (PHP_APACHE2_2HANDLER != "no") {
2828
CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") &&
2929
CHECK_LIB("libaprutil-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2")
3030
) {
31-
SAPI('apache2_2handler', 'mod_php7.c sapi_apache2.c apache_config.c php_functions.c',
31+
SAPI('apache2_2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c',
3232
'php' + PHP_VERSION + 'apache2_2.dll',
3333
'/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1',
3434
'sapi\\apache2_2handler');
@@ -46,7 +46,7 @@ if (PHP_APACHE2_4HANDLER != "no") {
4646
CHECK_LIB("libapr-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4") &&
4747
CHECK_LIB("libaprutil-1.lib", "apache2_4handler", PHP_PHP_BUILD + "\\lib\\apache2_4")
4848
) {
49-
SAPI('apache2_4handler', 'mod_php7.c sapi_apache2.c apache_config.c php_functions.c',
49+
SAPI('apache2_4handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c',
5050
'php' + PHP_VERSION + 'apache2_4.dll',
5151
'/D PHP_APACHE2_EXPORTS /I win32 /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1',
5252
'sapi\\apache2handler');

sapi/apache2handler/mod_php7.c renamed to sapi/apache2handler/mod_php.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "php.h"
2424
#include "php_apache.h"
2525

26-
AP_MODULE_DECLARE_DATA module php7_module = {
26+
AP_MODULE_DECLARE_DATA module php_module = {
2727
STANDARD20_MODULE_STUFF,
2828
create_php_config, /* create per-directory config structure */
2929
merge_php_config, /* merge per-directory config structures */

‎sapi/apache2handler/php.sym‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
php7_module
1+
php_module

‎sapi/apache2handler/php_apache.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
/* Enable per-module logging in Apache 2.4+ */
3131
#ifdef APLOG_USE_MODULE
32-
APLOG_USE_MODULE(php7);
32+
APLOG_USE_MODULE(php);
3333
#endif
3434

3535
/* Declare this so we can get to it from outside the sapi_apache2.c file */
36-
extern module AP_MODULE_DECLARE_DATA php7_module;
36+
extern module AP_MODULE_DECLARE_DATA php_module;
3737

3838
/* A way to specify the location of the php.ini dir in an apache directive */
3939
extern char *apache2_php_ini_path_override;

0 commit comments

Comments
 (0)