upgrade apache2filter to php6

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 47b397cf6d7b2bfa150f27755c4f59125dde3dc9..8868370e31dc494c2e74eb174d4108b84acf499f 100644 (file)
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -69,14 +69,14 @@ AC_ARG_WITH(apxs2filter,
   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 @@ AC_ARG_WITH(apxs2filter,
     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*)

diff --git a/sapi/apache2filter/php.sym b/sapi/apache2filter/php.sym
index 9ad0f0a0adbc0fe08f8fac3e6d471ff872ef1cba..82a78abee5ee8e6ae1902cfc9c0743e95545cbec 100644 (file)
--- a/sapi/apache2filter/php.sym
+++ b/sapi/apache2filter/php.sym
@@ -1 +1 @@
-php5_module
+php6_module

diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h
index 2693bd364a6f8738b350948f661392cffa4a298c..e5fbe115a67401a77bd6957dace4e2ecdadbe2bf 100644 (file)
--- a/sapi/apache2filter/php_apache.h
+++ b/sapi/apache2filter/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;

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 1b8bae29b9d72406471de1de0684182280bbe2ec..b2f6a1dbfcb8ac709f5f197c03a2baf1dc5bd3f5 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -440,7 +440,7 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
 {
        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 @@ static void php_register_hook(apr_pool_t *p)
        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 */