Skip to content

Avoid sending Server-Timing header when buffer is being cleaned #1443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felixarntz merged 3 commits into from
Aug 7, 2024
Merged

Avoid sending Server-Timing header when buffer is being cleaned #1443

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b62c1a
Avoid sending Server-Timing header when buffer is being cleaned
westonruter Aug 6, 2024
26e859d
Fix passing arg name to _doing_it_wrong()
westonruter Aug 6, 2024
21ebb97
Improve escaping output by wrapping entire string in esc_html()
westonruter Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions plugins/performance-lab/includes/server-timing/class-perflab-server-timing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function register_metric( string $metric_slug, array $args ): void {
_doing_it_wrong(
__METHOD__,
/* translators: %s: metric slug */
sprintf( esc_html__( 'A metric with the slug %s is already registered.', 'performance-lab' ), esc_attr( $metric_slug ) ),
esc_html( sprintf( __( 'A metric with the slug %s is already registered.', 'performance-lab' ), $metric_slug ) ),
''
);
return;
Expand All @@ -71,7 +71,7 @@ public function register_metric( string $metric_slug, array $args ): void {
_doing_it_wrong(
__METHOD__,
/* translators: %s: WordPress action name */
sprintf( esc_html__( 'The method must be called before or during the %s action.', 'performance-lab' ), 'perflab_server_timing_send_header' ),
esc_html( sprintf( __( 'The method must be called before or during the %s action.', 'performance-lab' ), 'perflab_server_timing_send_header' ) ),
''
);
return;
Expand All @@ -88,7 +88,7 @@ public function register_metric( string $metric_slug, array $args ): void {
_doing_it_wrong(
__METHOD__,
/* translators: %s: PHP parameter name */
sprintf( esc_html__( 'The %s argument is required and must be a callable.', 'performance-lab' ), esc_attr( $args['measure_callback'] ) ),
esc_html( sprintf( __( 'The %s argument is required and must be a callable.', 'performance-lab' ), 'measure_callback' ) ),
''
);
return;
Expand All @@ -97,7 +97,7 @@ public function register_metric( string $metric_slug, array $args ): void {
_doing_it_wrong(
__METHOD__,
/* translators: %s: PHP parameter name */
sprintf( esc_html__( 'The %s argument is required and must be a string.', 'performance-lab' ), esc_attr( $args['access_cap'] ) ),
esc_html( sprintf( __( 'The %s argument is required and must be a string.', 'performance-lab' ), 'access_cap' ) ),
''
);
return;
Expand Down Expand Up @@ -268,8 +268,11 @@ public function on_template_include( $passthrough = null ) {
*/
public function start_output_buffer(): void {
ob_start(
function ( $output ) {
$this->send_header();
function ( string $output, ?int $phase ): string {
// Only send the header when the buffer is not being cleaned.
if ( ( $phase & PHP_OUTPUT_HANDLER_CLEAN ) === 0 ) {
$this->send_header();
}
return $output;
}
);
Expand Down