cvs: /php4 main.c php.ini-dist /php4/ext/standard info.c

zeev Sat Sep 11 12:32:09 1999 EDT Modified files: /php4 main.c php.ini-dist /php4/ext/standard info.c Log: Rename allow_builtin_links to expose_php Index: php4/main.c diff -u php4/main.c:1.118 php4/main.c:1.119 --- php4/main.c:1.118 Sat Sep 11 12:16:16 1999 +++ php4/main.c Sat Sep 11 12:32:08 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.118 1999/09/11 16:16:16 zeev Exp $ */ +/* $Id: main.c,v 1.119 1999/09/11 16:32:08 zeev Exp $ */ #include <stdio.h> @@ -191,7 +191,7 @@ 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 @@ 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)); Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.6 php4/php.ini-dist:1.7 --- php4/php.ini-dist:1.6 Sat Sep 11 11:04:45 1999 +++ php4/php.ini-dist Sat Sep 11 12:32:08 1999 @@ -57,10 +57,10 @@ 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. Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.30 php4/ext/standard/info.c:1.31 --- php4/ext/standard/info.c:1.30 Sat Aug 7 14:21:35 1999 +++ php4/ext/standard/info.c Sat Sep 11 12:32:08 1999 @@ -57,7 +57,7 @@ { 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 @@ 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 @@ #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 @@ 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) {