Rename allow_builtin_links to expose_php

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 0e7d804491f681ab448841771a699e9422c7de73..87c52a7ce5be22f618d46c8b864a1dcc5014cb07 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -57,7 +57,7 @@ PHPAPI void php_print_info(int flag)
 {
        char **env,*tmp1,*tmp2;
        char *php3_uname;
-       int allow_builtin_links = INI_INT("allow_builtin_links");
+       int expose_php = INI_INT("expose_php");
 #if WIN32|WINNT
        char php3_windows_uname[256];
        DWORD dwBuild=0;
@@ -88,7 +88,7 @@ PHPAPI void php_print_info(int flag)
                php_printf("<center><h1>PHP Version %s</h1></center>\n", PHP_VERSION);
 
                PUTS("<hr>");
-               if (allow_builtin_links) {
+               if (expose_php) {
                        PUTS("<a href=\"http://www.php.net/\"><img src=\"");
                        if (SG(request_info).request_uri) {
                                PUTS(SG(request_info).request_uri);
@@ -106,7 +106,7 @@ PHPAPI void php_print_info(int flag)
 #endif
                /* Zend Engine */
                PUTS("<hr>");
-               if (allow_builtin_links) {
+               if (expose_php) {
                        PUTS("<a href=\"http://www.zend.com/\"><img src=\"");
                        if (SG(request_info).request_uri) {
                                PUTS(SG(request_info).request_uri);
@@ -118,7 +118,7 @@ PHPAPI void php_print_info(int flag)
 
        PUTS("<center>");
 
-       if ((flag & PHP_INFO_CREDITS) && allow_builtin_links) { 
+       if ((flag & PHP_INFO_CREDITS) && expose_php) {  
                PUTS("<hr>");
                PUTS("<a href=\"");
                if (SG(request_info).request_uri) {

diff --git a/main/main.c b/main/main.c
index addb14380a608014ef512dc2fc82eb2b980787dc..ffc7f59bc44428c96a0467367335ba7b4fbf934e 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -191,7 +191,7 @@ PHP_INI_BEGIN()
        STD_PHP_INI_BOOLEAN("sql.safe_mode",    "0",            PHP_INI_SYSTEM,                 OnUpdateBool,           sql_safe_mode,                  php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("safe_mode_exec_dir", "1",    PHP_INI_SYSTEM,                 OnUpdateString, safe_mode_exec_dir,             php_core_globals,       core_globals)
        STD_PHP_INI_BOOLEAN("enable_dl",                "1",            PHP_INI_SYSTEM,                 OnUpdateBool,           enable_dl,                              php_core_globals,       core_globals)
-       PHP_INI_ENTRY_EX("allow_builtin_links", "0",    PHP_INI_ALL,                    NULL, php_ini_boolean_displayer_cb)
+       PHP_INI_ENTRY_EX("expose_php",                  "1",    PHP_INI_ALL,                    NULL, php_ini_boolean_displayer_cb)
 
        PHP_INI_ENTRY("SMTP",                   "localhost",                    PHP_INI_ALL,            NULL)
        PHP_INI_ENTRY("sendmail_path",  DEFAULT_SENDMAIL_PATH,  PHP_INI_SYSTEM,         NULL)
@@ -1120,7 +1120,7 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
        SLS_FETCH();
 
        if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' 
-               && INI_INT("allow_builtin_links")) {
+               && INI_INT("expose_php")) {
                if (!strcmp(SG(request_info).query_string+1, "PHPE9568F34-D428-11d2-A769-00AA001ACF42")) {
                        char *header_line = estrndup(CONTEXT_TYPE_IMAGE_GIF, sizeof(CONTEXT_TYPE_IMAGE_GIF));
 

diff --git a/php.ini-dist b/php.ini-dist
index d125ef05fdba65eb6be2c2d9c803535b60a84bb9..896e9b24bc27c5c65f71c07338e43424f5639172 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -57,10 +57,10 @@ highlight.default   =       #0000BB
 highlight.html         =       #000000
 
 ; Misc
-allow_builtin_links    =       Off             ; Sets whether phpinfo() will generate built-in links that display the PHP
-                                                               ; and Zend logos, and tells PHP whether to honor them or not.
-                                                               ; It is no security threat in any way, but it makes it possible
-                                                               ; to determine whether you use PHP on your server or not.
+expose_php     =       On              ; Decides whether PHP may expose the fact that it is installed on the
+                                               ; server (e.g., by adding its signature to the Web server header).
+                                               ; It is no security threat in any way, but it makes it possible
+                                               ; to determine whether you use PHP on your server or not.