diff options
Diffstat (limited to 'sapi/apache2filter')
| -rw-r--r-- | sapi/apache2filter/config.m4 | 6 | ||||
| -rw-r--r-- | sapi/apache2filter/php.sym | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/php_apache.h | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index be1b57bd63..c106cadd6e 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -54,14 +54,14 @@ AC_ARG_WITH(apxs2filter, if test -z `$APXS -q SYSCONFDIR`; then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php4" + -i -n php5" 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 php4" + -i -a -n php5" fi case $host_alias in @@ -85,7 +85,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) - SAPI_SHARED=libs/libphp4.so + SAPI_SHARED=libs/libphp5.so INSTALL_IT="$INSTALL_IT $SAPI_SHARED" ;; *beos*) diff --git a/sapi/apache2filter/php.sym b/sapi/apache2filter/php.sym index 2dca1256c2..9ad0f0a0ad 100644 --- a/sapi/apache2filter/php.sym +++ b/sapi/apache2filter/php.sym @@ -1 +1 @@ -php4_module +php5_module diff --git a/sapi/apache2filter/php_apache.h b/sapi/apache2filter/php_apache.h index 1e3c5695a0..fd0821e3dc 100644 --- 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 php4_module; +extern module AP_MODULE_DECLARE_DATA php5_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 d1b64057dd..52ced1c784 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -421,7 +421,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, &php4_module); + void *conf = ap_get_module_config(f->r->per_dir_config, &php5_module); char *p = get_php_config(conf, "engine", sizeof("engine")); TSRMLS_FETCH(); @@ -670,7 +670,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 php4_module = { +AP_MODULE_DECLARE_DATA module php5_module = { STANDARD20_MODULE_STUFF, create_php_config, /* create per-directory config structure */ merge_php_config, /* merge per-directory config structures */ |