SOURCES (DEVEL): php-ini.patch - updated to current snap
zergin
zergin at pld-linux.org
Mon Aug 11 00:31:51 CEST 2008
Author: zergin Date: Sun Aug 10 22:31:51 2008 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated to current snap
---- Files affected:
SOURCES:
php-ini.patch (1.30.2.1 -> 1.30.2.2)
---- Diffs:
================================================================
Index: SOURCES/php-ini.patch
diff -u SOURCES/php-ini.patch:1.30.2.1 SOURCES/php-ini.patch:1.30.2.2
--- SOURCES/php-ini.patch:1.30.2.1 Tue Oct 23 00:27:42 2007
+++ SOURCES/php-ini.patch Mon Aug 11 00:31:46 2008
@@ -1,9 +1,12 @@
---- php-5.2.0/php.ini 2006-11-03 01:27:56.372110952 +0200
-+++ php-5.2.0/php.ini 2006-11-03 01:30:12.215164639 +0200
-@@ -3,13 +3,18 @@
- ;;;;;;;;;;;
- ; WARNING ;
- ;;;;;;;;;;;
+diff -ur php5.3-200808101830/php.ini mod/php.ini
+--- php5.3-200808101830/php.ini 2008-08-10 21:52:36.034263222 +0000
++++ mod/php.ini 2008-08-10 21:51:30.527603438 +0000
+@@ -1,26 +1,21 @@
+ [PHP]
+
+-;;;;;;;;;;;
+-; WARNING ;
+-;;;;;;;;;;;
-; This is the default settings file for new PHP installations.
-; By default, PHP installs itself with a configuration suitable for
-; development purposes, and *NOT* for production purposes.
@@ -11,49 +14,10 @@
-; 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...),
-+; 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)
-
+-
;;;;;;;;;;;;;;;;;;;
; About php.ini ;
---- php5.3-200710222030/php.ini~ 2007-10-23 00:20:28.000000000 +0300
-+++ php5.3-200710222030/php.ini 2007-10-23 00:22:43.853262016 +0300
-@@ -1,13 +1,9 @@
- [PHP]
-
--;;;;;;;;;;;
--; WARNING ;
--;;;;;;;;;;;
--; 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).
-+;;;;;;;;;;;;;;;;;;;
-+; About php.ini ;
-+;;;;;;;;;;;;;;;;;;;
-+; This file controls many aspects of PHP's behavior.
- ;
- ; Please note, that in PLD installations /etc/php/php.ini file
- ; contains global settings for all SAPIs (cgi, cli, apache...),
-@@ -15,17 +11,11 @@
- ; /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)
--
--;;;;;;;;;;;;;;;;;;;
--; About php.ini ;
--;;;;;;;;;;;;;;;;;;;
+ ;;;;;;;;;;;;;;;;;;;
-; This file controls many aspects of PHP's behavior. In order for PHP to
-; read it, it must be named 'php.ini'. PHP looks for it in the current
-; working directory, in the path designated by the environment variable
@@ -61,6 +25,14 @@
-; Under Windows, the compile-time path is the Windows directory. The
-; path in which the php.ini file is looked for can be overridden using
-; the -c argument in command line mode.
++; This file controls many aspects of PHP's behavior.
++;
++; 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)
+;
+; 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
@@ -69,9 +41,7 @@
;
; The syntax of the file is extremely simple. Whitespace and Lines
; beginning with a semicolon are silently ignored (as you probably guessed).
---- php5.3-200710222030/php.ini~ 2007-10-23 00:20:28.000000000 +0300
-+++ php5.3-200710222030/php.ini 2007-10-23 00:22:43.853262016 +0300
-@@ -86,7 +153,7 @@
+@@ -94,7 +89,7 @@
asp_tags = Off
; The number of significant digits displayed in floating point numbers.
@@ -80,7 +50,7 @@
; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
y2k_compliance = On
-@@ -245,7 +312,7 @@
+@@ -253,7 +248,7 @@
; (e.g. by adding its signature to the Web server header). It is no security
; threat in any way, but it makes it possible to determine whether you use PHP
; on your server or not.
@@ -89,7 +59,27 @@
;;;;;;;;;;;;;;;;;;;
-@@ -318,7 +387,7 @@
+@@ -313,7 +308,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
+@@ -330,7 +327,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
+@@ -340,7 +337,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.
@@ -98,7 +88,7 @@
; 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.
-@@ -345,7 +414,7 @@
+@@ -367,7 +364,7 @@
; Disable the inclusion of HTML tags in error messages.
; Note: Never use this feature for production boxes.
@@ -107,16 +97,16 @@
; If html_errors is set On PHP produces clickable error messages that direct
; to a page describing the error or function causing the error in detail.
-@@ -389,7 +458,7 @@
+@@ -411,7 +408,7 @@
; Environment and Built-in variables (G, P, C, E & S respectively, often
; referred to as EGPCS or GPC). Registration is done from left to right, newer
; values override older values.
-variables_order = "EGPCS"
+variables_order = "GPCS"
- ; Whether or not to register the EGPCS variables as global variables. You may
- ; want to turn this off if you don't want to clutter your scripts' global scope
-@@ -405,12 +474,12 @@
+ ; This directive describes the order in which PHP registers GET, POST and Cookie
+ ; variables into the _REQUEST array. Registration is done from left to right,
+@@ -433,12 +430,12 @@
; Whether or not to register the old-style input arrays, HTTP_GET_VARS
; and friends. If you're not using them, it's recommended to turn them off,
; for performance reasons.
@@ -131,7 +121,7 @@
; When enabled, the SERVER and ENV variables are created when they're first
; used (Just In Time) instead of when the script starts. If these variables
-@@ -426,7 +495,7 @@
+@@ -454,7 +451,7 @@
;
; Magic quotes for incoming GET/POST/Cookie data.
@@ -140,7 +130,7 @@
; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
magic_quotes_runtime = Off
-@@ -472,7 +541,7 @@
+@@ -500,55 +497,13 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -149,7 +139,55 @@
; 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
-@@ -645,59 +645,6 @@
+ ; disabled on them.
+ enable_dl = On
+
+-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
+-; most web servers. Left undefined, PHP turns this on by default. You can
+-; turn it off here AT YOUR OWN RISK
+-; **You CAN safely turn this off for IIS, in fact, you MUST.**
+-; cgi.force_redirect = 1
+-
+-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
+-; every request.
+-; cgi.nph = 1
+-
+-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
+-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
+-; will look for to know it is OK to continue execution. Setting this variable MAY
+-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
+-; cgi.redirect_status_env = ;
+-
+-; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
+-; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
+-; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting
+-; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting
+-; of zero causes PHP to behave as before. Default is 1. You should fix your scripts
+-; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
+-; cgi.fix_pathinfo=0
+-
+-; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
+-; security tokens of the calling client. This allows IIS to define the
+-; security context that the request runs under. mod_fastcgi under Apache
+-; does not currently support this feature (03/17/2002)
+-; Set to 1 if running under IIS. Default is zero.
+-; fastcgi.impersonate = 1;
+-
+-; Disable logging through FastCGI connection
+-; fastcgi.logging = 0
+-
+-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
+-; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
+-; is supported by Apache. When this option is set to 1 PHP will send
+-; RFC2616 compliant header.
+-; Default is zero.
+-;cgi.rfc2616_headers = 0
+-
+-
+ ;;;;;;;;;;;;;;;;
+ ; File Uploads ;
+ ;;;;;;;;;;;;;;;;
+@@ -612,63 +567,6 @@
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.
@@ -165,11 +203,13 @@
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_exif.dll
+-;extension=php_fileinfo.dll
-;extension=php_fdf.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_gmp.dll
-;extension=php_ifx.dll
+-;extension=php_intl.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_ldap.dll
@@ -194,12 +234,14 @@
-;extension=php_pdo_pgsql.dll
-;extension=php_pdo_sqlite.dll
-;extension=php_pgsql.dll
+-;extension=php_phar.dll
-;extension=php_pspell.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_soap.dll
-;extension=php_sockets.dll
-;extension=php_sqlite.dll
+-;extension=php_sqlite3.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
@@ -209,16 +251,16 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -879,7 +879,7 @@
+@@ -966,7 +864,7 @@
bcmath.scale = 0
-
+
[browscap]
-;browscap = extra/browscap.ini
+browscap = /etc/php/browscap.ini
-
+
[Informix]
; Default host for ifx_connect() (doesn't apply in safe mode).
-@@ -1205,7 +1232,7 @@
+@@ -1319,7 +1217,7 @@
; Enables or disables WSDL caching feature.
soap.wsdl_cache_enabled=1
; Sets the directory name where SOAP extension will put cache files.
@@ -227,76 +269,3 @@
; (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-5.2.4/php.ini~ 2007-09-05 19:34:32.000000000 +0300
-+++ php-5.2.4/php.ini 2007-09-05 19:34:34.110706458 +0300
-@@ -559,48 +559,6 @@
- ; disabled on them.
- enable_dl = On
-
--; cgi.force_redirect is necessary to provide security running PHP as a CGI under
--; most web servers. Left undefined, PHP turns this on by default. You can
--; turn it off here AT YOUR OWN RISK
--; **You CAN safely turn this off for IIS, in fact, you MUST.**
--; cgi.force_redirect = 1
--
--; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
--; every request.
--; cgi.nph = 1
--
--; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
--; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
--; will look for to know it is OK to continue execution. Setting this variable MAY
--; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
--; cgi.redirect_status_env = ;
--
--; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
--; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
--; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting
--; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting
--; of zero causes PHP to behave as before. Default is 1. You should fix your scripts
--; to use SCRIPT_FILENAME rather than PATH_TRANSLATED.
--; cgi.fix_pathinfo=0
--
--; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
--; security tokens of the calling client. This allows IIS to define the
--; security context that the request runs under. mod_fastcgi under Apache
--; does not currently support this feature (03/17/2002)
--; Set to 1 if running under IIS. Default is zero.
--; fastcgi.impersonate = 1;
--
--; Disable logging through FastCGI connection
--; fastcgi.logging = 0
--
--; cgi.rfc2616_headers configuration option tells PHP what type of headers to
--; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
--; is supported by Apache. When this option is set to 1 PHP will send
--; RFC2616 compliant header.
--; Default is zero.
--;cgi.rfc2616_headers = 0
--
--
- ;;;;;;;;;;;;;;;;
- ; File Uploads ;
- ;;;;;;;;;;;;;;;;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/php-ini.patch?r1=1.30.2.1&r2=1.30.2.2&f=u
More information about the pld-cvs-commit
mailing list