[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
kalle Fri Feb 13 16:55:18 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Revert previous change http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.27&r2=1.231.2.10.2.28&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.27 php-src/php.ini-dist:1.231.2.10.2.28 --- php-src/php.ini-dist:1.231.2.10.2.27Thu Feb 12 14:37:27 2009 +++ php-src/php.ini-distFri Feb 13 16:55:18 2009 @@ -290,11 +290,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL & ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE | E_STRICT +;error_reporting = E_ALL & ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -302,7 +302,7 @@ ; ; - Show all errors except for notices and coding standards warnings ; -error_reporting = E_ALL | ~E_NOTICE +error_reporting = E_ALL & ~E_NOTICE ; 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 http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.29&r2=1.179.2.11.2.30&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.29 php-src/php.ini-recommended:1.179.2.11.2.30 --- php-src/php.ini-recommended:1.179.2.11.2.29 Thu Feb 12 14:37:27 2009 +++ php-src/php.ini-recommended Fri Feb 13 16:55:18 2009 @@ -339,11 +339,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL | ~E_NOTICE +;error_reporting = E_ALL & ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL | ~E_NOTICE | E_STRICT +;error_reporting = E_ALL & ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -351,7 +351,7 @@ ; ; - Show all errors, except coding standards warnings ; -error_reporting = E_ALL +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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
kalle Thu Feb 12 14:37:27 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Fixed wrong usage of error_reporting directive http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.26&r2=1.231.2.10.2.27&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.26 php-src/php.ini-dist:1.231.2.10.2.27 --- php-src/php.ini-dist:1.231.2.10.2.26Sat Jan 31 19:26:02 2009 +++ php-src/php.ini-distThu Feb 12 14:37:27 2009 @@ -290,11 +290,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -302,7 +302,7 @@ ; ; - Show all errors except for notices and coding standards warnings ; -error_reporting = E_ALL & ~E_NOTICE +error_reporting = E_ALL | ~E_NOTICE ; 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 http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.28&r2=1.179.2.11.2.29&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.28 php-src/php.ini-recommended:1.179.2.11.2.29 --- php-src/php.ini-recommended:1.179.2.11.2.28 Sat Jan 31 19:26:02 2009 +++ php-src/php.ini-recommended Thu Feb 12 14:37:27 2009 @@ -339,11 +339,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | E_STRICT ; ; - Show only errors ; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
felipe Sat Jan 31 19:26:02 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: - MFH: Fixed bug #47255 (Typo in php.ini files) http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.25&r2=1.231.2.10.2.26&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.25 php-src/php.ini-dist:1.231.2.10.2.26 --- php-src/php.ini-dist:1.231.2.10.2.25Fri Nov 28 19:07:09 2008 +++ php-src/php.ini-distSat Jan 31 19:26:02 2009 @@ -870,7 +870,7 @@ ; Notice message logging require a little overheads. pgsql.ignore_notice = 0 -; Log PostgreSQL backends Noitce message or not. +; Log PostgreSQL backends Notice message or not. ; Unless pgsql.ignore_notice=0, module cannot log notice message. pgsql.log_notice = 0 http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.27&r2=1.179.2.11.2.28&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.27 php-src/php.ini-recommended:1.179.2.11.2.28 --- php-src/php.ini-recommended:1.179.2.11.2.27 Fri Nov 28 19:07:09 2008 +++ php-src/php.ini-recommended Sat Jan 31 19:26:02 2009 @@ -921,7 +921,7 @@ ; Notice message logging require a little overheads. pgsql.ignore_notice = 0 -; Log PostgreSQL backends Noitce message or not. +; Log PostgreSQL backends Notice message or not. ; Unless pgsql.ignore_notice=0, module cannot log notice message. pgsql.log_notice = 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
mattwil Fri Nov 28 19:07:10 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Updated description to match docs http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.24&r2=1.231.2.10.2.25&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.24 php-src/php.ini-dist:1.231.2.10.2.25 --- php-src/php.ini-dist:1.231.2.10.2.24Thu Nov 13 19:06:59 2008 +++ php-src/php.ini-distFri Nov 28 19:07:09 2008 @@ -336,7 +336,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.26&r2=1.179.2.11.2.27&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.26 php-src/php.ini-recommended:1.179.2.11.2.27 --- php-src/php.ini-recommended:1.179.2.11.2.26 Thu Nov 13 19:06:59 2008 +++ php-src/php.ini-recommended Fri Nov 28 19:07:09 2008 @@ -387,7 +387,7 @@ log_errors_max_len = 1024 ; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. +; line unless ignore_repeated_source is set true. ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
bjori Thu Nov 13 19:06:59 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-recommended php.ini-dist Log: MFH: Document the xmlrpc_errors option http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.25&r2=1.179.2.11.2.26&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.25 php-src/php.ini-recommended:1.179.2.11.2.26 --- php-src/php.ini-recommended:1.179.2.11.2.25 Sun Oct 26 15:39:44 2008 +++ php-src/php.ini-recommended Thu Nov 13 19:06:59 2008 @@ -405,6 +405,11 @@ ; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off +; Turn off normal error reporting and emit XML-RPC error XML +;xmlrpc_errors = 0 +; An XML-RPC faultCode +;xmlrpc_error_number = 0 + ; Disable the inclusion of HTML tags in error messages. ; Note: Never use this feature for production boxes. ;html_errors = Off @@ -725,10 +730,6 @@ [sqlite] ;sqlite.assoc_case = 0 -[xmlrpc] -;xmlrpc_error_number = 0 -;xmlrpc_errors = 0 - [Pcre] ;PCRE library backtracking limit. ;pcre.backtrack_limit=10 http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.23&r2=1.231.2.10.2.24&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.23 php-src/php.ini-dist:1.231.2.10.2.24 --- php-src/php.ini-dist:1.231.2.10.2.23Mon Feb 11 00:01:29 2008 +++ php-src/php.ini-distThu Nov 13 19:06:59 2008 @@ -354,6 +354,11 @@ ; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off +; Turn off normal error reporting and emit XML-RPC error XML +;xmlrpc_errors = 0 +; An XML-RPC faultCode +;xmlrpc_error_number = 0 + ; Disable the inclusion of HTML tags in error messages. ; Note: Never use this feature for production boxes. ;html_errors = Off @@ -674,10 +679,6 @@ [sqlite] ;sqlite.assoc_case = 0 -[xmlrpc] -;xmlrpc_error_number = 0 -;xmlrpc_errors = 0 - [Pcre] ;PCRE library backtracking limit. ;pcre.backtrack_limit=10 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
johannesMon Feb 11 00:01:29 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: - Fix typo (see #44095) http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.22&r2=1.231.2.10.2.23&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.22 php-src/php.ini-dist:1.231.2.10.2.23 --- php-src/php.ini-dist:1.231.2.10.2.22Tue Aug 21 23:24:18 2007 +++ php-src/php.ini-distMon Feb 11 00:01:29 2008 @@ -369,7 +369,7 @@ ;docref_ext = .html ; String to output before an error message. -;error_prepend_string = "" +;error_prepend_string = "" ; String to output after an error message. ;error_append_string = "" http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23&r2=1.179.2.11.2.24&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23 php-src/php.ini-recommended:1.179.2.11.2.24 --- php-src/php.ini-recommended:1.179.2.11.2.23 Tue Aug 21 23:24:18 2007 +++ php-src/php.ini-recommended Mon Feb 11 00:01:29 2008 @@ -419,7 +419,7 @@ ;docref_ext = .html ; String to output before an error message. -;error_prepend_string = "" +;error_prepend_string = "" ; String to output after an error message. ;error_append_string = "" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
janiTue Aug 21 23:24:18 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH:Fix typo in fastcgi.logging option example http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.21&r2=1.231.2.10.2.22&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.21 php-src/php.ini-dist:1.231.2.10.2.22 --- php-src/php.ini-dist:1.231.2.10.2.21Tue Jul 24 14:21:36 2007 +++ php-src/php.ini-distTue Aug 21 23:24:18 2007 @@ -522,7 +522,7 @@ ; fastcgi.impersonate = 1; ; Disable logging through FastCGI connection -; fastcgi.log = 0 +; 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 http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.22&r2=1.179.2.11.2.23&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.22 php-src/php.ini-recommended:1.179.2.11.2.23 --- php-src/php.ini-recommended:1.179.2.11.2.22 Tue Jul 24 14:21:36 2007 +++ php-src/php.ini-recommended Tue Aug 21 23:24:18 2007 @@ -572,7 +572,7 @@ ; fastcgi.impersonate = 1; ; Disable logging through FastCGI connection -; fastcgi.log = 0 +; 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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
dmitry Thu Jun 21 09:02:21 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: Fixed default values http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.19&r2=1.231.2.10.2.20&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.19 php-src/php.ini-dist:1.231.2.10.2.20 --- php-src/php.ini-dist:1.231.2.10.2.19Sun May 27 18:04:10 2007 +++ php-src/php.ini-distThu Jun 21 09:02:21 2007 @@ -500,7 +500,7 @@ ; 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 zero. You should fix your scripts +; 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 http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.20&r2=1.179.2.11.2.21&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.20 php-src/php.ini-recommended:1.179.2.11.2.21 --- php-src/php.ini-recommended:1.179.2.11.2.20 Sun May 27 18:04:10 2007 +++ php-src/php.ini-recommended Thu Jun 21 09:02:21 2007 @@ -548,7 +548,7 @@ ; 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 zero. You should fix your scripts +; 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=1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
sniper Sun May 27 18:04:11 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH: add missing entries, these are in PHP_4_4 branch.. http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.18&r2=1.231.2.10.2.19&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.18 php-src/php.ini-dist:1.231.2.10.2.19 --- php-src/php.ini-dist:1.231.2.10.2.18Tue May 22 13:27:16 2007 +++ php-src/php.ini-distSun May 27 18:04:10 2007 @@ -496,6 +496,14 @@ ; 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 zero. 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 http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.19&r2=1.179.2.11.2.20&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.19 php-src/php.ini-recommended:1.179.2.11.2.20 --- php-src/php.ini-recommended:1.179.2.11.2.19 Fri May 25 19:25:15 2007 +++ php-src/php.ini-recommended Sun May 27 18:04:10 2007 @@ -544,6 +544,14 @@ ; 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 zero. You should fix your scripts +; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. +; cgi.fix_pathinfo=1 + ; 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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
bjori Tue May 22 13:27:17 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: Add max_input_nesting_level http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.17&r2=1.231.2.10.2.18&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.17 php-src/php.ini-dist:1.231.2.10.2.18 --- php-src/php.ini-dist:1.231.2.10.2.17Thu Apr 12 12:31:39 2007 +++ php-src/php.ini-distTue May 22 13:27:16 2007 @@ -254,6 +254,7 @@ 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 +;max_input_nesting_level = 64 ; Maximum input variable nesting level memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.17&r2=1.179.2.11.2.18&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.17 php-src/php.ini-recommended:1.179.2.11.2.18 --- php-src/php.ini-recommended:1.179.2.11.2.17 Thu Apr 12 12:31:39 2007 +++ php-src/php.ini-recommended Tue May 22 13:27:16 2007 @@ -299,6 +299,7 @@ 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 +;max_input_nesting_level = 64 ; Maximum input variable nesting level memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
tony2001Thu Apr 12 12:31:39 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.16&r2=1.231.2.10.2.17&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.16 php-src/php.ini-dist:1.231.2.10.2.17 --- php-src/php.ini-dist:1.231.2.10.2.16Thu Apr 12 10:25:15 2007 +++ php-src/php.ini-distThu Apr 12 12:31:39 2007 @@ -661,13 +661,13 @@ [Pcre] ;PCRE library backtracking limit. -;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 ;PCRE library recursion limit. ;Please note that if you set this value to a high number you may consume all ;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). -;pcre.backtrack_limit=10 +;pcre.recursion_limit=10 [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.16&r2=1.179.2.11.2.17&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.16 php-src/php.ini-recommended:1.179.2.11.2.17 --- php-src/php.ini-recommended:1.179.2.11.2.16 Thu Apr 12 10:25:15 2007 +++ php-src/php.ini-recommended Thu Apr 12 12:31:39 2007 @@ -706,13 +706,13 @@ [Pcre] ;PCRE library backtracking limit. -;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 ;PCRE library recursion limit. ;Please note that if you set this value to a high number you may consume all ;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). -;pcre.backtrack_limit=10 +;pcre.recursion_limit=10 [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
tony2001Thu Apr 12 10:25:15 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.15&r2=1.231.2.10.2.16&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.15 php-src/php.ini-dist:1.231.2.10.2.16 --- php-src/php.ini-dist:1.231.2.10.2.15Thu Dec 21 13:05:27 2006 +++ php-src/php.ini-distThu Apr 12 10:25:15 2007 @@ -660,7 +660,13 @@ ;xmlrpc_errors = 0 [Pcre] +;PCRE library backtracking limit. ;pcre.recursion_limit=10 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). ;pcre.backtrack_limit=10 [Syslog] http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.15&r2=1.179.2.11.2.16&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.15 php-src/php.ini-recommended:1.179.2.11.2.16 --- php-src/php.ini-recommended:1.179.2.11.2.15 Thu Dec 21 13:05:27 2006 +++ php-src/php.ini-recommended Thu Apr 12 10:25:15 2007 @@ -705,7 +705,13 @@ ;xmlrpc_errors = 0 [Pcre] +;PCRE library backtracking limit. ;pcre.recursion_limit=10 + +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the +;stack size limit imposed by the Operating System). ;pcre.backtrack_limit=10 [Syslog] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
dmitry Thu Dec 21 13:05:28 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: Fixed comments http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.14&r2=1.231.2.10.2.15&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.14 php-src/php.ini-dist:1.231.2.10.2.15 --- php-src/php.ini-dist:1.231.2.10.2.14Thu Dec 21 09:12:42 2006 +++ php-src/php.ini-distThu Dec 21 13:05:27 2006 @@ -254,7 +254,7 @@ 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 = 128M ; Maximum amount of memory a script may consume (16MB) +memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) ;; http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.14&r2=1.179.2.11.2.15&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.14 php-src/php.ini-recommended:1.179.2.11.2.15 --- php-src/php.ini-recommended:1.179.2.11.2.14 Thu Dec 21 09:12:42 2006 +++ php-src/php.ini-recommended Thu Dec 21 13:05:27 2006 @@ -299,7 +299,7 @@ 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 = 128M ; Maximum amount of memory a script may consume (16MB) +memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
edink Tue Dec 19 10:34:10 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: Updated list of available extensions in dlls. Updated oci extension ini settings. -- christopher.jones at oracle dot com http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.12&r2=1.231.2.10.2.13&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.12 php-src/php.ini-dist:1.231.2.10.2.13 --- php-src/php.ini-dist:1.231.2.10.2.12Sat Oct 14 15:06:11 2006 +++ php-src/php.ini-distTue Dec 19 10:34:10 2006 @@ -583,40 +583,51 @@ ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. -;extension=php_mbstring.dll ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fdf.dll -;extension=php_filepro.dll ;extension=php_gd2.dll ;extension=php_gettext.dll +;extension=php_gmp.dll ;extension=php_ifx.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll +;extension=php_mbstring.dll ;extension=php_mcrypt.dll ;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_msql.dll +;extension=php_mssql.dll ;extension=php_mysql.dll +;extension=php_mysqli.dll ;extension=php_oci8.dll ;extension=php_openssl.dll -;extension=php_oracle.dll +;extension=php_pdo.dll +;extension=php_pdo_firebird.dll +;extension=php_pdo_mssql.dll +;extension=php_pdo_mysql.dll +;extension=php_pdo_oci.dll +;extension=php_pdo_oci8.dll +;extension=php_pdo_odbc.dll +;extension=php_pdo_pgsql.dll +;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll +;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll ;extension=php_sybase_ct.dll ;extension=php_tidy.dll ;extension=php_xmlrpc.dll ;extension=php_xsl.dll - +;extension=php_zip.dll ;;; ; Module Settings ; @@ -784,6 +795,37 @@ ; Maximum number of links (persistent+non persistent). -1 means no limit. msql.max_links = -1 +[OCI8] +; enables privileged connections using external credentials (OCI_SYSOPER, OCI_SYSDBA) +;oci8.privileged_connect = Off + +; Connection: The maximum number of persistent OCI8 connections per +; process. Using -1 means no limit. +;oci8.max_persistent = -1 + +; Connection: The maximum number of seconds a process is allowed to +; maintain an idle persistent connection. Using -1 means idle +; persistent connections will be maintained forever. +;oci8.persistent_timeout = -1 + +; Connection: The number of seconds that must pass before issuing a +; ping during oci_pconnect() to check the connection validity. When +; set to 0, each oci_pconnect() will cause a ping. Using -1 disables +; pings completely. +;oci8.ping_interval = 60 + +; Tuning: This option enables statement caching, and specifies how +; many statements to cache. Using 0 disables statement caching. +;oci8.statement_cache_size = 20 + +; Tuning: Enables statement prefetching and sets the default number of +; rows that will be fetched automatically after statement execution. +;oci8.default_prefetch = 10 + +; Compatibility. Using On means oci_close() will not close +; oci_connect() and oci_new_connect() connections. +;oci8.old_oci_close_semantics = Off + [PostgresSQL] ; Allow or prevent persistent links. pgsql.allow_persistent = On http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.12&r2=1.179.2.11.2.13&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.12 php-src/php.ini-recommended:1.179.2.11.2.13 --- php-src/php.ini-recommended:1.179.2.11.2.12 Sat Oct 14 15:06:11 2006 +++ php-src/php.ini-recommended Tue Dec 19 10:34:10 2006 @@ -628,40 +628,51 @@ ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. -;extension=php_mbstring.dll ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fdf.dll -;extension=php_filepro.dll ;extension=php_gd2.dll ;extension=php_gettext.dll +;extension=php_gmp.dll ;extension=php_ifx.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll +;extension=php_mbstring.dll ;extension=php_mcrypt.dll ;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_msql.dll +;extension=php_mssql.dll ;extension=php_mysql.dll +;extension=php_mysqli.dll ;extension=php_oci8.dll ;extension=php_openssl.dll -;extension=php_oracle.dll +;extension=php_pdo.dll +;extension=php_pdo_firebird.dll +;extension=php_pdo_mssql.dll +;extension=php_pdo_mysql.dll +;extension=php_pdo_oci.dll +;extension=ph
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended /ext/pdo pdo.c
bjori Sat Oct 14 15:06:11 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdopdo.c /php-srcphp.ini-recommended php.ini-dist Log: Remove bogus ini entry http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.6&r2=1.57.2.17.2.7&diff_format=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.6 php-src/ext/pdo/pdo.c:1.57.2.17.2.7 --- php-src/ext/pdo/pdo.c:1.57.2.17.2.6 Thu Jun 15 18:33:08 2006 +++ php-src/ext/pdo/pdo.c Sat Oct 14 15:06:11 2006 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo.c,v 1.57.2.17.2.6 2006/06/15 18:33:08 dmitry Exp $ */ +/* $Id: pdo.c,v 1.57.2.17.2.7 2006/10/14 15:06:11 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -162,12 +162,6 @@ ZEND_GET_MODULE(pdo) #endif -/* {{{ PHP_INI */ -PHP_INI_BEGIN() -STD_PHP_INI_ENTRY("pdo.global_value", "42", PHP_INI_ALL, OnUpdateLong, global_value, zend_pdo_globals, pdo_globals) -PHP_INI_END() -/* }}} */ - /* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(pdo) { @@ -326,8 +320,6 @@ spl_ce_RuntimeException = NULL; - REGISTER_INI_ENTRIES(); - if (FAILURE == pdo_sqlstate_init_error_table()) { return FAILURE; } @@ -353,7 +345,6 @@ /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pdo) { - UNREGISTER_INI_ENTRIES(); zend_hash_destroy(&pdo_driver_hash); pdo_sqlstate_fini_error_table(); return SUCCESS; @@ -388,9 +379,6 @@ php_info_print_table_end(); -#if 0 - DISPLAY_INI_ENTRIES(); -#endif } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.11&r2=1.179.2.11.2.12&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.11 php-src/php.ini-recommended:1.179.2.11.2.12 --- php-src/php.ini-recommended:1.179.2.11.2.11 Thu Sep 28 19:44:04 2006 +++ php-src/php.ini-recommended Sat Oct 14 15:06:11 2006 @@ -686,9 +686,6 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 -[pdo] -;pdo.global_value = 41 - [sqlite] ;sqlite.assoc_case = 0 http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.11&r2=1.231.2.10.2.12&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.11 php-src/php.ini-dist:1.231.2.10.2.12 --- php-src/php.ini-dist:1.231.2.10.2.11Thu Sep 28 19:37:59 2006 +++ php-src/php.ini-distSat Oct 14 15:06:11 2006 @@ -641,9 +641,6 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 -[pdo] -;pdo.global_value = 41 - [sqlite] ;sqlite.assoc_case = 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
bjori Thu Sep 28 19:37:59 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-recommended php.ini-dist Log: Remove unused ini options http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.9&r2=1.179.2.11.2.10&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.9 php-src/php.ini-recommended:1.179.2.11.2.10 --- php-src/php.ini-recommended:1.179.2.11.2.9 Thu Sep 28 19:00:52 2006 +++ php-src/php.ini-recommended Thu Sep 28 19:37:59 2006 @@ -108,7 +108,12 @@ ; It's not possible to decide to force a variable to be passed by reference ; when calling a function. The PHP 4 style to do this is by making the ; function require the relevant argument by reference. - +; - short_open_tag = Off +; - precision = 14 +; - session.gc_divisor = 1000 +; - session.bug_compat_42 = 1 +; - session.hash_bits_per_character = 5 +; - url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" ; Language Options ; @@ -1154,28 +1159,6 @@ ; 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 = @@ -1246,7 +1229,6 @@ ;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 http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.10&r2=1.231.2.10.2.11&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.10 php-src/php.ini-dist:1.231.2.10.2.11 --- php-src/php.ini-dist:1.231.2.10.2.10Thu Sep 28 19:00:52 2006 +++ php-src/php.ini-distThu Sep 28 19:37:59 2006 @@ -1108,28 +1108,6 @@ ; 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 = @@ -1183,9 +1161,6 @@ ; 4: Overload ereg*() functions ;mbstring.func_overload = 0 -; enable strict encoding detection. -;mbstring.strict_encoding = Off - [FrontBase] ;fbsql.allow_persistent = On ;fbsql.autocommit = On @@ -1200,7 +1175,6 @@ ;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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
bjori Thu Sep 28 19:00:52 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-recommended php.ini-dist Log: Add new ini options #feel free to add comments to it http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.8&r2=1.179.2.11.2.9&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.8 php-src/php.ini-recommended:1.179.2.11.2.9 --- php-src/php.ini-recommended:1.179.2.11.2.8 Sat Sep 9 21:56:58 2006 +++ php-src/php.ini-recommended Thu Sep 28 19:00:52 2006 @@ -170,6 +170,7 @@ ; 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 @@ -383,6 +384,8 @@ ; 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 @@ -669,6 +672,35 @@ ; 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.58 +;date.sunset_zenith = 90.58 + +[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 + +[pdo] +;pdo.global_value = 41 + +[sqlite] +;sqlite.assoc_case = 0 + +[xmlrpc] +;xmlrpc_error_number = 0 +;xmlrpc_errors = 0 + +[Pcre] +;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 + [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 @@ -943,6 +975,8 @@ ; Whether to use cookies. session.use_cookies = 1 +;session.cookie_secure = + ; This option enables administrators to make their users invulnerable to ; attacks which involve passing session ids in URLs; defaults to 0. ; session.use_only_cookies = 1 http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.9&r2=1.231.2.10.2.10&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.9 php-src/php.ini-dist:1.231.2.10.2.10 --- php-src/php.ini-dist:1.231.2.10.2.9 Sat Sep 9 21:56:58 2006 +++ php-src/php.ini-distThu Sep 28 19:00:52 2006 @@ -124,6 +124,7 @@ ; 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 @@ -337,6 +338,8 @@ ; 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 @@ -621,7 +624,36 @@ [Date] ; Defines the default timezone used by the date functions -;date.timezone = +;date.timezone = + +;date.default_latitude = 31.7667 +;date.default_longitude = 35.2333 + +;date.sunrise_zenith = 90.58 +;date.sunset_zenith = 90.58 + +[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 + +[pdo] +;pdo.global_value = 41 + +[sqlite] +;sqlite.assoc_case = 0 + +[xmlrpc] +;xmlrpc_error_number = 0 +;xmlrpc_errors = 0 + +[Pcre] +;pcre.recursion_limit=10 +;pcre.backtrack_limit=10 [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, @@ -897,6 +929,8 @@ ; Whether to use cookies. session.use_cookies = 1 +;session.cookie_secure = + ; This option enables administrators to make their users invulnerable to ; attacks which involve passing session ids in URLs; defaults to 0. ; session.use_only_cookies = 1 @@ -1173,7 +1207,7 @@ ; a gd image. The warning will then be displayed as notices ; disabled by default ;gd.jpeg_ignore_warning = 0 - + [exif] ; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. ; With mbstring support this will automatically be converted into the encoding -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
bjori Sat Sep 9 21:56:59 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-recommended php.ini-dist Log: - Remove register_globals from the "different" section - Add allow_url_include = Off - compatability -> compatibility and other typos http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.7&r2=1.179.2.11.2.8&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.7 php-src/php.ini-recommended:1.179.2.11.2.8 --- php-src/php.ini-recommended:1.179.2.11.2.7 Sat Sep 9 21:43:11 2006 +++ php-src/php.ini-recommended Sat Sep 9 21:56:58 2006 @@ -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. @@ -387,7 +375,7 @@ ; 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 @@ -590,6 +578,9 @@ ; 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="[EMAIL PROTECTED]" @@ -850,10 +841,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 @@ -1076,7 +1067,7 @@ ; 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 @@ -1160,7 +1151,7 @@ ;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] http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.8&r2=1.231.2.10.2.9&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.8 php-src/php.ini-dist:1.231.2.10.2.9 --- php-src/php.ini-dist:1.231.2.10.2.8 Sat Sep 9 21:43:11 2006 +++ php-src/php.ini-distSat Sep 9 21:56:58 2006 @@ -272,7 +272,7 @@ ; intentional (e.g., using an uninitialized variable and ; relying on the fact it's automatically initialized to an ; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes +; E_STRICT - run-time notices, enable to have PHP suggest changes ;
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
bjori Sat Sep 9 21:43:11 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-recommended php.ini-dist Log: Add E_RECOVERABLE http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.6&r2=1.179.2.11.2.7&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.6 php-src/php.ini-recommended:1.179.2.11.2.7 --- php-src/php.ini-recommended:1.179.2.11.2.6 Sun Sep 3 11:39:45 2006 +++ php-src/php.ini-recommended Sat Sep 9 21:43:11 2006 @@ -322,6 +322,7 @@ ; 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 +354,7 @@ ; ; - 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 ; http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.7&r2=1.231.2.10.2.8&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.7 php-src/php.ini-dist:1.231.2.10.2.8 --- php-src/php.ini-dist:1.231.2.10.2.7 Sun Sep 3 11:39:45 2006 +++ php-src/php.ini-distSat Sep 9 21:43:11 2006 @@ -264,6 +264,7 @@ ; 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 @@ -295,7 +296,7 @@ ; ; - 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 for notices and coding standards warnings ; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
nlopess Sun Sep 3 11:39:45 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: little typo (bug #38531) http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.6&r2=1.231.2.10.2.7&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.6 php-src/php.ini-dist:1.231.2.10.2.7 --- php-src/php.ini-dist:1.231.2.10.2.6 Thu Aug 17 13:43:08 2006 +++ php-src/php.ini-distSun Sep 3 11:39:45 2006 @@ -706,7 +706,7 @@ ; 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 http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.5&r2=1.179.2.11.2.6&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.5 php-src/php.ini-recommended:1.179.2.11.2.6 --- php-src/php.ini-recommended:1.179.2.11.2.5 Thu Aug 17 13:43:08 2006 +++ php-src/php.ini-recommended Sun Sep 3 11:39:45 2006 @@ -761,7 +761,7 @@ ; 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 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended /ext/fbsql php_fbsql.c php_fbsql.h
fmk Mon Aug 14 18:40:08 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended /php-src/ext/fbsql php_fbsql.c php_fbsql.h Log: MFH: Cleanup before reusing failed persistant connection. Better formating of timestamp and decimal values http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.4&r2=1.231.2.10.2.5&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.4 php-src/php.ini-dist:1.231.2.10.2.5 --- php-src/php.ini-dist:1.231.2.10.2.4 Thu Aug 10 13:50:55 2006 +++ php-src/php.ini-distMon Aug 14 18:40:08 2006 @@ -1154,6 +1154,7 @@ [FrontBase] ;fbsql.allow_persistent = On ;fbsql.autocommit = On +;fbsql.show_timestamp_decimals = Off ;fbsql.default_database = ;fbsql.default_database_password = ;fbsql.default_host = http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.3&r2=1.179.2.11.2.4&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.3 php-src/php.ini-recommended:1.179.2.11.2.4 --- php-src/php.ini-recommended:1.179.2.11.2.3 Thu Aug 10 13:50:55 2006 +++ php-src/php.ini-recommended Mon Aug 14 18:40:08 2006 @@ -1209,6 +1209,7 @@ [FrontBase] ;fbsql.allow_persistent = On ;fbsql.autocommit = On +;fbsql.show_timestamp_decimals = Off ;fbsql.default_database = ;fbsql.default_database_password = ;fbsql.default_host = http://cvs.php.net/viewvc.cgi/php-src/ext/fbsql/php_fbsql.c?r1=1.114.2.3.2.2&r2=1.114.2.3.2.3&diff_format=u Index: php-src/ext/fbsql/php_fbsql.c diff -u php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.2 php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.3 --- php-src/ext/fbsql/php_fbsql.c:1.114.2.3.2.2 Thu Jun 15 18:33:07 2006 +++ php-src/ext/fbsql/php_fbsql.c Mon Aug 14 18:40:08 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_fbsql.c,v 1.114.2.3.2.2 2006/06/15 18:33:07 dmitry Exp $ */ +/* $Id: php_fbsql.c,v 1.114.2.3.2.3 2006/08/14 18:40:08 fmk Exp $ */ /* TODO: * @@ -58,6 +58,10 @@ #define HAVE_FBSQL 1 +#ifndef min +# define min(a,b) ((a)<(b)?(a):(b)) +#endif + #if HAVE_FBSQL #include "php_fbsql.h" #include @@ -737,6 +741,7 @@ STD_PHP_INI_BOOLEAN ("fbsql.allow_persistent", "1",PHP_INI_SYSTEM, OnUpdateBool, allowPersistent, zend_fbsql_globals, fbsql_globals) STD_PHP_INI_BOOLEAN ("fbsql.generate_warnings", "0",PHP_INI_SYSTEM, OnUpdateBool, generateWarnings, zend_fbsql_globals, fbsql_globals) STD_PHP_INI_BOOLEAN ("fbsql.autocommit", "1",PHP_INI_SYSTEM, OnUpdateBool, autoCommit, zend_fbsql_globals, fbsql_globals) + STD_PHP_INI_BOOLEAN ("fbsql.show_timestamp_decimals", "0", PHP_INI_SYSTEM, OnUpdateBool, showTimestampDecimals, zend_fbsql_globals, fbsql_globals) STD_PHP_INI_ENTRY_EX ("fbsql.max_persistent", "-1", PHP_INI_SYSTEM, OnUpdateLong, maxPersistent, zend_fbsql_globals, fbsql_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX ("fbsql.max_links", "128", PHP_INI_SYSTEM, OnUpdateLong, maxLinks, zend_fbsql_globals, fbsql_globals, display_link_numbers) STD_PHP_INI_ENTRY_EX ("fbsql.max_connections", "128", PHP_INI_SYSTEM, OnUpdateLong, maxConnections, zend_fbsql_globals, fbsql_globals, display_link_numbers) @@ -896,7 +901,26 @@ if (persistent) { if (zend_hash_find(&EG(persistent_list), name, strlen(name) + 1, (void **)&lep) == SUCCESS) { + FBCMetaData *md; phpLink = (PHPFBLink*)lep->ptr; + // Check if connection still there. + md = fbcdcRollback(phpLink->connection); + if ( !mdOk(phpLink, md, "Rollback;") ) { + if (FB_SQL_G(generateWarnings)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "FrontBase link is not connected, ty to reconnect."); + } + // Make sure select_db will reconnect. + fbcmdRelease(md); + fbcdcClose(phpLink->connection); + fbcdcRelease(phpLink->connection); + free(phpLink->connection); + phpLink->connection = NULL; + if (phpLink->databaseName) free(phpLink->databaseName); + phpLink->databaseName = NULL; + } + else { + fbcmdRelease(md); + } }
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
zeevMon Jun 5 16:25:25 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: ze1 restoration http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.1&r2=1.231.2.10.2.2&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.1 php-src/php.ini-dist:1.231.2.10.2.2 --- php-src/php.ini-dist:1.231.2.10.2.1 Wed May 10 19:41:34 2006 +++ php-src/php.ini-distMon Jun 5 16:25:25 2006 @@ -71,6 +71,9 @@ ; 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 tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.1&r2=1.179.2.11.2.2&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.1 php-src/php.ini-recommended:1.179.2.11.2.2 --- php-src/php.ini-recommended:1.179.2.11.2.1 Wed May 10 19:41:34 2006 +++ php-src/php.ini-recommended Mon Jun 5 16:25:25 2006 @@ -129,6 +129,9 @@ ; 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 tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
helly Wed May 10 19:41:34 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: - ze1 cleanup (bjori) /thx http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.231.2.10&r2=1.231.2.10.2.1&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10 php-src/php.ini-dist:1.231.2.10.2.1 --- php-src/php.ini-dist:1.231.2.10 Wed Feb 8 23:43:48 2006 +++ php-src/php.ini-distWed May 10 19:41:34 2006 @@ -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 tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.179.2.11&r2=1.179.2.11.2.1&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11 php-src/php.ini-recommended:1.179.2.11.2.1 --- php-src/php.ini-recommended:1.179.2.11 Wed Feb 8 23:43:48 2006 +++ php-src/php.ini-recommended Wed May 10 19:41:34 2006 @@ -129,9 +129,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 tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php