Rename php5 module to php6. Remove version number from

sapi/apache/mod_php.* filenames (for future's sake). No other SAPI
moduels modified (up to invididual maintainers).

diff --git a/INSTALL b/INSTALL
index 00cb226fbce7a9ef4185b4c3191c730f70a7d726..a802e379ca9af23f65f77d7df4a2c90da19e7aaf 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -218,6 +218,10 @@ Apache 1.3.x on Unix systems
 
       LoadModule php5_module libexec/libphp5.so
 
+    For PHP 6:
+
+      LoadModule php6_module libexec/libphp6.so
+
 15. And in the AddModule section of httpd.conf, somewhere under the
     ClearModuleList, add this:
 
@@ -467,6 +471,10 @@ Apache 2.0 on Unix systems
 
       LoadModule php5_module libexec/libphp5.so
 
+    For PHP 6:
+
+      LoadModule php6_module libexec/libphp6.so
+
 15. Tell Apache to parse certain extensions as PHP.  For example,
     let's have Apache parse the .php extension as PHP.  You could
     have any extension(s) parse as PHP by simply adding more, with

diff --git a/Makefile.global b/Makefile.global
index c92bc3724f809ac8ea5e05c2102db802cb07943d..a9a9a53d79adec7b56101c2336c615649f148947 100644 (file)
--- a/Makefile.global
+++ b/Makefile.global
@@ -13,22 +13,22 @@ all: $(all_targets)
        
 build-modules: $(PHP_MODULES)
 
-libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+libphp6.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 $@
-       -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
+       -@$(LIBTOOL) --silent --mode=install cp libphp6.la $(phptempdir)/libphp6.la >/dev/null 2>&1
 
-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
+libs/libphp6.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/libphp6.so
 
 install: $(all_targets) $(install_targets)
 
 install-sapi: $(OVERALL_TARGET)
        @echo "Installing PHP SAPI module:       $(PHP_SAPI)"
        -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-       -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \
+       -@if test ! -r $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME); then \
                for i in 0.0.0 0.0 0; do \
-                       if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
-                               $(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \
+                       if test -r $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+                               $(LN_S) $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME); \
                                break; \
                        fi; \
                done; \
@@ -108,10 +108,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 libphp5.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/*
+       rm -f libphp6.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 php5.spec sapi/apache/libphp5.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/libphp6.module buildmk.stamp
        $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f
        find . -name Makefile | xargs rm -f
 

diff --git a/acinclude.m4 b/acinclude.m4
index 751835fab8850c24a3552f30c2ecf7e5baaeab35..78ef171e2f15106a9decf67a93c485b7e318daa0 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=libphp5.la
+  OVERALL_TARGET=libphp6.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=libphp5.la
+  OVERALL_TARGET=libphp6.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/libphp5.bundle
+  OVERALL_TARGET=libs/libphp6.bundle
   php_build_target=static
 ])
 

diff --git a/configure.in b/configure.in
index 41c1e22a1867aa256ae47b874429d47d3e313fe8..a60f2880280c177135cac6dd826f05cc37889c96 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -236,9 +236,9 @@ dnl SAPI configuration.
 dnl -------------------------------------------------------------------------
 
 dnl paths to the targets are relative to the build directory
-SAPI_SHARED=libs/libphp5.$SHLIB_DL_SUFFIX_NAME
-SAPI_STATIC=libs/libphp5.a
-SAPI_LIBTOOL=libphp5.la
+SAPI_SHARED=libs/libphp6.$SHLIB_DL_SUFFIX_NAME
+SAPI_STATIC=libs/libphp6.a
+SAPI_LIBTOOL=libphp6.la
 
 PHP_CONFIGURE_PART(Configuring SAPI modules)
 

diff --git a/makerpm b/makerpm
index f50efcc0cb896e8ab5c7704d05628f984f75e910..1c4049b4d5f194bdd1ead38c54967fcbd93aeb0c 100644 (file)
--- a/makerpm
+++ b/makerpm
@@ -101,7 +101,7 @@ mv php.keepme sapi/cgi/php
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/apache
-install -m 0755 .libs/libphp5.so $RPM_BUILD_ROOT%{_libdir}/apache
+install -m 0755 .libs/libphp6.so $RPM_BUILD_ROOT%{_libdir}/apache
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cli/php $RPM_BUILD_ROOT%{_bindir}
 install -m 0755 sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php_cgi
@@ -166,7 +166,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_libdir}/apache/libphp5.so
+%{_libdir}/apache/libphp6.so
 %{_bindir}/php
 %{_bindir}/php_cgi
 %{_mandir}/man1/php.1*

diff --git a/sapi/apache/apMakefile.tmpl b/sapi/apache/apMakefile.tmpl
index 5f77d9c9c9d474ee8a6a5b1659f55c47e5060020..5400ada176f26d09282e2cd6a10d1b3900e028a4 100644 (file)
--- a/sapi/apache/apMakefile.tmpl
+++ b/sapi/apache/apMakefile.tmpl
@@ -1,38 +1,38 @@
 ##
-##  Apache 1.3 Makefile template for PHP 5.0 Module
-##  [src/modules/php5/Makefile.tmpl]
+##  Apache 1.3 Makefile template for PHP 6.0 Module
+##  [src/modules/php6/Makefile.tmpl]
 ##
 
 #   the parametrized target
-LIB=libphp5.$(LIBEXT)
+LIB=libphp6.$(LIBEXT)
 
 #   objects for building the static library
-OBJS=mod_php5.o
-OBJS_LIB=libmodphp5.a
+OBJS=mod_php.o
+OBJS_LIB=libmodphp6.a
 
 #   objects for building the shared object library
-SHLIB_OBJS=mod_php5.so-o
-SHLIB_OBJS_LIB=libmodphp5.a
+SHLIB_OBJS=mod_php.so-o
+SHLIB_OBJS_LIB=libmodphp6.a
 
 #   the general targets
 all: lib
 lib: $(LIB)
 
 #   build the static library by merging the object files
-libphp5.a: $(OBJS) $(OBJS_LIB)
+libphp6.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
-libphp5.: $(OBJS) $(OBJS_LIB)
+libphp6.: $(OBJS) $(OBJS_LIB)
        cp $(OBJS_LIB) $@
        ar r $@ $(OBJS)
        $(RANLIB) $@
-       cp libphp5. libphp5.a
+       cp libphp6. libphp6.a
 
 #   build the shared object library by linking the object files
-libphp5.so: $(SHLIB_OBJS) $(SHLIB_OBJS_LIB)
+libphp6.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_php5.o: mod_php5.c $(INCDIR)/httpd.h $(INCDIR)/conf.h \
+mod_php.o: mod_php.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_php5.h
+ $(INCDIR)/http_log.h $(INCDIR)/util_script.h mod_php.h

diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index c928478d56c662e9e8ae1f96a904bafd228ccf06..a8e4782dff99be6ea63670d8ba41191175c1513c 100644 (file)
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -74,7 +74,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/libphp5.so
+    SAPI_SHARED=libs/libphp6.so
     build_type=bundle
     ;;
   *)
@@ -82,26 +82,26 @@ AC_ARG_WITH(apxs,
     ;;
   esac
 
-  PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php5.c php_apache.c, $APACHE_CPPFLAGS -I$APXS_INCLUDEDIR)
+  PHP_SELECT_SAPI(apache, $build_type, sapi_apache.c mod_php.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 php5 $SAPI_SHARED" # Old apxs does not have -S option
+    APACHE_INSTALL="$APXS -i -a -n php6 $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 php5 $SAPI_SHARED"
+                             -i -n php6 $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 php5 $SAPI_SHARED"
+                             -i -a -n php6 $SAPI_SHARED"
     fi
   fi
 
@@ -123,7 +123,7 @@ AC_ARG_WITH(apache,
 [  --with-apache[=DIR]     Build Apache 1.x module. DIR is the top-level Apache
                           build directory [/usr/local/apache]],[
 
-  APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php5.* sapi/apache/libphp5.module"
+  APACHE_INSTALL_FILES="\$(srcdir)/sapi/apache/mod_php.* sapi/apache/libphp6.module"
 
   if test "$withval" = "yes"; then
     # Apache's default directory
@@ -142,13 +142,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/php5
+      APACHE_TARGET=$withval/src/modules/php6
       if test ! -d $APACHE_TARGET; then
         mkdir $APACHE_TARGET
       fi
-      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"
+      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php.c php_apache.c, $APACHE_INCLUDE)
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp6.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/php6 -L../modules/php6 -L../../modules/php6 -lmodphp6"
       AC_MSG_RESULT(yes - Apache 1.3.x)
       STRONGHOLD=
       if test -f $withval/src/include/ap_config.h; then
@@ -168,13 +168,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/php5
+      APACHE_TARGET=$withval/src/modules/php6
       if test ! -d $APACHE_TARGET; then
         mkdir $APACHE_TARGET
       fi
-      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"
+      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php.c php_apache.c, $APACHE_INCLUDE)
+      PHP_LIBS="-Lmodules/php6 -L../modules/php6 -L../../modules/php6 -lmodphp6"
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp6.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
@@ -194,9 +194,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_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"
+      PHP_SELECT_SAPI(apache, static, sapi_apache.c mod_php.c php_apache.c, $APACHE_INCLUDE)
+      PHP_LIBS="-Lmodules/php6 -L../modules/php6 -L../../modules/php6 -lmodphp6"
+      APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp6.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET"
       STRONGHOLD=-DSTRONGHOLD=1
       AC_MSG_RESULT(yes - StrongHold)
       if test -f $withval/apache/ap_config.h; then
@@ -239,13 +239,13 @@ dnl Build as static module
 if test -n "$APACHE_MODULE"; then
   PHP_TARGET_RDYNAMIC
   $php_shtool mkdir -p sapi/apache
-  PHP_OUTPUT(sapi/apache/libphp5.module)
+  PHP_OUTPUT(sapi/apache/libphp6.module)
 fi
 
 dnl General
 if test -n "$APACHE_INSTALL"; then
   if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
-    APXS_EXP=-bE:sapi/apache/mod_php5.exp
+    APXS_EXP=-bE:sapi/apache/mod_php.exp
   fi
 
   PHP_APACHE_FD_CHECK

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

diff --git a/sapi/apache/mod_php5.c b/sapi/apache/mod_php.c
similarity index 99%
rename from sapi/apache/mod_php5.c
rename to sapi/apache/mod_php.c
index 2499a4df339315afb0aa5904cc877ea13e96c34d..4f9c887d0e86eeeb36f16f22db80c465ba018965 100644 (file)
--- a/sapi/apache/mod_php5.c
+++ b/sapi/apache/mod_php.c
@@ -60,12 +60,12 @@ 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_php5.h or somewhere else */
+/* ### these should be defined in mod_php.h or somewhere else */
 #define USE_PATH 1
 #define IGNORE_URL 2
 #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST POSSIBLE STATUS DESCRIPTION")
 
-module MODULE_VAR_EXPORT php5_module;
+module MODULE_VAR_EXPORT php6_module;
 
 int saved_umask;
 static unsigned char apache_php_initialized;
@@ -588,7 +588,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, &php5_module);
+               per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php6_module);
                if (per_dir_conf) {
                        zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
                }
@@ -862,7 +862,7 @@ static int php_xbithack_handler(request_rec * r)
        if (!(r->finfo.st_mode & S_IXUSR)) {
                return DECLINED;
        }
-       per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php5_module);
+       per_dir_conf = (HashTable *) get_module_config(r->per_dir_config, &php6_module);
        if (per_dir_conf) {
                zend_hash_apply((HashTable *) per_dir_conf, (apply_func_t) php_apache_alter_ini_entries TSRMLS_CC);
        }
@@ -959,9 +959,9 @@ command_rec php_commands[] =
 };
 /* }}} */
 
-/* {{{ odule MODULE_VAR_EXPORT php5_module
+/* {{{ odule MODULE_VAR_EXPORT php6_module
  */
-module MODULE_VAR_EXPORT php5_module =
+module MODULE_VAR_EXPORT php6_module =
 {
        STANDARD_MODULE_STUFF,
        php_init_handler,                       /* initializer */

diff --git a/sapi/apache/mod_php.exp b/sapi/apache/mod_php.exp
new file mode 100644 (file)
index 0000000..82a78ab
--- /dev/null
+++ b/sapi/apache/mod_php.exp
@@ -0,0 +1 @@
+php6_module

diff --git a/sapi/apache/mod_php5.h b/sapi/apache/mod_php.h
similarity index 96%
rename from sapi/apache/mod_php5.h
rename to sapi/apache/mod_php.h
index 30503dc08c1545b706799964e7a35c5b5c58d7bb..be1513d6eeeafe75b23b4ebcbf93471996636ac9 100644 (file)
--- a/sapi/apache/mod_php5.h
+++ b/sapi/apache/mod_php.h
@@ -17,8 +17,8 @@
  */
 /* $Id$ */
 
-#ifndef MOD_PHP5_H
-#define MOD_PHP5_H
+#ifndef MOD_PHP_H
+#define MOD_PHP_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_PHP5_H */
+#endif                                                 /* MOD_PHP_H */
 
 /*
  * Local variables:

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

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

diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h
index 8f144090a9946a776a408394e26bc07b85a4d698..de1ad937501f709e63841278c8cf430f493d7401 100644 (file)
--- a/sapi/apache/php_apache_http.h
+++ b/sapi/apache/php_apache_http.h
@@ -67,4 +67,4 @@
 #include "php_ini.h"
 #include "ext/standard/php_standard.h"
 
-#include "mod_php5.h"
+#include "mod_php.h"

diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index c31ddd120979d939142f3bd0130d0efbcf8652a9..039d41b9cafb7b699e0bf654fbf18bd2bee1c55e 100644 (file)
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -26,7 +26,7 @@ if test "$PHP_SAPI_CLI" != "no"; then
     BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
     ;;
   *netware*)
-    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
+    BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp6lib -o \$(SAPI_CLI_PATH)"
     ;;
   *)
     BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"