tony2001 Wed Feb 7 09:35:09 2007 UTC
Added files:
/php-src/sapi/apache2handler mod_php.c
Removed files:
/php-src/sapi/apache2handler mod_php5.c
Modified files:
/php-src/sapi/apache2handler .cvsignore config.m4 config.w32
php.sym php5apache2.dsp php_apache.h
sapi_apache2.c
Log:
change "php5" to "php6" everywhere
rename mod_php5.c to mod_php.c
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/.cvsignore?r1=1.3&r2=1.4&diff_format=u
Index: php-src/sapi/apache2handler/.cvsignore
diff -u php-src/sapi/apache2handler/.cvsignore:1.3
php-src/sapi/apache2handler/.cvsignore:1.4
--- php-src/sapi/apache2handler/.cvsignore:1.3 Sun Oct 10 16:10:31 2004
+++ php-src/sapi/apache2handler/.cvsignore Wed Feb 7 09:35:09 2007
@@ -1,4 +1,4 @@
-libphp5.module
+libphp6.module
*.la
*.lo
.deps
@@ -14,3 +14,4 @@
Debug_TS
*.gcda
*.gcno
+.libs
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.m4?r1=1.15&r2=1.16&diff_format=u
Index: php-src/sapi/apache2handler/config.m4
diff -u php-src/sapi/apache2handler/config.m4:1.15
php-src/sapi/apache2handler/config.m4:1.16
--- php-src/sapi/apache2handler/config.m4:1.15 Thu Sep 1 14:33:37 2005
+++ php-src/sapi/apache2handler/config.m4 Wed Feb 7 09:35:09 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.15 2005/09/01 14:33:37 sniper Exp $
+dnl $Id: config.m4,v 1.16 2007/02/07 09:35:09 tony2001 Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 handler-module support via DSO through APXS)
@@ -68,20 +68,20 @@
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 @@
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
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/config.w32?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/apache2handler/config.w32
diff -u php-src/sapi/apache2handler/config.w32:1.2
php-src/sapi/apache2handler/config.w32:1.3
--- php-src/sapi/apache2handler/config.w32:1.2 Sun May 7 00:10:06 2006
+++ php-src/sapi/apache2handler/config.w32 Wed Feb 7 09:35:09 2007
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.2 2006/05/07 00:10:06 edink Exp $
+// $Id: config.w32,v 1.3 2007/02/07 09:35:09 tony2001 Exp $
ARG_ENABLE('apache2handler', 'Build Apache 2.x handler', 'no');
@@ -9,7 +9,7 @@
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 @@
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');
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php.sym?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/apache2handler/php.sym
diff -u php-src/sapi/apache2handler/php.sym:1.2
php-src/sapi/apache2handler/php.sym:1.3
--- php-src/sapi/apache2handler/php.sym:1.2 Sat Mar 29 04:52:46 2003
+++ php-src/sapi/apache2handler/php.sym Wed Feb 7 09:35:09 2007
@@ -1 +1 @@
-php5_module
+php6_module
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php5apache2.dsp?r1=1.1&r2=1.2&diff_format=u
Index: php-src/sapi/apache2handler/php5apache2.dsp
diff -u php-src/sapi/apache2handler/php5apache2.dsp:1.1
php-src/sapi/apache2handler/php5apache2.dsp:1.2
--- php-src/sapi/apache2handler/php5apache2.dsp:1.1 Sat Jan 17 13:00:06 2004
+++ php-src/sapi/apache2handler/php5apache2.dsp Wed Feb 7 09:35:09 2007
@@ -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 @@
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 @@
# 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 @@
# 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 @@
# 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 @@
# End Source File
# Begin Source File
-SOURCE=.\mod_php5.c
+SOURCE=.\mod_php.c
# End Source File
# Begin Source File
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/php_apache.h?r1=1.11&r2=1.12&diff_format=u
Index: php-src/sapi/apache2handler/php_apache.h
diff -u php-src/sapi/apache2handler/php_apache.h:1.11
php-src/sapi/apache2handler/php_apache.h:1.12
--- php-src/sapi/apache2handler/php_apache.h:1.11 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2handler/php_apache.h Wed Feb 7 09:35:09 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.h,v 1.11 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_apache.h,v 1.12 2007/02/07 09:35:09 tony2001 Exp $ */
#ifndef PHP_APACHE_H
#define PHP_APACHE_H
@@ -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;
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.81&r2=1.82&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.81
php-src/sapi/apache2handler/sapi_apache2.c:1.82
--- php-src/sapi/apache2handler/sapi_apache2.c:1.81 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Feb 7 09:35:09 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.81 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.82 2007/02/07 09:35:09 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -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 @@
} 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 @@
#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);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/mod_php.c?view=markup&rev=1.1
Index: php-src/sapi/apache2handler/mod_php.c
+++ php-src/sapi/apache2handler/mod_php.c
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2007 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Sascha Schumann <[EMAIL PROTECTED]> |
| Parts based on Apache 1.3 SAPI module by |
| Rasmus Lerdorf and Zeev Suraski |
+----------------------------------------------------------------------+
*/
/* $Id: mod_php.c,v 1.1 2007/02/07 09:35:09 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "php.h"
#include "php_apache.h"
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 */
NULL, /* create per-server config
structure */
NULL, /* merge per-server config
structures */
php_dir_cmds, /* command apr_table_t */
php_ap2_register_hook /* register hooks */
};
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
