---- php-4.3.0/php.ini-dist Thu Dec 26 14:27:08 2002
-+++ php-4.3.0/php.ini Sat Jan 4 21:01:55 2003
-@@ -3,12 +3,18 @@
+diff -burN php-5.0.0b3/php.ini-dist php-5.0.0b3-php.ini/php.ini-dist
+--- php-5.0.0b3/php.ini-dist 2003-12-18 03:06:00.000000000 +0100
++++ php-5.0.0b3-php.ini/php.ini 2003-12-27 00:29:41.000000000 +0100
+@@ -3,13 +3,18 @@
;;;;;;;;;;;
; WARNING ;
;;;;;;;;;;;
-; For several security-oriented considerations that should be taken
-; before going online with your site, please consult php.ini-recommended
-; and http://php.net/manual/en/security.php.
+-
+; This is the default settings file for new PHP installations from
+; PLD Linux Distribution.
+; It's based mainly on php.ini-dist, but with some changes made with
+; security in mind (see below, consult also
+; http://php.net/manual/en/security.php).
+;
-+; Please note, that in PLD installations, /etc/php/php.ini file
-+; contains GLOBAL settings for all SAPIs (cgi, cli, apache...),
++; Please note, that in PLD installations /etc/php/php.ini file
++; contains global settings for all SAPIs (cgi, cli, apache...),
+; and after reading this file, SAPI-specific file (/etc/php/php-cgi.ini,
+; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED
-+; (so you don't need to duplicate whole large file to override only
-+; few options).
-
++; (so you don't have to duplicate whole large file to override only
++; few options)
;;;;;;;;;;;;;;;;;;;
-@@ -54,12 +60,70 @@
+ ; About this file ;
+@@ -54,10 +59,69 @@
; If you use constants in your value, and these constants belong to a
; dynamically loaded extension (either a PHP extension or a Zend extension),
; you may only use these constants *after* the line that loads the extension.
-; All the values in the php.ini-dist file correspond to the builtin
-; defaults (that is, if no php.ini is used, or if you delete these lines,
-; the builtin defaults will be identical).
-
-
++
++
+; Below is the list of settings changed from default as specified in
+; php.ini-recommended. These settings make PHP more secure and encourage
+; cleaner coding.
+; It's not possible to decide to force a variable to be passed by reference
+; when calling a function. The PHP 4 style to do this is by making the
+; function require the relevant argument by reference.
-+
- ;;;;;;;;;;;;;;;;;;;;
- ; Language Options ;
+
+
;;;;;;;;;;;;;;;;;;;;
@@ -79,7 +143,7 @@
asp_tags = Off
; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
y2k_compliance = On
-@@ -255,16 +319,16 @@
- ;
- ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+@@ -270,14 +334,14 @@
;
--; - Show all errors except for notices
-+; - Show all errors
+ ; - Show all errors except for notices and coding standards warnings
;
--error_reporting = E_ALL & ~E_NOTICE
+-error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
+error_reporting = E_ALL
; Print out errors (as a part of the output). For production web sites,
; Even when display_errors is on, errors that occur during PHP's startup
; sequence are not displayed. It's strongly recommended to keep
-@@ -274,7 +338,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
- ; error displaying on production web sites.
--log_errors = Off
-+log_errors = On
-
- ; Set maximum length of log_errors. In error_log information about the source is
- ; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-@@ -420,7 +484,7 @@
+@@ -435,7 +499,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -587,10 +651,10 @@
- ;sendmail_path =
-
- [Java]
--;java.class.path = .\php_java.jar
--;java.home = c:\jdk
--;java.library = c:\jdk\jre\bin\hotspot\jvm.dll
--;java.library.path = .\
-+java.class.path = /usr/lib/php/php_java.jar
-+;java.home = /usr/lib/java
-+;java.library = /usr/lib/java/jre/lib/i386/libjava.so
-+java.library.path = /usr/lib/php
-
- [SQL]
- sql.safe_mode = Off
-@@ -685,6 +749,7 @@
- pgsql.max_links = -1
-
- ; Ignore PostgreSQL backends Notice message or not.
-+; Notice message logging require a little overheads.
- pgsql.ignore_notice = 0
-
- ; Log PostgreSQL backends Noitce message or not.
-@@ -804,7 +869,9 @@
- ; You can use the script in the ext/session dir for that purpose.
- ; NOTE 2: See the section on garbage collection below if you choose to
- ; use subdirectories for session storage
--;session.save_path = /tmp
-+; NOTE 3: you may need to override this setting for cli or cgi SAPIs,
-+; to allow running them as user other than http
-+session.save_path = /var/run/php
-
- ; Whether to use cookies.
- session.use_cookies = 1
---- php-4.3.0/ext/pgsql/php_pgsql.h~ Mon Feb 25 15:16:28 2002
-+++ php-4.3.0/ext/pgsql/php_pgsql.h Mon Feb 25 15:16:28 2002
+diff -burN php-5.0.0b3/ext/pgsql/php_pgsql.h php-5.0.0b3-libpq_fs_h_path/ext/pgsql/php_pgsql.h
+--- php-5.0.0b3/ext/pgsql/php_pgsql.h 2003-12-05 02:03:35.000000000 +0100
++++ php-5.0.0b3-libpq_fs_h_path/ext/pgsql/php_pgsql.h 2003-12-26 22:30:20.000000000 +0100
@@ -43,7 +43,7 @@
- #define PHPAPI __declspec(dllimport)
+ #define PHP_PGSQL_API __declspec(dllimport)
#endif
#else
-#include <libpq/libpq-fs.h>
+#include <postgresql/server/libpq/libpq-fs.h>
+ #define PHP_PGSQL_API /* nothing special */
#endif
- #ifdef HAVE_PG_CONFIG_H
-LoadModule php4_module modules/libphp4.so
+LoadModule php5_module modules/libphp5.so
<IfModule sapi_apache2.c>
-diff -burN php-4.3.5RC1.orig/configure.in php-4.3.5RC1/configure.in
---- php-4.3.5RC1.orig/configure.in 2004-02-05 10:28:06.283736312 +0100
-+++ php-4.3.5RC1/configure.in 2004-02-05 10:31:29.388859640 +0100
-@@ -1138,7 +1138,7 @@
+--- php-5.0.0b3.orig/configure.in 2003-12-24 17:30:44.000000000 +0100
++++ php-5.0.0b3/configure.in 2003-12-24 17:31:45.000000000 +0100
+@@ -1149,7 +1149,7 @@
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
-diff -burN php-4.3.3RC2.orig/Makefile.global php-4.3.3RC2-shared/Makefile.global
---- php-4.3.3RC2.orig/Makefile.global Thu Jul 24 19:45:15 2003
-+++ php-4.3.3RC2-shared/Makefile.global Sat Aug 2 22:53:18 2003
-@@ -14,9 +14,11 @@
+diff -burN php-5.0.0b3/Makefile.global php-5.0.0b3-shared/Makefile.global
+--- php-5.0.0b3/Makefile.global 2003-12-04 16:57:55.000000000 +0100
++++ php-5.0.0b3-shared/Makefile.global 2003-12-25 16:52:55.000000000 +0100
+@@ -14,8 +14,11 @@
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 $@
-- -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
+libphp_common.la: $(PHP_GLOBAL_OBJS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
+
-+libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
++libphp5.la: libphp_common.la $(PHP_SAPI_OBJS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 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
- 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
-@@ -25,11 +27,13 @@
-
+ libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+@@ -26,10 +29,10 @@
install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module: $(PHP_SAPI)"
-+ -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1
-+ -@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.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 \
+ -@if test ! -r $(phptempdir)/libphp_common.$(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); \
+ if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
+ $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
break; \
fi; \
done; \
-diff -burN php-4.3.3RC2.orig/sapi/cgi/Makefile.frag php-4.3.3RC2-shared/sapi/cgi/Makefile.frag
---- php-4.3.3RC2.orig/sapi/cgi/Makefile.frag Wed Jul 2 03:06:29 2003
-+++ php-4.3.3RC2-shared/sapi/cgi/Makefile.frag Sat Aug 2 22:53:38 2003
-@@ -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 -burN php-4.3.3RC2.orig/sapi/cgi/config9.m4 php-4.3.3RC2-shared/sapi/cgi/config9.m4
---- php-4.3.3RC2.orig/sapi/cgi/config9.m4 Wed Jul 2 04:48:16 2003
-+++ php-4.3.3RC2-shared/sapi/cgi/config9.m4 Sat Aug 2 22:54:51 2003
+diff -burN php-5.0.0b3/sapi/cgi/config9.m4 php-5.0.0b3-shared/sapi/cgi/config9.m4
+--- php-5.0.0b3/sapi/cgi/config9.m4 2003-12-01 16:17:08.000000000 +0100
++++ php-5.0.0b3-shared/sapi/cgi/config9.m4 2003-12-25 16:54:16.000000000 +0100
@@ -156,7 +156,7 @@
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
*)
- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
esac
-diff -burN php-4.3.3RC2.orig/sapi/cli/Makefile.frag php-4.3.3RC2-shared/sapi/cli/Makefile.frag
---- php-4.3.3RC2.orig/sapi/cli/Makefile.frag Wed Feb 12 05:39:30 2003
-+++ php-4.3.3RC2-shared/sapi/cli/Makefile.frag Sat Aug 2 22:53:53 2003
-@@ -1,4 +1,4 @@
--$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
-+$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS)
- $(BUILD_CLI)
-
- install-cli: $(SAPI_CLI_PATH)
-diff -burN php-4.3.3RC2.orig/sapi/cli/config.m4 php-4.3.3RC2-shared/sapi/cli/config.m4
---- php-4.3.3RC2.orig/sapi/cli/config.m4 Wed Feb 12 05:39:30 2003
-+++ php-4.3.3RC2-shared/sapi/cli/config.m4 Sat Aug 2 22:55:15 2003
+diff -burN php-5.0.0b3/sapi/cgi/Makefile.frag php-5.0.0b3-shared/sapi/cgi/Makefile.frag
+--- php-5.0.0b3/sapi/cgi/Makefile.frag 2003-07-02 03:08:26.000000000 +0200
++++ php-5.0.0b3-shared/sapi/cgi/Makefile.frag 2003-12-25 16:53:17.000000000 +0100
+@@ -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 -burN php-5.0.0b3/sapi/cli/config.m4 php-5.0.0b3-shared/sapi/cli/config.m4
+--- php-5.0.0b3/sapi/cli/config.m4 2003-12-01 16:17:10.000000000 +0100
++++ php-5.0.0b3-shared/sapi/cli/config.m4 2003-12-25 16:55:07.000000000 +0100
@@ -27,7 +27,7 @@
- BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -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)"
;;
*)
- 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)"
+ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) libphp_common.la \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
esac
- INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
+ INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
+diff -burN php-5.0.0b3/sapi/cli/Makefile.frag php-5.0.0b3-shared/sapi/cli/Makefile.frag
+--- php-5.0.0b3/sapi/cli/Makefile.frag 2003-09-02 23:41:01.000000000 +0200
++++ php-5.0.0b3-shared/sapi/cli/Makefile.frag 2003-12-25 16:54:40.000000000 +0100
+@@ -1,6 +1,6 @@
+ cli: $(SAPI_CLI_PATH)
+
+-$(SAPI_CLI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CLI_OBJS)
++$(SAPI_CLI_PATH): libphp_common.la $(PHP_CLI_OBJS)
+ $(BUILD_CLI)
+
+ install-cli: $(SAPI_CLI_PATH)
---- php/ext/zlib/zlib.c.orig Wed Jul 2 12:30:43 2003
-+++ php/ext/zlib/zlib.c Wed Jul 2 13:23:07 2003
-@@ -1010,6 +1010,8 @@
- /* return the original string */
- *return_value = **zv_string;
- zval_copy_ctor(return_value);
-+ } else {
-+ SG(sapi_headers).send_default_content_type = 0;
- }
- }
- /* }}} */
-@@ -1055,6 +1055,11 @@
- php_ob_set_internal_handler(php_gzip_output_handler, (uint)buffer_size, "zlib output compression", 0 TSRMLS_CC);
+diff -burN php-5.0.0b3/ext/zlib/zlib.c php-5.0.0b3-zlib/ext/zlib/zlib.c
+--- php-5.0.0b3/ext/zlib/zlib.c 2003-09-26 10:09:53.000000000 +0200
++++ php-5.0.0b3-zlib/ext/zlib/zlib.c 2003-12-27 00:40:53.000000000 +0100
+@@ -979,6 +979,11 @@
+
if (ZLIBG(output_handler) && strlen(ZLIBG(output_handler))) {
php_start_ob_buffer_named(ZLIBG(output_handler), 0, 1 TSRMLS_CC);
-+ if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1, 1)!=FAILURE) {
++ if (sapi_add_header("Content-Encoding: gzip", sizeof("Content-Encoding: gzip") - 1 , 1)!=FAILURE) {
+ if (sapi_add_header("Vary: Accept-Encoding", sizeof("Vary: Accept-Encoding") - 1, 1)==FAILURE) {
+ SG(sapi_headers).send_default_content_type = 0;
+ }
projects / packages / php.git / commitdiff