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

  PHP 5.3, but only generate docref links when the docref_root INI setting is
  not empty.

diff --git a/main/main.c b/main/main.c
index f6b90314394e34ce953268615e771d91576fc339..9caf5bc02afceaaa9827a4d0730a6e5a65a44602 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -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 */
 

diff --git a/php.ini-development b/php.ini-development
index bbb22dd6d9e5337e5bd43e60fc140012a7ce4b0d..df35cad7873f076df690928daf6807648e3312ab 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -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

diff --git a/php.ini-production b/php.ini-production
index 8e0773ffc10769d25f0a7eeb6242667e539a6483..d814d72ba227c635e3dd93578052ba3c6180c856 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -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