mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
change "php5" to "php6" everywhere
rename mod_php5.c to mod_php.c
This commit is contained in:
parent
cfd4e53858
commit
903ef1a071
@ -68,20 +68,20 @@ AC_ARG_WITH(apxs2,
|
||||
if test -z `$APXS -q SYSCONFDIR`; then
|
||||
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
|
||||
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
||||
-i -n php5"
|
||||
-i -n php6"
|
||||
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 php5"
|
||||
-i -a -n php6"
|
||||
fi
|
||||
|
||||
case $host_alias in
|
||||
*aix*)
|
||||
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp"
|
||||
PHP_SELECT_SAPI(apache2handler, shared, mod_php5.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*)
|
||||
@ -97,19 +97,19 @@ AC_ARG_WITH(apxs2,
|
||||
fi
|
||||
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
|
||||
PHP_SUBST(MH_BUNDLE_FLAGS)
|
||||
PHP_SELECT_SAPI(apache2handler, bundle, mod_php5.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
|
||||
SAPI_SHARED=libs/libphp5.so
|
||||
PHP_SELECT_SAPI(apache2handler, bundle, mod_php.c sapi_apache2.c apache_config.c php_functions.c, $APACHE_CFLAGS)
|
||||
SAPI_SHARED=libs/libphp6.so
|
||||
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
|
||||
;;
|
||||
*beos*)
|
||||
if test -f _APP_; then `rm _APP_`; fi
|
||||
`ln -s $APXS_BINDIR/httpd _APP_`
|
||||
EXTRA_LIBS="$EXTRA_LIBS _APP_"
|
||||
PHP_SELECT_SAPI(apache2handler, shared, mod_php5.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"
|
||||
;;
|
||||
*)
|
||||
PHP_SELECT_SAPI(apache2handler, shared, mod_php5.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
|
||||
|
@ -9,7 +9,7 @@ if (PHP_APACHE2HANDLER != "no") {
|
||||
CHECK_LIB("libapr.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib") &&
|
||||
CHECK_LIB("libaprutil.lib", "apache2handler", PHP_PHP_BUILD + "\\apache2\\lib")
|
||||
) {
|
||||
SAPI('apache2handler', 'mod_php5.c sapi_apache2.c apache_config.c php_functions.c',
|
||||
SAPI('apache2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c',
|
||||
'php' + PHP_VERSION + 'apache2.dll',
|
||||
'/D PHP_APACHE2_EXPORTS /I win32');
|
||||
} else {
|
||||
@ -25,7 +25,7 @@ if (PHP_APACHE2_2HANDLER != "no") {
|
||||
CHECK_LIB("libapr-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2") &&
|
||||
CHECK_LIB("libaprutil-1.lib", "apache2_2handler", PHP_PHP_BUILD + "\\lib\\apache2_2")
|
||||
) {
|
||||
SAPI('apache2_2handler', 'mod_php5.c sapi_apache2.c apache_config.c php_functions.c',
|
||||
SAPI('apache2_2handler', 'mod_php.c sapi_apache2.c apache_config.c php_functions.c',
|
||||
'php' + PHP_VERSION + 'apache2_2.dll',
|
||||
'/D PHP_APACHE2_EXPORTS /I win32',
|
||||
'sapi\\apache2_2handler');
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include "php.h"
|
||||
#include "php_apache.h"
|
||||
|
||||
AP_MODULE_DECLARE_DATA module php5_module = {
|
||||
AP_MODULE_DECLARE_DATA module php6_module = {
|
||||
STANDARD20_MODULE_STUFF,
|
||||
create_php_config, /* create per-directory config structure */
|
||||
merge_php_config, /* merge per-directory config structures */
|
@ -1 +1 @@
|
||||
php5_module
|
||||
php6_module
|
||||
|
@ -1,25 +1,25 @@
|
||||
# Microsoft Developer Studio Project File - Name="php5apache2" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Project File - Name="php6apache2" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
||||
|
||||
CFG=php5apache2 - Win32 Debug_TS
|
||||
CFG=php6apache2 - Win32 Debug_TS
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "php5apache2.mak".
|
||||
!MESSAGE NMAKE /f "php6apache2.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "php5apache2.mak" CFG="php5apache2 - Win32 Debug_TS"
|
||||
!MESSAGE NMAKE /f "php6apache2.mak" CFG="php6apache2 - Win32 Debug_TS"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "php5apache2 - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php5apache2 - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php5apache2 - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php6apache2 - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php6apache2 - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "php6apache2 - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
@ -30,7 +30,7 @@ CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "php5apache2 - Win32 Release_TS"
|
||||
!IF "$(CFG)" == "php6apache2 - Win32 Release_TS"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -54,9 +54,9 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 php5ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
|
||||
# ADD LINK32 php6ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /libpath:"..\..\Release_TS" /libpath:"..\..\TSRM\Release_TS" /libpath:"..\..\Zend\Release_TS"
|
||||
|
||||
!ELSEIF "$(CFG)" == "php5apache2 - Win32 Release_TS_inline"
|
||||
!ELSEIF "$(CFG)" == "php6apache2 - Win32 Release_TS_inline"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
@ -80,9 +80,9 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 php5ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php5apache2.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
|
||||
# ADD LINK32 php6ts.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS_inline/php6apache2.dll" /libpath:"..\..\Release_TS_inline" /libpath:"..\..\TSRM\Release_TS_inline" /libpath:"..\..\Zend\Release_TS_inline"
|
||||
|
||||
!ELSEIF "$(CFG)" == "php5apache2 - Win32 Debug_TS"
|
||||
!ELSEIF "$(CFG)" == "php6apache2 - Win32 Debug_TS"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@ -105,15 +105,15 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 php5ts_debug.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
|
||||
# ADD LINK32 php6ts_debug.lib libhttpd.lib libapr.lib libaprutil.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\Debug_TS" /libpath:"..\..\TSRM\Debug_TS" /libpath:"..\..\Zend\Debug_TS"
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "php5apache2 - Win32 Release_TS"
|
||||
# Name "php5apache2 - Win32 Release_TS_inline"
|
||||
# Name "php5apache2 - Win32 Debug_TS"
|
||||
# Name "php6apache2 - Win32 Release_TS"
|
||||
# Name "php6apache2 - Win32 Release_TS_inline"
|
||||
# Name "php6apache2 - Win32 Debug_TS"
|
||||
# Begin Group "Source Files"
|
||||
|
||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
@ -123,7 +123,7 @@ SOURCE=.\apache_config.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\mod_php5.c
|
||||
SOURCE=.\mod_php.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
#include "http_core.h"
|
||||
|
||||
/* Declare this so we can get to it from outside the sapi_apache2.c file */
|
||||
extern module AP_MODULE_DECLARE_DATA php5_module;
|
||||
extern module AP_MODULE_DECLARE_DATA php6_module;
|
||||
|
||||
/* A way to specify the location of the php.ini dir in an apache directive */
|
||||
extern char *apache2_php_ini_path_override;
|
||||
|
@ -61,7 +61,7 @@
|
||||
|
||||
#define PHP_MAGIC_TYPE "application/x-httpd-php"
|
||||
#define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source"
|
||||
#define PHP_SCRIPT "php5-script"
|
||||
#define PHP_SCRIPT "php6-script"
|
||||
|
||||
/* A way to specify the location of the php.ini dir in an apache directive */
|
||||
char *apache2_php_ini_path_override = NULL;
|
||||
@ -468,7 +468,7 @@ typedef struct {
|
||||
} php_conf_rec;
|
||||
char *str;
|
||||
uint str_len;
|
||||
php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php5_module);
|
||||
php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php6_module);
|
||||
|
||||
for (zend_hash_internal_pointer_reset(&c->config);
|
||||
zend_hash_get_current_key_ex(&c->config, &str, &str_len, NULL, 0, NULL) == HASH_KEY_IS_STRING;
|
||||
@ -496,7 +496,7 @@ static int php_handler(request_rec *r)
|
||||
|
||||
#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
|
||||
|
||||
conf = ap_get_module_config(r->per_dir_config, &php5_module);
|
||||
conf = ap_get_module_config(r->per_dir_config, &php6_module);
|
||||
|
||||
/* apply_config() needs r in some cases, so allocate server_context early */
|
||||
ctx = SG(server_context);
|
||||
|
Loading…
Reference in New Issue
Block a user