---- ./Makefile.global~ 2005-08-12 16:16:24.000000000 +0300
-+++ ./Makefile.global 2005-08-12 16:34:29.000000000 +0300
-@@ -22,6 +22,12 @@
+--- php-5.2.4/Makefile.global~ 2007-08-31 19:35:54.000000000 +0300
++++ php-5.2.4/Makefile.global 2007-08-31 19:40:18.287528480 +0300
+@@ -21,6 +21,12 @@
$(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) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
+ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+$(LIBTOOL_SAPI): 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) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
++ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+
+libtool-sapi: $(LIBTOOL_SAPI)
+
- 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/libphp$(PHP_MAJOR_VERSION).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/libphp$(PHP_MAJOR_VERSION).so
---- php-5.2.0/scripts/php-config.in~ 2006-07-27 11:53:16.000000000 +0300
-+++ php-5.2.0/scripts/php-config.in 2006-12-14 01:11:33.348180526 +0200
+--- php-5.2.0/scripts/php-config.in 2006-12-14 01:11:33.348180526 +0200
++++ php-5.2.4/scripts/php-config.in 2007-08-31 19:43:04.061307670 +0300
@@ -2,6 +2,7 @@
prefix="@prefix@"
version="@PHP_VERSION@"
version_id="@PHP_VERSION_ID@"
includedir="@includedir@/php"
-@@ -25,6 +26,8 @@
- echo $libs;;
- --extension-dir)
- echo $extension_dir;;
-+--sysconfdir)
-+ echo $sysconfdir;;
+@@ -53,6 +54,8 @@
+ echo $extension_dir;;
--include-dir)
- echo $includedir;;
+ echo $include_dir;;
++--sysconfdir)
++ echo $sysconfdir;;
--php-binary)
-@@ -34,7 +37,7 @@
- --vernum)
- echo $version_id;;
- *)
-- echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version|--vernum]"
-+ echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--sysconfdir|--include-dir|--php-binary|--version|--vernum]"
- exit 1;;
- esac
-
+ echo $php_binary;;
+ --php-sapis)
+@@ -72,6 +75,7 @@
+ --ldflags [$ldflags]
+ --libs [$libs]
+ --extension-dir [$extension_dir]
++ --sysconfdir [$sysconfdir]
+ --include-dir [$include_dir]
+ --php-binary [$php_binary]
+ --php-sapis [$php_sapis]
;;;;;;;;;;;;;;;;;;;
-@@ -301,14 +368,16 @@
- ;
- ; - Show all errors except for notices and coding standards warnings
- ;
--error_reporting = E_ALL & ~E_NOTICE
-+;error_reporting = E_ALL & ~E_NOTICE
-+
-+error_reporting = E_ALL
-
- ; Print out errors (as a part of the output). For production web sites,
- ; you're strongly encouraged to turn this feature off, and use error logging
- ; instead (see below). Keeping display_errors enabled on a production web site
- ; may reveal security information to end users, such as file paths on your Web
- ; server, your database schema or other information.
--display_errors = On
-+display_errors = Off
-
- ; Even when display_errors is on, errors that occur during PHP's startup
- ; sequence are not displayed. It's strongly recommended to keep
@@ -318,7 +387,7 @@
; Log errors into a log file (server-specific log, stderr, or error_log (below))
; As stated above, you're strongly advised to use error logging in place of
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
soap.wsdl_cache_ttl=86400
+--- php-5.2.4/php.ini~ 2007-08-31 19:31:20.000000000 +0300
++++ php-5.2.4/php.ini 2007-08-31 19:34:05.889031779 +0300
+@@ -369,7 +369,9 @@
+ ;
+ ; - Show all errors except for notices and coding standards warnings
+ ;
+-error_reporting = E_ALL & ~E_NOTICE
++;error_reporting = E_ALL & ~E_NOTICE
++
++error_reporting = E_ALL
+
+ ; Print out errors (as a part of the output). For production web sites,
+ ; you're strongly encouraged to turn this feature off, and use error logging
+@@ -386,7 +388,7 @@
+ ;
+ ; stdout (On) - Display errors to STDOUT
+ ;
+-display_errors = On
++display_errors = Off
+
+ ; Even when display_errors is on, errors that occur during PHP's startup
+ ; sequence are not displayed. It's strongly recommended to keep
PHP_CHECK_FUNC(dlopen, dl)
if test "$ac_cv_func_dlopen" = "yes"; then
---- php.org/ext/ldap/config.m4.org 2006-08-10 06:31:57.985269750 +0000
-+++ php/ext/ldap/config.m4 2006-08-10 06:37:42.330790000 +0000
-@@ -160,8 +160,10 @@
- dnl Save original values
- _SAVE_CPPFLAGS=$CPPFLAGS
- _SAVE_LDFLAGS=$LDFLAGS
-+ _SAVE_LIBS=$LIBS
- CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
-- LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
-+ LDFLAGS="$LDFLAGS"
-+ LIBS="$LIBS $LDAP_SHARED_LIBADD"
-
- dnl Check for 3 arg ldap_set_rebind_proc
- AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
-@@ -192,4 +194,5 @@
- dnl Restore original values
- CPPFLAGS=$_SAVE_CPPFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
-+ LIBS=$_SAVE_LIBS
- fi
--- php-5.2.0/acinclude.m4.orig 2006-12-22 21:52:13.766461055 +0100
+++ php-5.2.0/acinclude.m4 2006-12-22 21:52:37.159794165 +0100
@@ -1740,18 +1740,18 @@
remove cflags from link commands.
---- php-4.4.2/Makefile.global~ 2005-05-23 12:43:59.000000000 +0300
-+++ php-4.4.2/Makefile.global 2006-04-05 14:02:20.409483697 +0300
-@@ -15,7 +15,7 @@
+--- php-5.2.4/Makefile.global~ 2007-08-31 19:04:48.000000000 +0300
++++ php-5.2.4/Makefile.global 2007-08-31 19:08:06.153185986 +0300
+@@ -14,7 +14,7 @@
build-modules: $(PHP_MODULES)
- libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+ libphp$(PHP_MAJOR_VERSION).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) --mode=link $(CC) -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 $@ $(phptempdir)/$@ >/dev/null 2>&1
- libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+ libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--- php-4.4.2/acinclude.m4~ 2005-12-20 00:29:11.000000000 +0200
+++ php-4.4.2/acinclude.m4 2006-04-05 14:03:29.741024080 +0300
@@ -1201,11 +1201,11 @@
-diff -ur php-5.2.0.org/ext/standard/mail.c php-5.2.0/ext/standard/mail.c
---- php-5.2.0.org/ext/standard/mail.c 2006-01-01 13:50:15.000000000 +0100
-+++ php-5.2.0/ext/standard/mail.c 2006-12-01 14:20:27.881416250 +0100
+--- php-5.2.0/ext/standard/mail.c 2006-12-01 14:20:27.881416250 +0100
++++ php-5.2.4/ext/standard/mail.c 2007-08-31 19:25:50.777713042 +0300
@@ -21,6 +21,8 @@
#include <stdlib.h>
#include <ctype.h>
#include "php.h"
#include "ext/standard/info.h"
-@@ -36,6 +38,9 @@
+@@ -35,6 +37,8 @@
+ #include "php_ini.h"
#include "safe_mode.h"
#include "exec.h"
-
+#include "zend_operators.h"
+#include "zend_globals.h"
-+
- #if HAVE_SENDMAIL
+
#ifdef PHP_WIN32
#include "win32/sendmail.h"
-@@ -104,6 +109,18 @@
+@@ -107,6 +111,18 @@
return;
}
if (to_len > 0) {
to_r = estrndup(to, to_len);
for (; to_len; to_len--) {
-@@ -228,8 +245,42 @@
+@@ -231,8 +247,42 @@
return 0;
}
#endif
-diff -urN php-5.0.0.org/Makefile.global php-5.0.0/Makefile.global
---- php-5.0.0.org/Makefile.global 2004-07-25 22:41:53.990127112 +0200
-+++ php-5.0.0/Makefile.global 2004-07-25 22:43:17.698401520 +0200
-@@ -14,8 +14,12 @@
+--- php-5.2.4/Makefile.global~ 2007-08-31 19:13:58.000000000 +0300
++++ php-5.2.4/Makefile.global 2007-08-31 19:19:33.799017413 +0300
+@@ -13,8 +13,12 @@
build-modules: $(PHP_MODULES)
--libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+-libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
- $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+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) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1
++ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+
-+libphp5.la: libphp_common.la $(PHP_SAPI_OBJS)
++libphp$(PHP_MAJOR_VERSION).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) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
+ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
- libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -26,10 +30,10 @@
+ libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+@@ -25,10 +29,10 @@
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)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+ -@if test ! -r $(phptempdir)/libphp_common.$(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)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+- $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
+ if test -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+ $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \
break; \
fi; \
done; \
-diff -urN php-5.0.0.org/sapi/cgi/config9.m4 php-5.0.0/sapi/cgi/config9.m4
--- php-5.0.0.org/sapi/cgi/config9.m4 2004-07-25 22:41:53.698171496 +0200
+++ php-5.0.0/sapi/cgi/config9.m4 2004-07-25 22:42:04.894469400 +0200
@@ -156,7 +156,7 @@
;;
esac
-diff -urN php-5.0.0.org/sapi/cgi/Makefile.frag php-5.0.0/sapi/cgi/Makefile.frag
--- php-5.0.0.org/sapi/cgi/Makefile.frag 2004-07-25 22:41:53.696171800 +0200
+++ php-5.0.0/sapi/cgi/Makefile.frag 2004-07-25 22:42:04.895469248 +0200
@@ -1,2 +1,2 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
$(BUILD_CGI)
-diff -urN php-5.0.0.org/sapi/cli/config.m4 php-5.0.0/sapi/cli/config.m4
--- php-5.0.0.org/sapi/cli/config.m4 2004-07-25 22:41:53.700171192 +0200
+++ php-5.0.0/sapi/cli/config.m4 2004-07-25 22:42:04.895469248 +0200
@@ -27,7 +27,7 @@
;;
esac
INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
-diff -urN php-5.0.0.org/sapi/cli/Makefile.frag php-5.0.0/sapi/cli/Makefile.frag
--- php-5.0.0.org/sapi/cli/Makefile.frag 2004-07-25 22:41:53.699171344 +0200
+++ php-5.0.0/sapi/cli/Makefile.frag 2004-07-25 22:42:04.896469096 +0200
@@ -1,6 +1,6 @@
projects / packages / php.git / commitdiff