<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[60973] trunk: General: Improve parsing of sent HTTP `Content-Type` header to detect HTML response.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/60973">60973</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/60973","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-19 00:19:27 +0000 (Sun, 19 Oct 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>General: Improve parsing of sent HTTP `Content-Type` header to detect HTML response.
This improves adherence to the HTTP spec in extracting the header name and value.
Developed in https://github.com/WordPress/wordpress-develop/pull/10293
Follow-up to <a href="https://core.trac.wordpress.org/changeset/60936">[60936]</a>.
Props dmsnell, westonruter.
See <a href="https://core.trac.wordpress.org/ticket/43258">#43258</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunktestsphpunitteststemplatephp">trunk/tests/phpunit/tests/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php 2025-10-19 00:17:57 UTC (rev 60972)
+++ trunk/src/wp-includes/template.php 2025-10-19 00:19:27 UTC (rev 60973)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -926,13 +926,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $is_html_content_type = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $html_content_types = array( 'text/html', 'application/xhtml+xml' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( headers_list() as $header ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $header_parts = preg_split( '/\s*[:;]\s*/', strtolower( $header ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $header_parts = explode( ':', strtolower( $header ), 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- is_array( $header_parts ) &&
- count( $header_parts ) >= 2 &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ count( $header_parts ) === 2 &&
</ins><span class="cx" style="display: block; padding: 0 10px"> 'content-type' === $header_parts[0]
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_html_content_type = in_array( $header_parts[1], $html_content_types, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * This is looking for very specific content types, therefore it
+ * doesn’t need to fully parse the header’s value. Instead, it needs
+ * only assert that the content type is one of the static HTML types.
+ *
+ * Example:
+ *
+ * Content-Type: text/html; charset=utf8
+ * Content-Type: text/html ;charset=latin4
+ * Content-Type:application/xhtml+xml
+ */
+ $media_type = trim( strtok( $header_parts[1], ';' ), " \t" );
+ $is_html_content_type = in_array( $media_type, $html_content_types, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> break; // PHP only sends the first Content-Type header in the list.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunitteststemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/template.php 2025-10-19 00:17:57 UTC (rev 60972)
+++ trunk/tests/phpunit/tests/template.php 2025-10-19 00:19:27 UTC (rev 60973)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,6 +597,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> PHP_INT_MAX
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 0, headers_list(), 'Expected no headers to have been sent during unit tests.' );
+ ini_set( 'default_mimetype', 'text/html' ); // Since sending a header won't work.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $initial_ob_level = ob_get_level();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_start_template_enhancement_output_buffer(), 'Expected wp_start_template_enhancement_output_buffer() to return true indicating the output buffer started.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, did_action( 'wp_template_enhancement_output_buffer_started' ), 'Expected the wp_template_enhancement_output_buffer_started action to have fired.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,6 +679,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 0, headers_list(), 'Expected no headers to have been sent during unit tests.' );
+ ini_set( 'default_mimetype', 'text/html' ); // Since sending a header won't work.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $initial_ob_level = ob_get_level();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_start_template_enhancement_output_buffer(), 'Expected wp_start_template_enhancement_output_buffer() to return true indicating the output buffer started.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, did_action( 'wp_template_enhancement_output_buffer_started' ), 'Expected the wp_template_enhancement_output_buffer_started action to have fired.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,6 +746,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 0, headers_list(), 'Expected no headers to have been sent during unit tests.' );
+ ini_set( 'default_mimetype', 'application/xhtml+xml' ); // Since sending a header won't work.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $initial_ob_level = ob_get_level();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_start_template_enhancement_output_buffer(), 'Expected wp_start_template_enhancement_output_buffer() to return true indicating the output buffer started.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, did_action( 'wp_template_enhancement_output_buffer_started' ), 'Expected the wp_template_enhancement_output_buffer_started action to have fired.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -749,6 +758,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><span class="cx" style="display: block; padding: 0 10px"> <html lang="en">
</span><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <meta charset="utf-8">
</ins><span class="cx" style="display: block; padding: 0 10px"> <title>Unprocessed</title>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -755,9 +765,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1>Hello World!</h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- ... -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php ob_clean(); // Clean the buffer started by wp_start_template_enhancement_output_buffer(), allowing the following document to replace the above.. ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo '<?xml version="1.0" encoding="UTF-8"?>'; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <!DOCTYPE html>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <html lang="en">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
</ins><span class="cx" style="display: block; padding: 0 10px"> <head>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <meta charset="utf-8" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <title>Template Replaced</title>
</span><span class="cx" style="display: block; padding: 0 10px"> </head>
</span><span class="cx" style="display: block; padding: 0 10px"> <body>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,7 +811,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, did_action( 'wp_template_enhancement_output_buffer_started' ), 'Expected the wp_template_enhancement_output_buffer_started action to have fired.' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $initial_ob_level + 1, ob_get_level(), 'Expected the output buffer level to have been incremented.' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertCount( 0, headers_list(), 'Expected no headers to have been sent during unit tests.' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ini_set( 'default_mimetype', 'application/json' ); // Since sending a header won't work.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $json = wp_json_encode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'success' => true,
</span></span></pre>
</div>
</div>
</body>
</html>