tony2001 Wed Feb 7 09:37:34 2007 UTC
Modified files:
/php-src/sapi/apache2filter config.m4 php.sym php_apache.h
sapi_apache2.c
Log:
upgrade apache2filter to php6
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/config.m4?r1=1.42&r2=1.43&diff_format=u
Index: php-src/sapi/apache2filter/config.m4
diff -u php-src/sapi/apache2filter/config.m4:1.42
php-src/sapi/apache2filter/config.m4:1.43
--- php-src/sapi/apache2filter/config.m4:1.42 Thu Sep 1 14:33:36 2005
+++ php-src/sapi/apache2filter/config.m4 Wed Feb 7 09:37:34 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.42 2005/09/01 14:33:36 sniper Exp $
+dnl $Id: config.m4,v 1.43 2007/02/07 09:37:34 tony2001 Exp $
dnl
AC_MSG_CHECKING(for Apache 2.0 filter-module support via DSO through APXS)
@@ -69,14 +69,14 @@
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
@@ -99,7 +99,7 @@
MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS"
PHP_SUBST(MH_BUNDLE_FLAGS)
PHP_SELECT_SAPI(apache2filter, bundle, sapi_apache2.c apache_config.c
php_functions.c, $APACHE_CFLAGS)
- SAPI_SHARED=libs/libphp5.so
+ SAPI_SHARED=libs/libphp6.so
INSTALL_IT="$INSTALL_IT $SAPI_SHARED"
;;
*beos*)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php.sym?r1=1.2&r2=1.3&diff_format=u
Index: php-src/sapi/apache2filter/php.sym
diff -u php-src/sapi/apache2filter/php.sym:1.2
php-src/sapi/apache2filter/php.sym:1.3
--- php-src/sapi/apache2filter/php.sym:1.2 Sat Mar 29 04:52:46 2003
+++ php-src/sapi/apache2filter/php.sym Wed Feb 7 09:37:34 2007
@@ -1 +1 @@
-php5_module
+php6_module
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_apache.h?r1=1.27&r2=1.28&diff_format=u
Index: php-src/sapi/apache2filter/php_apache.h
diff -u php-src/sapi/apache2filter/php_apache.h:1.27
php-src/sapi/apache2filter/php_apache.h:1.28
--- php-src/sapi/apache2filter/php_apache.h:1.27 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2filter/php_apache.h Wed Feb 7 09:37:34 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.h,v 1.27 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: php_apache.h,v 1.28 2007/02/07 09:37:34 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/apache2filter/sapi_apache2.c?r1=1.145&r2=1.146&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.145
php-src/sapi/apache2filter/sapi_apache2.c:1.146
--- php-src/sapi/apache2filter/sapi_apache2.c:1.145 Mon Jan 1 09:29:36 2007
+++ php-src/sapi/apache2filter/sapi_apache2.c Wed Feb 7 09:37:34 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.145 2007/01/01 09:29:36 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.146 2007/02/07 09:37:34 tony2001 Exp $ */
#include <fcntl.h>
@@ -440,7 +440,7 @@
{
php_struct *ctx;
apr_bucket *b;
- void *conf = ap_get_module_config(f->r->per_dir_config, &php5_module);
+ void *conf = ap_get_module_config(f->r->per_dir_config, &php6_module);
char *p = get_php_config(conf, "engine", sizeof("engine"));
TSRMLS_FETCH();
@@ -701,7 +701,7 @@
ap_register_input_filter("PHP", php_input_filter,
php_apache_disable_caching, AP_FTYPE_RESOURCE);
}
-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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
