Skip to content

uri: Make uri_parser_rfc3986.h usable for external extensions #20173

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
merged 3 commits into from
Oct 20, 2025
+11 −6
Merged

uri: Make uri_parser_rfc3986.h usable for external extensions #20173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df4886c
uri: Make uri_parser_rfc3986.h usable for external extensions
TimWolla Oct 15, 2025
3151497
Merge branch 'PHP-8.5' into uri-rfc3986-header-usable
TimWolla Oct 20, 2025
3ebdf73
NEWS
TimWolla Oct 20, 2025
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
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ PHP NEWS
- URI:
. Fixed bug GH-20088 (Heap-use-after-free in PHP URI WHATWG parser
during malformed URL processing). (lexborisov)
. Fixed bug GH-19868 (Unable to use uri_parser_rfc3986.h from external
extensions). (timwolla)

09 Oct 2025, PHP 8.5.0RC2

Expand Down
8 changes: 8 additions & 0 deletions ext/uri/uri_parser_rfc3986.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
#include "Zend/zend_smart_str.h"
#include "Zend/zend_exceptions.h"

#include <uriparser/Uri.h>

struct php_uri_parser_rfc3986_uris {
UriUriA uri;
UriUriA normalized_uri;
bool normalized_uri_initialized;
};

static void *php_uri_parser_rfc3986_memory_manager_malloc(UriMemoryManager *memory_manager, size_t size)
{
return emalloc(size);
Expand Down
7 changes: 1 addition & 6 deletions ext/uri/uri_parser_rfc3986.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,11 @@
#ifndef PHP_URI_PARSER_RFC3986_H
#define PHP_URI_PARSER_RFC3986_H

#include <uriparser/Uri.h>
#include "php_uri_common.h"

extern const php_uri_parser php_uri_parser_rfc3986;

typedef struct php_uri_parser_rfc3986_uris {
UriUriA uri;
UriUriA normalized_uri;
bool normalized_uri_initialized;
} php_uri_parser_rfc3986_uris;
typedef struct php_uri_parser_rfc3986_uris php_uri_parser_rfc3986_uris;

zend_result php_uri_parser_rfc3986_userinfo_read(void *uri, php_uri_component_read_mode read_mode, zval *retval);
zend_result php_uri_parser_rfc3986_userinfo_write(void *uri, zval *value, zval *errors);
Expand Down