diff options
| author | Sterling Hughes <sterling@php.net> | 2003-03-29 04:52:46 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2003-03-29 04:52:46 +0000 |
| commit | 3f700e58abaa78ec2b4eca749906bcea80a121bf (patch) | |
| tree | 7a15d6e397bfc69d2d504b159c5a23253b7d06f1 /sapi/apache2handler | |
| parent | 789b0a83f063f7f009192294d40a33f40c6ea0dc (diff) | |
| download | php-git-3f700e58abaa78ec2b4eca749906bcea80a121bf.tar.gz | |
update php module name to php5, not php4.
apache, apache2* and cli/cgi work.
sapi module maintainers should fix up their sapis, as I don't run
any servers with php outside of apache.
Diffstat (limited to 'sapi/apache2handler')
| -rw-r--r-- | sapi/apache2handler/config.m4 | 6 | ||||
| -rw-r--r-- | sapi/apache2handler/php.sym | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/php_apache.h | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index d4d04e1451..6d159f4424 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -54,14 +54,14 @@ AC_ARG_WITH(apxs2, 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(apxs2, MH_BUNDLE_FLAGS="-bundle -bundle_loader $APXS_HTTPD $MH_BUNDLE_FLAGS" PHP_SUBST(MH_BUNDLE_FLAGS) PHP_SELECT_SAPI(apache2handler, 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/apache2handler/php.sym b/sapi/apache2handler/php.sym index 2dca1256c2..9ad0f0a0ad 100644 --- a/sapi/apache2handler/php.sym +++ b/sapi/apache2handler/php.sym @@ -1 +1 @@ -php4_module +php5_module diff --git a/sapi/apache2handler/php_apache.h b/sapi/apache2handler/php_apache.h index febbe4fa0d..106efacf3d 100644 --- a/sapi/apache2handler/php_apache.h +++ b/sapi/apache2handler/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/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 9f0336ae1a..f99cc5c9b7 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -449,7 +449,7 @@ static int php_handler(request_rec *r) request_rec *parent_req = NULL; TSRMLS_FETCH(); - conf = ap_get_module_config(r->per_dir_config, &php4_module); + conf = ap_get_module_config(r->per_dir_config, &php5_module); apply_config(conf); if (strcmp(r->handler, PHP_MAGIC_TYPE) && strcmp(r->handler, PHP_SOURCE_MAGIC_TYPE) && strcmp(r->handler, PHP_SCRIPT)) { @@ -556,7 +556,7 @@ static void php_register_hook(apr_pool_t *p) ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE); } -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 */ |