KD2 Framework  Check-in [caa2f5abe9]

Overview
Comment:Fix HTTP mergeURLs
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | 7.3
Files: files | file ages | folders
SHA1: caa2f5abe9735ef026340699105f29883dfde9cc
User & Date: bohwaz on 2020-11-26 19:29:36
Other Links: branch diff | manifest | tags
Context
2020-11-27
11:31
Fix PHP 8.0 authorizer use in SQLite3 check-in: c5a9600996 user: bohwaz tags: 7.3
2020-11-26
19:29
Fix HTTP mergeURLs check-in: caa2f5abe9 user: bohwaz tags: 7.3
18:39
Merge query strings check-in: 61d0e51f7c user: bohwaz tags: 7.3
Changes

Modified src/lib/KD2/HTTP.php from [5ce3482b5f] to [51b1e7498b].

301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316

		if ($dismiss_query)
		{
			// Don't propagate query params between redirects
			unset($a['query']);
		}
		else {
			parse_str($a['query'], $a_query);
			parse_str($b['query'], $b_query);
			$b['query'] = http_build_query(array_merge($a_query, $b_query));
		}

		// Relative URL
		if (!isset($b['host']) && isset($b['path']) && substr(trim($b['path']), 0, 1) != '/')
		{
			$path = preg_replace('![^/]*$!', '', $a['path']);







|
|







301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316

		if ($dismiss_query)
		{
			// Don't propagate query params between redirects
			unset($a['query']);
		}
		else {
			parse_str($a['query'] ?? '', $a_query);
			parse_str($b['query'] ?? '', $b_query);
			$b['query'] = http_build_query(array_merge($a_query, $b_query));
		}

		// Relative URL
		if (!isset($b['host']) && isset($b['path']) && substr(trim($b['path']), 0, 1) != '/')
		{
			$path = preg_replace('![^/]*$!', '', $a['path']);