[RFC] Add RFC 3986 and WHATWG compliant URL parsing support #14461

kocsismate · 2024-06-03T20:46:49Z

2nd take after the failed experiment with #11315

RFC: https://wiki.php.net/rfc/url_parsing_api

kocsismate · 2024-06-03T20:48:40Z

ext/standard/basic_functions.stub.php

@@ -3715,7 +3715,6 @@ function uniqid(string $prefix = "", bool $more_entropy = false): string {}

 /**
 * @return int|string|array<string, int|string>|null|false
- * @compile-time-eval


Removed for benchmarking purposes

ext/url/php_url.c

kocsismate · 2024-06-03T20:59:10Z

ext/url/php_url.c

+
+static void cleanup_parser(void)
+{
+	if (++URL_G(urls) % 500 == 0) {


Approach is copy-pasted from lexbor/lexbor#206

ext/url/php_url.c

ext/url/config.m4

TimWolla

Some comments. Did not look into any details, yet.

TimWolla · 2025-02-16T22:48:10Z

ext/standard/basic_functions.c

@@ -141,6 +141,7 @@ static void user_shutdown_function_dtor(zval *zv);
 static void user_tick_function_dtor(user_tick_function_entry *tick_function_entry);

 static const zend_module_dep standard_deps[] = { /* {{{ */
+	ZEND_MOD_REQUIRED("uri")


If uri is required, it should not require the --enable-uri flag to build it. It should always be built, like ext/random.

Ah yes, good catch!

TimWolla · 2025-02-16T22:49:11Z

ext/soap/tests/bugs/bug38067.phpt

@@ -32,13 +32,13 @@ class TestSoapClient extends SoapClient {

 $client = new TestSoapClient(__DIR__.'/bug38067.wsdl',
    array('encoding' => 'ISO-8859-1'));
-$str = 'test: �';
+$str = 'test: �';


Unintended change? Did you editor treat this file as UTF-8 instead of ISO-8859-1?

Yes, it's surely an editor issue.

TimWolla · 2025-02-16T22:50:15Z

ext/soap/soap.stub.php

@@ -604,7 +604,7 @@ public function __getLastRequestHeaders(): ?string {}
        public function __getLastResponseHeaders(): ?string {}

        /** @tentative-return-type */
-        public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false): ?string {}
+        public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false, ?string $uriParserClass = null): ?string {}


Given the number of tests that you changed, is this a breaking change? If so, it needs to be noted in the RFC.

yes, that's a good idea

EXTENSIONS

TimWolla · 2025-02-16T22:51:43Z

ext/uri/config.m4

+    [Enable URI support])])
+
+if test "$PHP_URI" != "no"; then
+    PHP_LEXBOR_CFLAGS="-I$abs_srcdir/ext/dom/lexbor -DLEXBOR_STATIC -I$abs_srcdir/ext/uri/uriparser/include"


This effectively makes ext/dom a dependency of ext/uri. Should Lexbor be moved somewhere else?

It's just a WIP behavior from the early days of the PR. Once I manage to make the RFC approved, I'll create a lexbor "extension" (similarly to mysqlnd).

petk · 2025-04-07T23:11:59Z

ext/uri/config.m4

+    PHP_ADD_EXTENSION_DEP(uri, dom)
+    PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c php_lexbor.c php_uriparser.c $URIPARSER_SOURCES], $ext_shared,,$PHP_LEXBOR_CFLAGS)


Suggested change

PHP_ADD_EXTENSION_DEP(uri, dom)

PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c php_lexbor.c php_uriparser.c $URIPARSER_SOURCES], $ext_shared,,$PHP_LEXBOR_CFLAGS)

PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c php_lexbor.c php_uriparser.c $URIPARSER_SOURCES], $ext_shared,,$PHP_LEXBOR_CFLAGS)

PHP_ADD_EXTENSION_DEP(uri, dom)

For this macro to be effective, it should be called after the PHP_NEW_EXTENSION.

Thank you! I'll take care of this once the RFC is accepted :)

kocsismate added the Status: Requires RFC label Jun 3, 2024

github-actions bot added Category: Build System Category: Engine Extension: dom Extension: standard labels Jun 3, 2024

kocsismate force-pushed the ext-url2 branch from ee8cc69 to 0e29115 Compare June 3, 2024 20:57

kocsismate commented Jun 3, 2024

View reviewed changes

kocsismate force-pushed the ext-url2 branch 5 times, most recently from 823e4c6 to e65deb7 Compare June 6, 2024 08:23

kocsismate changed the title ~~Add ext/url based on Lexbor~~ [RFC] Add ext/url based on Lexbor Jun 12, 2024

nielsdos reviewed Jun 15, 2024

View reviewed changes

ext/url/php_url.c Outdated Show resolved Hide resolved

bukka reviewed Jul 8, 2024

View reviewed changes

ext/url/config.m4 Outdated Show resolved Hide resolved

kocsismate force-pushed the ext-url2 branch from f897c66 to dcb0299 Compare August 1, 2024 06:30

kocsismate changed the title ~~[RFC] Add ext/url based on Lexbor~~ [RFC] Add RFC 3986 and WHATWG compliant URL parsing support Aug 1, 2024

kocsismate force-pushed the ext-url2 branch 2 times, most recently from 0ccffa0 to 04d4e6e Compare August 13, 2024 12:30

github-actions bot added Extension: openssl Extension: intl Extension: com_dotnet Extension: curl Extension: date Extension: dba Extension: enchant Extension: ffi Extension: fileinfo Extension: filter Extension: ftp labels Aug 13, 2024

kocsismate force-pushed the ext-url2 branch 2 times, most recently from d0b9a3d to b9293a2 Compare January 25, 2025 22:42

kocsismate force-pushed the ext-url2 branch 2 times, most recently from 20f2844 to 0d2d2c3 Compare February 6, 2025 08:06

TimWolla reviewed Feb 16, 2025

View reviewed changes

kocsismate requested a review from DanielEScherzer as a code owner March 27, 2025 20:24

petk reviewed Apr 7, 2025

View reviewed changes

kocsismate added 16 commits April 14, 2025 08:56

Add RFC 3986 and WHATWG compliant URL parsing support

be61144

Serialization

88d4c06

Improve error handling

a60857c

Lot of fixes and added support for equalsTo()

9b6684f

Add normalization support

6764c12

SOAP test fixes

1b6233c

Fix some memory leaks

ff05ee1

Some cleanups

ea7848d

Changes based on discussion

45542b3

Removal of Uri\Uri

066dd2a

A lot of fixes and API changes

b485171

Updates

b3a48bf

Add new tests, path fixes

ea81d80

Add more tests for verifying the behavior of withers

17c7300

Fix code review comments

aafa027

A few fixes and improvements after feedback

449fda3

kocsismate force-pushed the ext-url2 branch from e25327b to 449fda3 Compare April 14, 2025 07:03

kocsismate added 4 commits April 14, 2025 18:27

Test fixes

96691bf

Remove WHATWG non-raw getters

3ac4884

Rename WHATWG getters again

88c8a46

Add UriComparisonMode

b8a8ba7

kocsismate force-pushed the ext-url2 branch from 0fab842 to b8a8ba7 Compare April 30, 2025 20:23

Expose $softErrors for Uri\WhatWg\Url::resolve()

f9cc74d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RFC] Add RFC 3986 and WHATWG compliant URL parsing support #14461

[RFC] Add RFC 3986 and WHATWG compliant URL parsing support #14461

kocsismate commented Jun 3, 2024 •

edited

Loading

kocsismate Jun 3, 2024

kocsismate Jun 3, 2024

TimWolla left a comment

TimWolla Feb 16, 2025

kocsismate Feb 18, 2025

TimWolla Feb 16, 2025

kocsismate Feb 18, 2025

TimWolla Feb 16, 2025

kocsismate Feb 18, 2025

TimWolla Feb 16, 2025

kocsismate Feb 18, 2025

petk Apr 7, 2025

kocsismate Apr 14, 2025

		PHP_ADD_EXTENSION_DEP(uri, dom)
		PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c php_lexbor.c php_uriparser.c $URIPARSER_SOURCES], $ext_shared,,$PHP_LEXBOR_CFLAGS)

[RFC] Add RFC 3986 and WHATWG compliant URL parsing support #14461

Are you sure you want to change the base?

[RFC] Add RFC 3986 and WHATWG compliant URL parsing support #14461

Conversation

kocsismate commented Jun 3, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TimWolla left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kocsismate commented Jun 3, 2024 •

edited

Loading