--- php-4.4.2/Makefile.global~ 2006-04-04 00:35:27.582384109 +0300 +++ php-4.4.2/Makefile.global 2006-04-04 00:40:19.318848123 +0300 @@ -1,6 +1,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p INSTALL = $(top_srcdir)/build/shtool install -c INSTALL_DATA = $(INSTALL) -m 644 +LD_VERSION_SCRIPT = -Wl,--version-script=$(top_srcdir)/php.ver DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir) COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH) --- /dev/null 2006-03-28 14:00:37.387408000 +0300 +++ php-4.4.2/php.ver 2006-04-04 00:40:55.609652026 +0300 @@ -0,0 +1 @@ +php4 { global: *; }; --- php-4.4.2/acinclude.m4~ 2006-04-05 14:07:34.806469587 +0300 +++ php-4.4.2/acinclude.m4 2006-04-05 14:07:59.667022065 +0300 @@ -1205,7 +1205,7 @@ ;; *[)] suffix=la - link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)' + link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) libphp_common.la $(EXTRA_LDFLAGS) $(LD_VERSION_SCRIPT) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)' ;; esac # this would add dependency, but meanwhile require libphp_common.la linking at external extension build time. sigh #@@ -1215,7 +1215,7 @@ # \$(phplibdir)/$1.$suffix: $3/$1.$suffix # \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir) # #-$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES) #+$3/$1.$suffix: libphp_common.la \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES) # $link_cmd # # EOF --- php-4.4.2/Makefile.global~ 2006-04-05 02:56:01.208583507 +0300 +++ php-4.4.2/Makefile.global 2006-04-05 02:57:01.759935067 +0300 @@ -16,14 +16,14 @@ build-modules: $(PHP_MODULES) libphp_common.la: $(PHP_GLOBAL_OBJS) - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(MAJOR_VERSION) $(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la libphp4.la: libphp_common.la $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ $(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ libtool-sapi: $(LIBTOOL_SAPI) --- php-4.4.2/scripts/Makefile.frag~ 2006-04-05 19:13:33.607375995 +0300 +++ php-4.4.2/scripts/Makefile.frag 2006-04-05 19:20:46.147058812 +0300 @@ -13,7 +13,8 @@ build/libtool.m4 \ Makefile.global \ acinclude.m4 \ - ltmain.sh + ltmain.sh \ + php.ver BUILD_FILES_EXEC = \ build/shtool \ --- php-4.4.2/scripts/phpize.in~ 2006-04-05 19:39:16.851897371 +0300 +++ php-4.4.2/scripts/phpize.in 2006-04-05 19:39:17.921921323 +0300 @@ -8,7 +8,7 @@ builddir="`pwd`" FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" -FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh" +FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh php.ver" CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \ --- php-4.4.2/configure.in~ 2006-04-13 14:14:51.449570523 +0300 +++ php-4.4.2/configure.in 2006-04-15 15:37:40.676749564 +0300 @@ -1165,6 +1165,9 @@ PHP_SUBST(PHP_RPATHS) PHP_SUBST(PHP_SAPI) PHP_SUBST_OLD(PHP_VERSION) +PHP_SUBST_OLD(MAJOR_VERSION) +PHP_SUBST_OLD(MINOR_VERSION) +PHP_SUBST_OLD(RELEASE_VERSION) PHP_SUBST(PROG_SENDMAIL) PHP_SUBST(RE2C) PHP_SUBST(SHELL) --- php-4.4.2/sapi/apache/mod_php4.c~ 2006-01-01 15:47:01.000000000 +0200 +++ php-4.4.2/sapi/apache/mod_php4.c 2006-04-04 02:02:52.348791307 +0300 @@ -910,7 +910,9 @@ handler_rec php_handlers[] = { {"application/x-httpd-php", send_parsed_php}, + {"application/x-httpd-php4", send_parsed_php}, {"application/x-httpd-php-source", send_parsed_php_source}, + {"application/x-httpd-php4-source", send_parsed_php_source}, {"text/html", php_xbithack_handler}, {NULL} };