clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Turn on html_errors by default again in php.ini-production like it was in

Browse Source 
PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.
This commit is contained in:
Derick Rethans 2011-08-10 16:31:29 +00:00
parent e4a64006ab
commit 7b84e7ea1c
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/main.c
View File

@ -721,10 +721,10 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c
}
/* we have a docref for a function AND
* - we show erroes in html mode OR
* - the user wants to see the links anyway
* - we show errors in html mode AND
* - the user wants to see the links
*/
if (docref && is_function && (PG(html_errors) || strlen(PG(docref_root)))) {
if (docref && is_function && PG(html_errors) && strlen(PG(docref_root))) {
if (strncmp(docref, "http://", 7)) {
/* We don't have 'http://' so we use docref_root */

19
php.ini-development
View File

@ -109,7 +109,7 @@
; html_errors
; Default Value: On
; Development Value: On
; Production value: Off
; Production value: On
; log_errors
; Default Value: Off
@ -532,23 +532,24 @@ track_errors = On
; An XML-RPC faultCode
;xmlrpc_error_number = 0
; When PHP displays or logs an error, it has the capability of inserting html
; links to documentation related to that error. This directive controls whether
; those HTML links appear in error messages or not. For performance and security
; reasons, it's recommended you disable this on production servers.
; When PHP displays or logs an error, it has the capability of formatting the
; error message as HTML for easier reading. This directive controls whether
; the error message is formatted as HTML or not.
; Note: This directive is hardcoded to Off for the CLI SAPI
; Default Value: On
; Development Value: On
; Production value: Off
; Production value: On
; http://php.net/html-errors
html_errors = On
; If html_errors is set On PHP produces clickable error messages that direct
; to a page describing the error or function causing the error in detail.
; If html_errors is set to On *and* docref_root is not empty, then PHP
; produces clickable error messages that direct to a page describing the error
; or function causing the error in detail.
; You can download a copy of the PHP manual from http://php.net/docs
; and change docref_root to the base URL of your local copy including the
; leading '/'. You must also specify the file extension being used including
; the dot. PHP's default behavior is to leave these settings empty.
; the dot. PHP's default behavior is to leave these settings empty, in which
; case no links to documentation are generated.
; Note: Never use this feature for production boxes.
; http://php.net/docref-root
; Examples

21
php.ini-production
View File

@ -109,7 +109,7 @@
; html_errors
; Default Value: On
; Development Value: On
; Production value: Off
; Production value: On
; log_errors
; Default Value: Off
@ -532,23 +532,24 @@ track_errors = Off
; An XML-RPC faultCode
;xmlrpc_error_number = 0
; When PHP displays or logs an error, it has the capability of inserting html
; links to documentation related to that error. This directive controls whether
; those HTML links appear in error messages or not. For performance and security
; reasons, it's recommended you disable this on production servers.
; When PHP displays or logs an error, it has the capability of formatting the
; error message as HTML for easier reading. This directive controls whether
; the error message is formatted as HTML or not.
; Note: This directive is hardcoded to Off for the CLI SAPI
; Default Value: On
; Development Value: On
; Production value: Off
; Production value: On
; http://php.net/html-errors
html_errors = Off
html_errors = On
; If html_errors is set On PHP produces clickable error messages that direct
; to a page describing the error or function causing the error in detail.
; If html_errors is set to On *and* docref_root is not empty, then PHP
; produces clickable error messages that direct to a page describing the error
; or function causing the error in detail.
; You can download a copy of the PHP manual from http://php.net/docs
; and change docref_root to the base URL of your local copy including the
; leading '/'. You must also specify the file extension being used including
; the dot. PHP's default behavior is to leave these settings empty.
; the dot. PHP's default behavior is to leave these settings empty, in which
; case no links to documentation are generated.
; Note: Never use this feature for production boxes.
; http://php.net/docref-root
; Examples