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.

diff --git a/Makefile.global b/Makefile.global
index e286980e2a82fc093d74373a672b62f26b53ac67..607deaece8a189dab4925bb741aa72c88031ac9e 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -10,22 +10,22 @@ all: $(all_targets)
 
 build-modules: $(PHP_MODULES)
 
-libphp4.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 
-libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-       $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
+libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+       $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp5.so
 
 install: $(install_targets)
 
-install-sapi: libphp4.la
+install-sapi: libphp5.la
        @echo "Installing PHP SAPI module"
-       -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
+       -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
        -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-       -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+       -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
                for i in 0.0.0 0.0 0; do \
-                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
-                               $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
+                       if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
+                               $(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
                                break; \
                        fi; \
                done; \
@@ -57,10 +57,10 @@ clean:
        find . -name \*.la -o -name \*.a | xargs rm -f 
        find . -name \*.so | xargs rm -f
        find . -name .libs -a -type d|xargs rm -rf
-       rm -f libphp4.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+       rm -f libphp5.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-       rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php4.spec sapi/apache/libphp4.module buildmk.stamp
+       rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp
        egrep define'.*include/php' configure|sed 's/.*>//'|xargs rm -f
        find . -name Makefile | xargs rm -f
 

diff --git a/acinclude.m4 b/acinclude.m4
index af59070fb78191915f3219a0e119aabda91c896f..207cacd031053b9947f9e059e039edb05479bedf 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -781,7 +781,7 @@ dnl PHP_BUILD_SHARED
 dnl
 AC_DEFUN([PHP_BUILD_SHARED],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libphp4.la
+  OVERALL_TARGET=libphp5.la
   php_build_target=shared
   
   php_c_pre=$shared_c_pre
@@ -798,7 +798,7 @@ dnl PHP_BUILD_STATIC
 dnl
 AC_DEFUN([PHP_BUILD_STATIC],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libphp4.la
+  OVERALL_TARGET=libphp5.la
   php_build_target=static
 ])
 
@@ -807,7 +807,7 @@ dnl PHP_BUILD_BUNDLE
 dnl
 AC_DEFUN([PHP_BUILD_BUNDLE],[
   PHP_BUILD_PROGRAM
-  OVERALL_TARGET=libs/libphp4.bundle
+  OVERALL_TARGET=libs/libphp5.bundle
   php_build_target=static
 ])
 

diff --git a/configure.in b/configure.in
index 8139af2e9844419df34630c6e7bc7b3706f972f3..5a4de05eaaf86a2805f420df7c16dfa85cdba159 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -229,9 +229,9 @@ dnl SAPI configuration.
 dnl -------------------------------------------------------------------------
 
 dnl paths to the targets are relative to the build directory
-SAPI_SHARED=libs/libphp4.$SHLIB_SUFFIX_NAME
-SAPI_STATIC=libs/libphp4.a
-SAPI_LIBTOOL=libphp4.la
+SAPI_SHARED=libs/libphp5.$SHLIB_SUFFIX_NAME
+SAPI_STATIC=libs/libphp5.a
+SAPI_LIBTOOL=libphp5.la
 
 PHP_CONFIGURE_PART(Configuring SAPI modules)
 

diff --git a/sapi/apache/apMakefile.tmpl b/sapi/apache/apMakefile.tmpl
index 80fe34656151eef5a003062befcfe4ef81362b48..5f77d9c9c9d474ee8a6a5b1659f55c47e5060020 100644 (file)
--- a/sapi/apache/apMakefile.tmpl
+++ b/sapi/apache/apMakefile.tmpl
@@ -1,38 +1,38 @@
 ##
-##  Apache 1.3 Makefile template for PHP 4.0 Module
-##  [src/modules/php4/Makefile.tmpl]
+##  Apache 1.3 Makefile template for PHP 5.0 Module
+##  [src/modules/php5/Makefile.tmpl]
 ##
 
 #   the parametrized target
-LIB=libphp4.$(LIBEXT)
+LIB=libphp5.$(LIBEXT)
 
 #   objects for building the static library
-OBJS=mod_php4.o
-OBJS_LIB=libmodphp4.a
+OBJS=mod_php5.o
+OBJS_LIB=libmodphp5.a
 
 #   objects for building the shared object library
-SHLIB_OBJS=mod_php4.so-o
-SHLIB_OBJS_LIB=libmodphp4.a
+SHLIB_OBJS=mod_php5.so-o
+SHLIB_OBJS_LIB=libmodphp5.a
 
 #   the general targets
 all: lib
 lib: $(LIB)
 
 #   build the static library by merging the object files
-libphp4.a: $(OBJS) $(OBJS_LIB)
+libphp5.a: $(OBJS) $(OBJS_LIB)
        cp $(OBJS_LIB) $@
        ar r $@ $(OBJS)
        $(RANLIB) $@
 
 #   ugly hack to support older Apache-1.3 betas that don't set $LIBEXT
-libphp4.: $(OBJS) $(OBJS_LIB)
+libphp5.: $(OBJS) $(OBJS_LIB)
        cp $(OBJS_LIB) $@
        ar r $@ $(OBJS)
        $(RANLIB) $@
-       cp libphp4. libphp4.a
+       cp libphp5. libphp5.a
 
 #   build the shared object library by linking the object files
-libphp4.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
+libphp5.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
        rm -f $@
        $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(SHLIB_OBJS) $(SHLIB_OBJS_LIB) $(LIBS) $(PHP_LIBS) 
 
@@ -69,9 +69,9 @@ depend:
 $(OBJS): Makefile
 
 # DO NOT REMOVE
-mod_php4.o: mod_php4.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+mod_php5.o: mod_php5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
  $(INCDIR)/buff.h \
  $(INCDIR)/http_config.h \
  $(INCDIR)/http_core.h $(INCDIR)/http_main.h \
  $(INCDIR)/http_protocol.h $(INCDIR)/http_request.h \
- $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php4.h
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php5.h

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 9fb54cf03334a81dd7f41934d9f1c1d83c653b58..f0eeb4bae5053f33993046c16596fa3302c5d9e7 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -58,7 +58,7 @@ AC_ARG_WITH(apxs,
   *darwin*)
     MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
     PHP_SUBST(MH_BUNDLE_FLAGS)
-    SAPI_SHARED=libs/libphp4.so
+    SAPI_SHARED=libs/libphp5.so
     build_type=bundle
     ;;
   *)
@@ -66,26 +66,26 @@ AC_ARG_WITH(apxs,
     ;;
   esac
 
-  PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php4.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
+  PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php5.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
 
   # Test whether apxs support -S option
   $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
 
   if test "$?" != "0"; then
-    APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option
+    APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
   else 
     APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
     if test -z `$APXS -q SYSCONFDIR`; then
       APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                             -i -n php4 $SAPI_SHARED"
+                             -i -n php5 $SAPI_SHARED"
     else
       APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
       APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                             -i -a -n php4 $SAPI_SHARED"
+                             -i -a -n php5 $SAPI_SHARED"
     fi
   fi
 
@@ -107,7 +107,7 @@ AC_ARG_WITH(apache,
 [  --with-apache[=DIR]     Build Apache 1.x module. DIR is the top-level Apache
                           build directory, defaults to /usr/local/apache.],[
 
-  APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php4.* sapi/apache/libphp4.module"
+  APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module"
 
   if test "$withval" = "yes"; then
     # Apache's default directory
@@ -121,7 +121,7 @@ AC_ARG_WITH(apache,
     if test -f $withval/src/httpd.h; then 
       APACHE_INCLUDE=-I$withval/src
       APACHE_TARGET=$withval/src
-      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
+      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
       APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_INSTALL_FILES $APACHE_TARGET"
       PHP_LIBS="-L. -lphp3"
       AC_MSG_RESULT(yes - Apache 1.2.x)
@@ -137,13 +137,13 @@ AC_ARG_WITH(apache,
     elif test -f $withval/src/main/httpd.h; then
       APACHE_HAS_REGEX=1
       APACHE_INCLUDE="-I$withval/src/main -I$withval/src/os/unix -I$withval/src/ap"
-      APACHE_TARGET=$withval/src/modules/php4
+      APACHE_TARGET=$withval/src/modules/php5
       if test ! -d $APACHE_TARGET; then
         mkdir $APACHE_TARGET
       fi
-      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
-      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-      PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
+      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+      PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
       AC_MSG_RESULT(yes - Apache 1.3.x)
       STRONGHOLD=
       if test -f $withval/src/include/ap_config.h; then
@@ -163,13 +163,13 @@ AC_ARG_WITH(apache,
     elif test -f $withval/src/include/httpd.h; then
       APACHE_HAS_REGEX=1
       APACHE_INCLUDE="-I$withval/src/include -I$withval/src/os/unix"
-      APACHE_TARGET=$withval/src/modules/php4
+      APACHE_TARGET=$withval/src/modules/php5
       if test ! -d $APACHE_TARGET; then
         mkdir $APACHE_TARGET
       fi
-      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
-      PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+      PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
       AC_MSG_RESULT(yes - Apache 1.3.x)
       STRONGHOLD=
       if test -f $withval/src/include/ap_config.h; then
@@ -189,9 +189,9 @@ AC_ARG_WITH(apache,
     elif test -f $withval/apache/httpd.h; then
       APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
       APACHE_TARGET=$withval/apache
-      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php4.c php_apache.c, $APACHE_INCLUDE)
-      PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
-      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
+      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php5.c php_apache.c, $APACHE_INCLUDE)
+      PHP_LIBS="-Lmodules/php5 -L../modules/php5 -L../../modules/php5 -lmodphp5"
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp5.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
       STRONGHOLD=-DSTRONGHOLD=1
       AC_MSG_RESULT(yes - StrongHold)
       if test -f $withval/apache/ap_config.h; then
@@ -221,7 +221,7 @@ AC_ARG_WITH(apache,
 fi
 
 if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
-  APXS_EXP=-bE:sapi/apache/mod_php4.exp
+  APXS_EXP=-bE:sapi/apache/mod_php5.exp
 fi
 
 PHP_SUBST(APXS_EXP)
@@ -256,7 +256,7 @@ AC_ARG_WITH(mod_charset,
 if test -n "$APACHE_MODULE"; then
   PHP_TARGET_RDYNAMIC
   $php_shtool mkdir -p sapi/apache
-  PHP_OUTPUT(sapi/apache/libphp4.module)
+  PHP_OUTPUT(sapi/apache/libphp5.module)
 fi
 
 if test -n "$APACHE_INSTALL"; then

diff --git a/sapi/apache/libphp4.module.in b/sapi/apache/libphp5.module.in
similarity index 96%
rename from sapi/apache/libphp4.module.in
rename to sapi/apache/libphp5.module.in
index 429c566fadbc29c94c92c81cbeba943e0ac648dc..00d9c49f401bc612916ccf6b5b44fea611e21d4e 100644 (file)
--- a/sapi/apache/libphp4.module.in
+++ b/sapi/apache/libphp5.module.in
@@ -1,4 +1,4 @@
-Name: php4_module
+Name: php5_module
 ConfigStart
        RULE_WANTHSREGEX=no
        RULE_HIDE=yes

diff --git a/sapi/apache/mod_php4.exp b/sapi/apache/mod_php4.exp
deleted file mode 100644 (file)
index 2dca125..0000000
--- a/sapi/apache/mod_php4.exp
+++ /dev/null
@@ -1 +0,0 @@
-php4_module

diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php5.c
similarity index 99%
rename from sapi/apache/mod_php4.c
rename to sapi/apache/mod_php5.c
index 64e19b4d328274f5c376792b3d5c8d406b6d0f85..6a32db9e07fa28c15d2713af708bed643aab615a 100644 (file)
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php5.c
@@ -64,11 +64,11 @@ static CONST_PREFIX char *php_apache_flag_handler(cmd_parms *cmd, HashTable *con
 static CONST_PREFIX char *php_apache_flag_handler_ex(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2, int mode);
 static CONST_PREFIX char *php_apache_admin_flag_handler(cmd_parms *cmd, HashTable *conf, char *arg1, char *arg2);
 
-/* ### these should be defined in mod_php4.h or somewhere else */
+/* ### these should be defined in mod_php5.h or somewhere else */
 #define USE_PATH 1
 #define IGNORE_URL 2
 
-module MODULE_VAR_EXPORT php4_module;
+module MODULE_VAR_EXPORT php5_module;
 
 int saved_umask;
 static unsigned char apache_php_initialized;
@@ -557,7 +557,7 @@ static int send_php(request_rec *r, int display_source_mode, char *filename)
                        return DECLINED;
                }
 
-               per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module);
+               per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module);
                if (per_dir_conf) {
                        zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
                }
@@ -828,7 +828,7 @@ static int php_xbithack_handler(request_rec * r)
                r->allowed |= (1 << METHODS) - 1;
                return DECLINED;
        }
-       per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php4_module);
+       per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module);
        if (per_dir_conf) {
                zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
        }
@@ -922,9 +922,9 @@ command_rec php_commands[] =
 };
 /* }}} */
 
-/* {{{ odule MODULE_VAR_EXPORT php4_module
+/* {{{ odule MODULE_VAR_EXPORT php5_module
  */
-module MODULE_VAR_EXPORT php4_module =
+module MODULE_VAR_EXPORT php5_module =
 {
        STANDARD_MODULE_STUFF,
        php_init_handler,                       /* initializer */

diff --git a/sapi/apache/mod_php5.exp b/sapi/apache/mod_php5.exp
new file mode 100644 (file)
index 0000000..9ad0f0a
--- /dev/null
+++ b/sapi/apache/mod_php5.exp
@@ -0,0 +1 @@
+php5_module

diff --git a/sapi/apache/mod_php4.h b/sapi/apache/mod_php5.h
similarity index 96%
rename from sapi/apache/mod_php4.h
rename to sapi/apache/mod_php5.h
index 6d030ecb3ce3bf7025a72a84c9a4f894f2a1c4c9..b495c403e14854165255078ef0c29162ddcbe2be 100644 (file)
--- a/sapi/apache/mod_php4.h
+++ b/sapi/apache/mod_php5.h
@@ -17,8 +17,8 @@
  */
 /* $Id$ */
 
-#ifndef MOD_PHP4_H
-#define MOD_PHP4_H
+#ifndef MOD_PHP5_H
+#define MOD_PHP5_H
 
 #if !defined(WIN32) && !defined(WINNT)
 #ifndef MODULE_VAR_EXPORT
@@ -44,7 +44,7 @@ extern php_apache_info_struct php_apache_info;
 #define AP(v) (php_apache_info.v)
 #endif
 
-#endif                                                 /* MOD_PHP4_H */
+#endif                                                 /* MOD_PHP5_H */
 
 /*
  * Local variables:

diff --git a/sapi/apache/php.sym b/sapi/apache/php.sym
index 2dca1256c2c3ea3f90cf8acdfd73d10438fdcc73..9ad0f0a0adbc0fe08f8fac3e6d471ff872ef1cba 100644 (file)
--- a/sapi/apache/php.sym
+++ b/sapi/apache/php.sym
@@ -1 +1 @@
-php4_module
+php5_module

diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h
index e25e468b3cd4f6954116e5420f57452e01501a45..80ec3c2c3de7258f611efde15a86d42cef78f837 100644 (file)
--- a/sapi/apache/php_apache_http.h
+++ b/sapi/apache/php_apache_http.h
@@ -63,4 +63,4 @@
 #include "php_ini.h"
 #include "ext/standard/php_standard.h"
 
-#include "mod_php4.h"
+#include "mod_php5.h"

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index be1b57bd63a357dcf4e6faeec9850fcfb260f907..c106cadd6e0c7cb9d2bcfc7ce1742014a2333c3f 100644 (file)
--- 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 2dca1256c2c3ea3f90cf8acdfd73d10438fdcc73..9ad0f0a0adbc0fe08f8fac3e6d471ff872ef1cba 100644 (file)
--- 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 1e3c5695a097778b36b70b9b619947df055f674d..fd0821e3dc0279a91277db26edd57e96afbea2d7 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 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 d1b64057dd239c3a1a730194a280c70e0fc3d2d5..52ced1c784d34ef1e7a925aa5730f471d51f3350 100644 (file)
--- 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 */

diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index d4d04e145181661b7068692ec14192f763671e99..6d159f4424c855e543a98a4457e770e4b8e648e4 100644 (file)
--- 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 2dca1256c2c3ea3f90cf8acdfd73d10438fdcc73..9ad0f0a0adbc0fe08f8fac3e6d471ff872ef1cba 100644 (file)
--- 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 febbe4fa0dfb87c9b93c51217637c25bfeab8fc5..106efacf3de156087c1d3990b636d2c398361ac3 100644 (file)
--- 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 9f0336ae1ad30e4c45e7b8179206f52ec86b7c27..f99cc5c9b7ffd4538e59bec79a6d7a7dfb03e9fb 100644 (file)
--- 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 */