Merge branch 'fix-738' into develop

crstauf · Jul 27, 2024 · 0cf4798 · 0cf4798
2 parents 8ba36b9 + fcef1f9
commit 0cf4798
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/collectors/http.php b/collectors/http.php
@@ -360,8 +360,9 @@ public function process() {
 
 			if ( isset( $response['info'] ) && ! empty( $response['info']['url'] ) && is_string( $response['info']['url'] ) ) {
 				// Ignore query variables when detecting a redirect.
-				$from = untrailingslashit( preg_replace( '#\?[^$]+$#', '', $request['url'] ) );
-				$to = untrailingslashit( preg_replace( '#\?[^$]+$#', '', $response['info']['url'] ) );
+				$from = untrailingslashit( preg_replace( '#\?[^$]*$#', '', $request['url'] ) );
+				$to = untrailingslashit( preg_replace( '#\?[^$]*$#', '', $response['info']['url'] ) );
+
 				if ( $from !== $to ) {
 					$redirected_to = $response['info']['url'];
 				}

diff --git a/output/html/http.php b/output/html/http.php
@@ -131,6 +131,10 @@ public function output() {
 					}
 				}
 
+				if ( empty( parse_url( $row['url'], PHP_URL_QUERY ) ) ) {
+					$url = trim( $url, '?' );
+				}
+
 				$component = $row['component'];
 
 				$stack = array();