From 574a1c2b0d1ee582f6de540404202c8c06fd00bd Mon Sep 17 00:00:00 2001 From: jorton Date: Nov 15 2006 14:42:23 +0000 Subject: - synch with upstream recommended php.ini --- diff --git a/php.ini b/php.ini index 0135141..3f2a9d0 100644 --- a/php.ini +++ b/php.ini @@ -67,18 +67,6 @@ ; PHP. Please make sure you read what's different, and modify your scripts ; accordingly, if you decide to use this file instead. ; -; - register_globals = Off [Security, Performance] -; Global variables are no longer registered for input data (POST, GET, cookies, -; environment and other server variables). Instead of using $foo, you must use -; you can use $_REQUEST["foo"] (includes any variable that arrives through the -; request, namely, POST, GET and cookie variables), or use one of the specific -; $_GET["foo"], $_POST["foo"], $_COOKIE["foo"] or $_FILES["foo"], depending -; on where the input originates. Also, you can look at the -; import_request_variables() function. -; Note that register_globals is going to be depracated (i.e., turned off by -; default) in the next version of PHP, because it often leads to security bugs. -; Read http://php.net/manual/en/security.registerglobals.php for further -; information. ; - register_long_arrays = Off [Performance] ; Disables registration of the older (and deprecated) long predefined array ; variables ($HTTP_*_VARS). Instead, use the superglobals that were @@ -112,7 +100,7 @@ ; The environment variables are not hashed into the $_ENV. To access ; environment variables, you can use getenv() instead. ; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -; By default, PHP surpresses errors of type E_NOTICE. These error messages +; By default, PHP suppresses errors of type E_NOTICE. These error messages ; are emitted for non-critical errors, but that could be a symptom of a bigger ; problem. Most notably, this will cause error messages about the use ; of uninitialized variables to be displayed. @@ -121,7 +109,6 @@ ; when calling a function. The PHP 4 style to do this is by making the ; function require the relevant argument by reference. - ;;;;;;;;;;;;;;;;;;;; ; Language Options ; ;;;;;;;;;;;;;;;;;;;; @@ -182,6 +169,7 @@ output_buffering = 4096 ; Note: You need to use zlib.output_handler instead of the standard ; output_handler, or otherwise the output will be corrupted. zlib.output_compression = Off +;zlib.output_compression_level = -1 ; You cannot specify additional output handlers if zlib.output_compression ; is activated here. This setting does the same as output_handler but in @@ -311,7 +299,7 @@ expose_php = On max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 16M ; Maximum amount of memory a script may consume +memory_limit = 16M ; Maximum amount of memory a script may consume (16MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -322,6 +310,7 @@ memory_limit = 16M ; Maximum amount of memory a script may consume ; reporting level ; E_ALL - All errors and warnings (doesn't include E_STRICT) ; E_ERROR - fatal run-time errors +; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) ; E_PARSE - compile-time parse errors ; E_NOTICE - run-time notices (these are warnings which often result @@ -353,7 +342,7 @@ memory_limit = 16M ; Maximum amount of memory a script may consume ; ; - Show only errors ; -;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR +;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR ; ; - Show all errors, except coding standards warnings ; @@ -386,7 +375,7 @@ ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting ; is On you will not log errors with repeated messages from different files or -; sourcelines. +; source lines. ignore_repeated_source = Off ; If this parameter is set to Off, then memory leaks will not be shown (on @@ -394,6 +383,8 @@ ignore_repeated_source = Off ; error reporting includes E_WARNING in the allowed list report_memleaks = On +;report_zend_debug = 0 + ; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off @@ -589,6 +580,9 @@ upload_max_filesize = 2M ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. allow_url_fopen = On +; Whether to allow include/require to open URLs (like http:// or ftp://) as files. +allow_url_include = Off + ; Define the anonymous ftp password (your email address) ;from="john@doe.com" @@ -638,6 +632,32 @@ default_socket_timeout = 60 ; Defines the default timezone used by the date functions ;date.timezone = +;date.default_latitude = 31.7667 +;date.default_longitude = 35.2333 + +;date.sunrise_zenith = 90.583333 +;date.sunset_zenith = 90.583333 + +[filter] +;filter.default = unsafe_raw +;filter.default_flags = + +[iconv] +;iconv.input_encoding = ISO-8859-1 +;iconv.internal_encoding = ISO-8859-1 +;iconv.output_encoding = ISO-8859-1 + +[sqlite] +;sqlite.assoc_case = 0 + +[xmlrpc] +;xmlrpc_error_number = 0 +;xmlrpc_errors = 0 + +[Pcre] +;pcre.recursion_limit=100000 +;pcre.backtrack_limit=100000 + [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In @@ -722,7 +742,7 @@ mysql.default_user = ; file will be able to reveal the password as well. mysql.default_password = -; Maximum time (in secondes) for connect timeout. -1 means no limit +; Maximum time (in seconds) for connect timeout. -1 means no limit mysql.connect_timeout = 60 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and @@ -810,10 +830,10 @@ sybase.min_error_severity = 10 ; Minimum message severity to display. sybase.min_message_severity = 10 -; Compatability mode with old versions of PHP 3.0. +; Compatibility mode with old versions of PHP 3.0. ; If on, this will cause PHP to automatically assign types to results according ; to their Sybase type, instead of treating them all as strings. This -; compatability mode will probably not stay around forever, so try applying +; compatibility mode will probably not stay around forever, so try applying ; whatever necessary changes to your code, and turn it off. sybase.compatability_mode = Off @@ -931,6 +951,9 @@ session.cookie_path = / ; The domain for which the cookie is valid. session.cookie_domain = +; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. +session.cookie_httponly = + ; Handler used to serialize data. php is the standard serializer of PHP. session.serialize_handler = php @@ -1033,7 +1056,7 @@ mssql.min_error_severity = 10 ; Minimum message severity to display. mssql.min_message_severity = 10 -; Compatability mode with old versions of PHP 3.0. +; Compatibility mode with old versions of PHP 3.0. mssql.compatability_mode = Off ; Connect timeout @@ -1086,28 +1109,6 @@ mssql.secure_connection = Off ; error_reporting(0) around the eval(). ;assert.quiet_eval = 0 -[Verisign Payflow Pro] -; Default Payflow Pro server. -pfpro.defaulthost = "test-payflow.verisign.com" - -; Default port to connect to. -pfpro.defaultport = 443 - -; Default timeout in seconds. -pfpro.defaulttimeout = 30 - -; Default proxy IP address (if required). -;pfpro.proxyaddress = - -; Default proxy port. -;pfpro.proxyport = - -; Default proxy logon. -;pfpro.proxylogon = - -; Default proxy password. -;pfpro.proxypassword = - [COM] ; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs ;com.typelib_file = @@ -1117,7 +1118,7 @@ pfpro.defaulttimeout = 30 ;com.autoregister_typelib = true ; register constants casesensitive ;com.autoregister_casesensitive = false -; show warnings on duplicate constat registrations +; show warnings on duplicate constant registrations ;com.autoregister_verbose = true [mbstring] @@ -1167,6 +1168,7 @@ pfpro.defaulttimeout = 30 [FrontBase] ;fbsql.allow_persistent = On ;fbsql.autocommit = On +;fbsql.show_timestamp_decimals = Off ;fbsql.default_database = ;fbsql.default_database_password = ;fbsql.default_host = @@ -1177,7 +1179,6 @@ pfpro.defaulttimeout = 30 ;fbsql.max_links = 128 ;fbsql.max_persistent = -1 ;fbsql.max_results = 128 -;fbsql.batchSize = 1000 [gd] ; Tell the jpeg decode to libjpeg warnings and try to create diff --git a/php.spec b/php.spec index 0e196c3..623b495 100644 --- a/php.spec +++ b/php.spec @@ -625,6 +625,7 @@ rm files.* macros.php * Wed Nov 15 2006 Joe Orton 5.2.0-4 - provide php-zend-abi (#212804) - add /etc/rpm/macros.php exporting interface versions +- synch with upstream recommended php.ini * Wed Nov 15 2006 Joe Orton 5.2.0-3 - update to 5.2.0 (#213837)