diff options
| -rw-r--r-- | php.ini-dist | 22 | ||||
| -rw-r--r-- | php.ini-recommended | 20 |
2 files changed, 21 insertions, 21 deletions
diff --git a/php.ini-dist b/php.ini-dist index 709a8d307d..1238eb236f 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -389,7 +389,7 @@ post_max_size = 8M ; ; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = On +magic_quotes_gpc = Off ; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. magic_quotes_runtime = Off @@ -538,7 +538,6 @@ default_socket_timeout = 60 ;Note that ODBC support is built in, so no dll is needed for it. ; -;extension=php_tidy.dll ;extension=php_bz2.dll ;extension=php_cpdf.dll ;extension=php_curl.dll @@ -573,6 +572,7 @@ default_socket_timeout = 60 ;extension=php_snmp.dll ;extension=php_sockets.dll ;extension=php_sybase_ct.dll +;extension=php_tidy.dll ;extension=php_w32api.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll @@ -584,15 +584,6 @@ default_socket_timeout = 60 ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -[Tidy] -; The path to a default tidy configuration file to use when using tidy -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -tidy.clean_output = Off - [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 @@ -1167,6 +1158,15 @@ sockets.use_system_read = On ;exif.decode_jis_motorola = JIS ;exif.decode_jis_intel = JIS +[Tidy] +; The path to a default tidy configuration file to use when using tidy +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +tidy.clean_output = Off + ; Local Variables: ; tab-width: 4 ; End: diff --git a/php.ini-recommended b/php.ini-recommended index deccff9676..9584d54d85 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -557,7 +557,6 @@ default_socket_timeout = 60 ;Note that ODBC support is built in, so no dll is needed for it. ; -;extension=php_tidy.dll ;extension=php_bz2.dll ;extension=php_cpdf.dll ;extension=php_curl.dll @@ -593,6 +592,7 @@ default_socket_timeout = 60 ;extension=php_snmp.dll ;extension=php_sockets.dll ;extension=php_sybase_ct.dll +;extension=php_tidy.dll ;extension=php_w32api.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll @@ -604,15 +604,6 @@ default_socket_timeout = 60 ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -[Tidy] -; The path to a default tidy configuration file to use when using tidy -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -tidy.clean_output = Off - [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 @@ -1181,6 +1172,15 @@ sockets.use_system_read = On ;exif.decode_jis_motorola = JIS ;exif.decode_jis_intel = JIS +[Tidy] +; The path to a default tidy configuration file to use when using tidy +;tidy.default_config = /usr/local/lib/php/default.tcfg + +; Should tidy clean and repair output automatically? +; WARNING: Do not use this option if you are generating non-html content +; such as dynamic images +tidy.clean_output = Off + ; Local Variables: ; tab-width: 4 ; End: |