Add internal URI handling API #19073
Draft
+865
−208
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TimWolla
reviewed
Jul 9, 2025
Comment on lines
+459
to
+462
| static zend_string *parse_url_uri_to_string(void *uri, uri_recomposition_mode_t recomposition_mode, bool exclude_fragment) | ||
| { | ||
| ZEND_UNREACHABLE(); | ||
| } |
There was a problem hiding this comment.
Might be better to simply NULL the pointer in the uri_handler_t struct instead.
Comment on lines
+428
to
+431
| static void *parse_url_clone_uri(void *uri) | ||
| { | ||
| ZEND_UNREACHABLE(); | ||
| } |
Comment on lines
+435
to
+444
| zval exception; | ||
|
|
||
| object_init_ex(&exception, uri_invalid_uri_exception_ce); | ||
|
|
||
| zval value; | ||
| ZVAL_STRING(&value, "URL parsing failed"); | ||
| zend_update_property_ex(uri_whatwg_invalid_url_exception_ce, Z_OBJ(exception), ZSTR_KNOWN(ZEND_STR_MESSAGE), &value); | ||
| zval_ptr_dtor_str(&value); | ||
|
|
||
| zend_throw_exception_object(&exception); |
There was a problem hiding this comment.
Can be simplified according to the other implementations.
|
|
||
| static zend_result parse_url_read_fragment(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval) | ||
| { | ||
| php_url *parse_url_uri = (php_url *) internal_uri->uri; |
Comment on lines
+111
to
+114
| if (uri_handler_name == NULL) { | ||
| return uri_handler_by_name("parse_url", sizeof("parse_url") - 1); | ||
| } | ||
|
|
There was a problem hiding this comment.
Defaulting to parse_url in a new API is probably not a good idea. Instead the “legacy” users should just pass "parse_url" explicitly.
| return NULL; | ||
| } | ||
|
|
||
| uri_internal_t *internal_uri = emalloc(sizeof(uri_internal_t)); |
There was a problem hiding this comment.
Suggested change
| uri_internal_t *internal_uri = emalloc(sizeof(uri_internal_t)); | |
| uri_internal_t *internal_uri = emalloc(sizeof(*internal_uri)); |
| return NULL; | ||
| } | ||
|
|
||
| php_uri *uri = ecalloc(1, sizeof(php_uri)); |
There was a problem hiding this comment.
Suggested change
| php_uri *uri = ecalloc(1, sizeof(php_uri)); | |
| php_uri *uri = ecalloc(1, sizeof(*uri)); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.