From 0ced536acea884dbe69fa1b1e244954135706049 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Sat, 27 Dec 2003 20:54:55 +0000 Subject: [PATCH] - reverted last change (it should go on DEVEL) Changed files: php-ini.patch -> 1.8 php-libpq_fs_h_path.patch -> 1.4 --- php-ini.patch | 130 ++++++++++++++++++-------------------- php-libpq_fs_h_path.patch | 9 ++- 2 files changed, 66 insertions(+), 73 deletions(-) diff --git a/php-ini.patch b/php-ini.patch index a8d7782..f5d2637 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,7 +1,6 @@ -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-dist 2003-12-27 00:29:41.000000000 +0100 -@@ -3,13 +3,18 @@ +--- 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 @@ ;;;;;;;;;;; ; WARNING ; ;;;;;;;;;;; @@ -11,23 +10,22 @@ diff -burN php-5.0.0b3/php.ini-dist php-5.0.0b3-php.ini/php.ini-dist -; 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 have to duplicate whole large file to override only -+; few options) ++; (so you don't need to duplicate whole large file to override only ++; few options). + ;;;;;;;;;;;;;;;;;;; - ; About this file ; -@@ -54,10 +59,69 @@ +@@ -54,12 +60,70 @@ ; 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. @@ -35,8 +33,8 @@ diff -burN php-5.0.0b3/php.ini-dist php-5.0.0b3-php.ini/php.ini-dist -; 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. @@ -98,8 +96,9 @@ diff -burN php-5.0.0b3/php.ini-dist php-5.0.0b3-php.ini/php.ini-dist +; 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 @@ -110,11 +109,14 @@ diff -burN php-5.0.0b3/php.ini-dist php-5.0.0b3-php.ini/php.ini-dist ; Enforce year 2000 compliance (will cause problems with non-compliant browsers) y2k_compliance = On -@@ -270,14 +334,14 @@ +@@ -255,16 +319,16 @@ ; - ; - Show all errors except for notices and coding standards warnings + ;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR ; --error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT +-; - Show all errors except for notices ++; - Show all errors + ; +-error_reporting = E_ALL & ~E_NOTICE +error_reporting = E_ALL ; Print out errors (as a part of the output). For production web sites, @@ -127,7 +129,16 @@ diff -burN php-5.0.0b3/php.ini-dist php-5.0.0b3-php.ini/php.ini-dist ; Even when display_errors is on, errors that occur during PHP's startup ; sequence are not displayed. It's strongly recommended to keep -@@ -435,7 +499,7 @@ +@@ -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 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. @@ -136,54 +147,37 @@ diff -burN php-5.0.0b3/php.ini-dist php-5.0.0b3-php.ini/php.ini-dist ; 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 -@@ -530,50 +594,6 @@ - ; extension_dir directive above. +@@ -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 --;Windows Extensions --;Note that MySQL and ODBC support is now built in, so no dll is needed for it. --; --;extension=php_bz2.dll --;extension=php_cpdf.dll --;extension=php_curl.dll --;extension=php_dba.dll --;extension=php_dbase.dll --;extension=php_dbx.dll --;extension=php_exif.dll --;extension=php_fdf.dll --;extension=php_filepro.dll --;extension=php_gd2.dll --;extension=php_gettext.dll --;extension=php_iconv.dll --;extension=php_ifx.dll --;extension=php_iisfunc.dll --;extension=php_imap.dll --;extension=php_interbase.dll --;extension=php_ldap.dll --;extension=php_mbstring.dll --;extension=php_mcrypt.dll --;extension=php_mhash.dll --;extension=php_mime_magic.dll --;extension=php_ming.dll --;extension=php_mssql.dll --;extension=php_msql.dll --;extension=php_mysql.dll --;extension=php_oci8.dll --;extension=php_openssl.dll --;extension=php_oracle.dll --;extension=php_pdf.dll --;extension=php_pgsql.dll --;extension=php_shmop.dll --;extension=php_snmp.dll --;extension=php_sockets.dll --;extension=php_sybase_ct.dll --;extension=php_w32api.dll --;extension=php_xmlrpc.dll --;extension=php_xsl.dll --;extension=php_yaz.dll --;extension=php_zip.dll -- -- - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ; - ;;;;;;;;;;;;;;;;;;; + [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 diff --git a/php-libpq_fs_h_path.patch b/php-libpq_fs_h_path.patch index e149f00..37e96eb 100644 --- a/php-libpq_fs_h_path.patch +++ b/php-libpq_fs_h_path.patch @@ -1,12 +1,11 @@ -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 +--- 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 @@ -43,7 +43,7 @@ - #define PHP_PGSQL_API __declspec(dllimport) + #define PHPAPI __declspec(dllimport) #endif #else -#include +#include - #define PHP_PGSQL_API /* nothing special */ #endif + #ifdef HAVE_PG_CONFIG_H -- 2.44.0