bjori Tue Jun 30 08:49:05 2009 UTC
Modified files:
/php-src php.ini-production php.ini-development
Log:
MFB5.3: Add missing ini entries (Mikko)
http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.12&r2=1.13&diff_format=u
Index: php-src/php.ini-production
diff -u php-src/php.ini-production:1.12 php-src/php.ini-production:1.13
--- php-src/php.ini-production:1.12 Sun Jun 28 17:55:36 2009
+++ php-src/php.ini-production Tue Jun 30 08:49:05 2009
@@ -641,7 +641,7 @@
; Data Handling ;
;;;;;;;;;;;;;;;;;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
+; Note - track_vars is ALWAYS enabled
; The separator used in PHP generated URLs to separate arguments.
; PHP's default setting is "&".
@@ -763,7 +763,7 @@
; http://php.net/auto-append-file
auto_append_file =
-; As of 4.0b4, PHP always outputs a character encoding by default in
+; By default, PHP will output a character encoding using
; the Content-type: header. To disable sending of the charset, simply
; set it to be empty.
;
@@ -958,7 +958,6 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
-;extension=php_mime_magic.dll
;extension=php_ming.dll
;extension=php_mssql.dll
;extension=php_mysql.dll
@@ -1449,7 +1448,7 @@
; where data files are stored. Note: Windows users have to change this
; variable in order to use PHP's session functions.
;
-; As of PHP 4.0.1, you can define the path as:
+; The path can be defined as:
;
; session.save_path = "N;/path"
;
@@ -1876,6 +1875,20 @@
; Sets the maximum number of open links or -1 for unlimited.
ldap.max_links = -1
+[mcrypt]
+; For more information about mcrypt settings see
http://php.net/mcrypt-module-open
+
+; Directory where to load mcrypt algorithms
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.algorithms_dir=
+
+; Directory where to load mcrypt modes
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.modes_dir=
+
+[dba]
+;dba.default_handler=
+
; Local Variables:
; tab-width: 4
; End:
http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.13&r2=1.14&diff_format=u
Index: php-src/php.ini-development
diff -u php-src/php.ini-development:1.13 php-src/php.ini-development:1.14
--- php-src/php.ini-development:1.13 Sun Jun 28 17:55:36 2009
+++ php-src/php.ini-development Tue Jun 30 08:49:05 2009
@@ -641,7 +641,7 @@
; Data Handling ;
;;;;;;;;;;;;;;;;;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
+; Note - track_vars is ALWAYS enabled
; The separator used in PHP generated URLs to separate arguments.
; PHP's default setting is "&".
@@ -763,7 +763,7 @@
; http://php.net/auto-append-file
auto_append_file =
-; As of 4.0b4, PHP always outputs a character encoding by default in
+; By default, PHP will output a character encoding using
; the Content-type: header. To disable sending of the charset, simply
; set it to be empty.
;
@@ -958,7 +958,6 @@
;extension=php_interbase.dll
;extension=php_ldap.dll
;extension=php_mbstring.dll
-;extension=php_mime_magic.dll
;extension=php_ming.dll
;extension=php_mssql.dll
;extension=php_mysql.dll
@@ -1441,7 +1440,7 @@
; where data files are stored. Note: Windows users have to change this
; variable in order to use PHP's session functions.
;
-; As of PHP 4.0.1, you can define the path as:
+; The path can be defined as:
;
; session.save_path = "N;/path"
;
@@ -1868,6 +1867,19 @@
; Sets the maximum number of open links or -1 for unlimited.
ldap.max_links = -1
+[mcrypt]
+; For more information about mcrypt settings see
http://php.net/mcrypt-module-open
+
+; Directory where to load mcrypt algorithms
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.algorithms_dir=
+
+; Directory where to load mcrypt modes
+; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt)
+;mcrypt.modes_dir=
+
+[dba]
+;dba.default_handler=
; Local Variables:
; tab-width: 4
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
