Skip to content

Commit 1dd4d22

Browse files
committed
Modernize HTML markup in phpinfo output
1 parent f9b2ecf commit 1dd4d22

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

ext/standard/info.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ static ZEND_COLD void php_print_gpcse_array(char *name, size_t name_length)
239239
/* {{{ php_info_print_style */
240240
PHPAPI ZEND_COLD void ZEND_COLD php_info_print_style(void)
241241
{
242-
php_info_printf("<style type=\"text/css\">\n");
242+
php_info_printf("<style>\n");
243243
php_info_print_css();
244244
php_info_printf("</style>\n");
245245
}
@@ -735,12 +735,13 @@ PHPAPI zend_string *php_get_uname(char mode)
735735
/* {{{ php_print_info_htmlhead */
736736
PHPAPI ZEND_COLD void php_print_info_htmlhead(void)
737737
{
738-
php_info_print("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n");
739-
php_info_print("<html xmlns=\"http://www.w3.org/1999/xhtml\">");
738+
php_info_print("<!DOCTYPE html>\n");
739+
php_info_print("<html lang=\"en\">");
740740
php_info_print("<head>\n");
741+
php_info_print("<meta charset=\"utf-8\">");
742+
php_info_print("<meta name=\"robots\" content=\"noindex,nofollow,noarchive\">");
741743
php_info_print_style();
742744
php_info_printf("<title>PHP %s - phpinfo()</title>", PHP_VERSION);
743-
php_info_print("<meta name=\"ROBOTS\" content=\"NOINDEX,NOFOLLOW,NOARCHIVE\" />");
744745
php_info_print("</head>\n");
745746
php_info_print("<body><div class=\"center\">\n");
746747
}
@@ -785,9 +786,9 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
785786

786787
php_info_print("<a href=\"https://www.php.net/\"><img src=\"");
787788
if (ta && (ta->tm_mon==3) && (ta->tm_mday==1)) {
788-
php_info_print(PHP_EGG_LOGO_DATA_URI "\" alt=\"PHP logo\" /></a>");
789+
php_info_print(PHP_EGG_LOGO_DATA_URI "\" alt=\"PHP logo\"></a>");
789790
} else {
790-
php_info_print(PHP_LOGO_DATA_URI "\" alt=\"PHP logo\" /></a>");
791+
php_info_print(PHP_LOGO_DATA_URI "\" alt=\"PHP logo\"></a>");
791792
}
792793
}
793794

@@ -907,10 +908,10 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
907908
php_info_print_box_start(0);
908909
if (!sapi_module.phpinfo_as_text) {
909910
php_info_print("<a href=\"https://www.zend.com/\"><img src=\"");
910-
php_info_print(ZEND_LOGO_DATA_URI "\" alt=\"Zend logo\" /></a>\n");
911+
php_info_print(ZEND_LOGO_DATA_URI "\" alt=\"Zend logo\"></a>\n");
911912
}
912913
php_info_print("This program makes use of the Zend Scripting Language Engine:");
913-
php_info_print(!sapi_module.phpinfo_as_text?"<br />":"\n");
914+
php_info_print(!sapi_module.phpinfo_as_text?"<br>":"\n");
914915
if (sapi_module.phpinfo_as_text) {
915916
php_info_print(zend_version);
916917
} else {
@@ -1148,7 +1149,7 @@ PHPAPI ZEND_COLD void php_info_print_box_end(void) /* {{{ */
11481149
PHPAPI ZEND_COLD void php_info_print_hr(void) /* {{{ */
11491150
{
11501151
if (!sapi_module.phpinfo_as_text) {
1151-
php_info_print("<hr />\n");
1152+
php_info_print("<hr>\n");
11521153
} else {
11531154
php_info_print("\n\n _______________________________________________________________________\n\n");
11541155
}

0 commit comments

Comments
 (0)