more cleanup (lingering ini settings which do not exist anymore, etc.)

1 files changed, 7 insertions, 39 deletions

diff --git a/php.ini-dist b/php.ini-dist
index d4fd0ff1ff..f879d3b865 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -71,9 +71,6 @@
 ; Enable the PHP scripting language engine under Apache.
 engine = On
 
-; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
-zend.ze1_compatibility_mode = Off
-
 ; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized.
 ; NOTE: Using short tags should be avoided when developing applications or
 ; libraries that are meant for redistribution, or deployment on PHP
@@ -82,9 +79,6 @@ zend.ze1_compatibility_mode = Off
 ; be sure not to use short tags.
 short_open_tag = On
 
-; Allow ASP-style <% %> tags.
-asp_tags = Off
-
 ; The number of significant digits displayed in floating point numbers.
 precision    =  12
 
@@ -151,17 +145,6 @@ unserialize_callback_func=
 ; are decoded with unserialize, the data will remain the same.
 serialize_precision = 100
 
-; Whether to enable the ability to force arguments to be passed by reference
-; at function call time.  This method is deprecated and is likely to be
-; unsupported in future versions of PHP/Zend.  The encouraged method of
-; specifying which arguments should be passed by reference is in the function
-; declaration.  You're encouraged to try and turn this option Off and make
-; sure your scripts work properly with it in order to ensure they will work
-; with future versions of the language (you will receive a warning each time
-; you use this feature, and the argument will be passed by value instead of by
-; reference).
-allow_call_time_pass_reference = On
-
 ; open_basedir, if set, limits all file operations to the defined directory
 ; and below.  This directive makes most sense if used in a per-directory
 ; or per-virtualhost web server configuration file. This directive is
@@ -353,11 +336,6 @@ track_errors = Off
 ; values override older values.
 variables_order = "EGPCS"
 
-; 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.
-register_long_arrays = On
-
 ; This directive tells PHP whether to declare the argv&argc variables (that
 ; would contain the GET information).  If you don't use these variables, you
 ; should turn it off for increased performance.
@@ -366,8 +344,8 @@ register_argc_argv = On
 ; 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
 ; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives  register_long_arrays and 
-; register_argc_argv must be disabled for this directive to have any affect.
+; performance gain. The PHP directive register_argc_argv must be disabled 
+; for this directive to have any affect.
 auto_globals_jit = On
 
 ; Maximum size of POST data that PHP will accept.
@@ -388,7 +366,10 @@ default_mimetype = "text/html"
 ; Always populate the $HTTP_RAW_POST_DATA variable.
 ;always_populate_raw_post_data = On
 
-; Unicode settings
+;;;;;;;;;;;;;;;;;;;;
+; Unicode settings ;
+;;;;;;;;;;;;;;;;;;;;
+
 unicode_semantics = off
 unicode.runtime_encoding = iso-8859-1
 unicode.script_encoding = utf-8
@@ -421,11 +402,6 @@ user_dir =
 ; Directory in which the loadable extensions (modules) reside.
 extension_dir = "./"
 
-; 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
-; 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
@@ -481,6 +457,7 @@ upload_max_filesize = 2M
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 allow_url_fopen = On
+
 ; Whether to allow code execution through URL wrappers
 allow_url_include = Off
 
@@ -889,15 +866,6 @@ session.gc_maxlifetime = 1440
 ;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
 ;          cd /path/to/sessions; find -cmin +24 | xargs rm
 
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
-session.bug_compat_42 = 1
-session.bug_compat_warn = 1
-
 ; Check HTTP Referer to invalidate externally stored URLs containing ids.
 ; HTTP_REFERER has to contain this substring for the session to be
 ; considered as valid.