SOURCES: php-ini.patch - rediff
glen
glen at pld-linux.org
Mon Jan 5 13:55:46 CET 2009
Author: glen Date: Mon Jan 5 12:55:46 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- rediff
---- Files affected:
SOURCES:
php-ini.patch (1.30 -> 1.31)
---- Diffs:
================================================================
Index: SOURCES/php-ini.patch
diff -u SOURCES/php-ini.patch:1.30 SOURCES/php-ini.patch:1.31
--- SOURCES/php-ini.patch:1.30 Wed Sep 5 19:30:33 2007
+++ SOURCES/php-ini.patch Mon Jan 5 13:55:40 2009
@@ -1,5 +1,5 @@
---- 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
+--- php-5.2.8/php.ini-dist 2008-11-28 21:07:09.000000000 +0200
++++ php-5.2.8/php.ini 2009-01-05 14:53:55.914702890 +0200
@@ -3,13 +3,18 @@
;;;;;;;;;;;
; WARNING ;
@@ -26,7 +26,8 @@
;;;;;;;;;;;;;;;;;;;
; About php.ini ;
-@@ -60,9 +65,71 @@
+@@ -59,11 +64,73 @@
+ ;;;;;;;;;;;;;;;;;;;
; About this file ;
;;;;;;;;;;;;;;;;;;;
-; All the values in the php.ini-dist file correspond to the builtin
@@ -101,6 +102,7 @@
+
;;;;;;;;;;;;;;;;;;;;
; Language Options ;
+ ;;;;;;;;;;;;;;;;;;;;
@@ -86,7 +153,7 @@
asp_tags = Off
@@ -119,7 +121,27 @@
;;;;;;;;;;;;;;;;;;;
-@@ -318,7 +387,7 @@
+@@ -302,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
+@@ -319,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
+@@ -329,7 +398,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.
@@ -128,7 +150,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 @@
+@@ -361,7 +430,7 @@
; Disable the inclusion of HTML tags in error messages.
; Note: Never use this feature for production boxes.
@@ -137,7 +159,7 @@
; 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 @@
+@@ -405,7 +474,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.
@@ -146,7 +168,7 @@
; 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 @@
+@@ -421,12 +490,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.
@@ -161,7 +183,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 @@
+@@ -442,7 +511,7 @@
;
; Magic quotes for incoming GET/POST/Cookie data.
@@ -170,7 +192,7 @@
; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
magic_quotes_runtime = Off
-@@ -472,7 +541,7 @@
+@@ -488,55 +557,13 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@@ -179,7 +201,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 ;
+ ;;;;;;;;;;;;;;;;
+@@ -600,59 +627,6 @@
; needs to go here. Specify the location of the extension with the
; extension_dir directive above.
@@ -239,16 +309,47 @@
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
-@@ -879,7 +879,7 @@
+@@ -776,6 +750,9 @@
+ ; Maximum time (in seconds) for connect timeout. -1 means no limit
+ mysql.connect_timeout = 60
+
++; The name of the character set to use as the default character set.
++;mysql.connect_charset=utf8
++
+ ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
+ ; SQL-Errors will be displayed.
+ mysql.trace_mode = Off
+@@ -795,6 +772,9 @@
+ ; MySQL defaults.
+ mysqli.default_socket =
+
++; The name of the character set to use as the default character set.
++;mysqli.connect_charset=utf8
++
+ ; Default host for mysql_connect() (doesn't apply in safe mode).
+ mysqli.default_host =
+
+@@ -811,6 +791,10 @@
+ ; Allow or prevent reconnect
+ mysqli.reconnect = Off
+
++[pdo_mysql]
++; The name of the character set to use as the default character set.
++;pdo_mysql.connect_charset=utf8
++
+ [mSQL]
+ ; Allow or prevent persistent links.
+ msql.allow_persistent = On
+@@ -920,7 +904,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 @@
+@@ -1273,7 +1257,7 @@
; Enables or disables WSDL caching feature.
soap.wsdl_cache_enabled=1
; Sets the directory name where SOAP extension will put cache files.
@@ -257,76 +358,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&r2=1.31&f=u
More information about the pld-cvs-commit
mailing list