Skip to content

Commit e9c92a9

Browse files
kocsismatekocsismate
authored
ext/uri: Use the term "URI parser" instead of "URI handler" (php#19530)
1 parent 0bf2959 commit e9c92a9

18 files changed

+124
-124
lines changed

‎ext/filter/logical_filters.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -608,14 +608,14 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
608608
int parser_name_set;
609609
FETCH_STR_OPTION(parser_name, URL_OPTION_URI_PARSER_CLASS);
610610

611-
uri_handler_t *uri_handler = php_uri_get_handler(parser_name_set ? parser_name : NULL);
612-
if (uri_handler == NULL) {
611+
uri_parser_t *uri_parser = php_uri_get_parser(parser_name_set ? parser_name : NULL);
612+
if (uri_parser == NULL) {
613613
zend_value_error("%s(): \"uri_parser_class\" option has invalid value", get_active_function_name());
614614
RETURN_VALIDATION_FAILED
615615
}
616616

617617
/* Parse the URI - if it fails, we return NULL */
618-
php_uri *uri = php_uri_parse_to_struct(uri_handler, Z_STRVAL_P(value), Z_STRLEN_P(value), URI_COMPONENT_READ_RAW, true);
618+
php_uri *uri = php_uri_parse_to_struct(uri_parser, Z_STRVAL_P(value), Z_STRLEN_P(value), URI_COMPONENT_READ_RAW, true);
619619
if (uri == NULL) {
620620
RETURN_VALIDATION_FAILED
621621
}
@@ -630,7 +630,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
630630

631631
if (
632632
/* Skipping these checks is possible because the new URI implementations perform comprehensive validations. */
633-
strcmp(uri_handler->name, URI_PARSER_PHP) == 0 &&
633+
strcmp(uri_parser->name, URI_PARSER_PHP) == 0 &&
634634
/* An IPv6 enclosed by square brackets is a valid hostname.*/
635635
!php_filter_is_valid_ipv6_hostname(uri->host) &&
636636
/* Validate domain.
@@ -651,7 +651,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
651651
RETURN_VALIDATION_FAILED
652652
}
653653

654-
if (strcmp(uri_handler->name, URI_PARSER_PHP) == 0 &&
654+
if (strcmp(uri_parser->name, URI_PARSER_PHP) == 0 &&
655655
(
656656
(uri->user != NULL && !is_userinfo_valid(uri->user)) ||
657657
(uri->password != NULL && !is_userinfo_valid(uri->password))

‎ext/openssl/xp_ssl.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2634,13 +2634,13 @@ static char *php_openssl_get_url_name(const char *resourcename,
26342634
return NULL;
26352635
}
26362636

2637-
uri_handler_t *uri_handler = php_stream_context_get_uri_handler("ssl", context);
2638-
if (uri_handler == NULL) {
2637+
uri_parser_t *uri_parser = php_stream_context_get_uri_parser("ssl", context);
2638+
if (uri_parser == NULL) {
26392639
zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
26402640
return NULL;
26412641
}
26422642

2643-
uri_internal_t *internal_uri = php_uri_parse(uri_handler, resourcename, resourcenamelen, true);
2643+
uri_internal_t *internal_uri = php_uri_parse(uri_parser, resourcename, resourcenamelen, true);
26442644
if (internal_uri == NULL) {
26452645
return NULL;
26462646
}

‎ext/soap/php_http.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,12 +431,12 @@ int make_http_soap_request(
431431
}
432432

433433
if (location != NULL && ZSTR_VAL(location)[0] != '\000') {
434-
uri_handler_t *uri_handler = php_uri_get_handler(uri_parser_class);
435-
if (uri_handler == NULL) {
434+
uri_parser_t *uri_parser = php_uri_get_parser(uri_parser_class);
435+
if (uri_parser == NULL) {
436436
zend_argument_value_error(6, "must be a valid URI parser name");
437437
return FALSE;
438438
}
439-
uri = php_uri_parse_to_struct(uri_handler, ZSTR_VAL(location), ZSTR_LEN(location), URI_COMPONENT_READ_RAW, true);
439+
uri = php_uri_parse_to_struct(uri_parser, ZSTR_VAL(location), ZSTR_LEN(location), URI_COMPONENT_READ_RAW, true);
440440
}
441441

442442
tmp = Z_CLIENT_STREAM_CONTEXT_P(this_ptr);
@@ -1148,14 +1148,14 @@ int make_http_soap_request(
11481148
char *loc;
11491149

11501150
if ((loc = get_http_header_value(ZSTR_VAL(http_headers), "Location:")) != NULL) {
1151-
uri_handler_t *uri_handler = php_uri_get_handler(uri_parser_class);
1152-
if (uri_handler == NULL) {
1151+
uri_parser_t *uri_parser = php_uri_get_parser(uri_parser_class);
1152+
if (uri_parser == NULL) {
11531153
efree(loc);
11541154
zend_argument_value_error(6, "must be a valid URI parser name");
11551155
return FALSE;
11561156
}
11571157

1158-
php_uri *new_uri = php_uri_parse_to_struct(uri_handler, loc, strlen(loc), URI_COMPONENT_READ_RAW, true);
1158+
php_uri *new_uri = php_uri_parse_to_struct(uri_parser, loc, strlen(loc), URI_COMPONENT_READ_RAW, true);
11591159
efree(loc);
11601160

11611161
if (new_uri != NULL) {

‎ext/standard/ftp_fopen_wrapper.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, const char
135135
char *transport;
136136
int transport_len;
137137

138-
uri_handler_t *uri_handler = php_stream_context_get_uri_handler("ftp", context);
139-
if (uri_handler == NULL) {
138+
uri_parser_t *uri_parser = php_stream_context_get_uri_parser("ftp", context);
139+
if (uri_parser == NULL) {
140140
zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
141141
return NULL;
142142
}
143143

144-
resource = php_uri_parse_to_struct(uri_handler, path, strlen(path), URI_COMPONENT_READ_RAW, true);
144+
resource = php_uri_parse_to_struct(uri_parser, path, strlen(path), URI_COMPONENT_READ_RAW, true);
145145
if (resource == NULL || resource->path == NULL) {
146146
if (resource && presource) {
147147
*presource = resource;
@@ -956,18 +956,18 @@ static int php_stream_ftp_rename(php_stream_wrapper *wrapper, const char *url_fr
956956
int result;
957957
char tmp_line[512];
958958

959-
uri_handler_t *uri_handler = php_stream_context_get_uri_handler("ftp", context);
960-
if (uri_handler == NULL) {
959+
uri_parser_t *uri_parser = php_stream_context_get_uri_parser("ftp", context);
960+
if (uri_parser == NULL) {
961961
zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
962962
return 0;
963963
}
964964

965-
resource_from = php_uri_parse_to_struct(uri_handler, url_from, strlen(url_from), URI_COMPONENT_READ_RAW, true);
965+
resource_from = php_uri_parse_to_struct(uri_parser, url_from, strlen(url_from), URI_COMPONENT_READ_RAW, true);
966966
if (!resource_from) {
967967
return 0;
968968
}
969969

970-
resource_to = php_uri_parse_to_struct(uri_handler, url_to, strlen(url_to), URI_COMPONENT_READ_RAW, true);
970+
resource_to = php_uri_parse_to_struct(uri_parser, url_to, strlen(url_to), URI_COMPONENT_READ_RAW, true);
971971
if (!resource_to) {
972972
goto rename_errexit;
973973
}

‎ext/standard/http_fopen_wrapper.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,12 +393,12 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
393393
return NULL;
394394
}
395395

396-
uri_handler_t *uri_handler = php_stream_context_get_uri_handler("http", context);
397-
if (uri_handler == NULL) {
396+
uri_parser_t *uri_parser = php_stream_context_get_uri_parser("http", context);
397+
if (uri_parser == NULL) {
398398
zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
399399
return NULL;
400400
}
401-
resource = php_uri_parse_to_struct(uri_handler, path, strlen(path), URI_COMPONENT_READ_RAW, true);
401+
resource = php_uri_parse_to_struct(uri_parser, path, strlen(path), URI_COMPONENT_READ_RAW, true);
402402
if (resource == NULL) {
403403
return NULL;
404404
}
@@ -1097,7 +1097,7 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
10971097

10981098
php_uri_struct_free(resource);
10991099
/* check for invalid redirection URLs */
1100-
if ((resource = php_uri_parse_to_struct(uri_handler, new_path, strlen(new_path), URI_COMPONENT_READ_RAW, true)) == NULL) {
1100+
if ((resource = php_uri_parse_to_struct(uri_parser, new_path, strlen(new_path), URI_COMPONENT_READ_RAW, true)) == NULL) {
11011101
php_stream_wrapper_log_error(wrapper, options, "Invalid redirect URL! %s", new_path);
11021102
efree(new_path);
11031103
goto out;

‎ext/standard/url.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ static void *parse_url_parse_uri(const char *uri_str, size_t uri_str_len, const
463463
return url;
464464
}
465465

466-
const uri_handler_t parse_url_uri_handler = {
466+
const uri_parser_t parse_url_uri_parser = {
467467
.name = URI_PARSER_PHP,
468468
.parse_uri = parse_url_parse_uri,
469469
.clone_uri = NULL,
@@ -924,5 +924,5 @@ PHP_FUNCTION(get_headers)
924924

925925
PHP_MINIT_FUNCTION(url)
926926
{
927-
return php_uri_handler_register(&parse_url_uri_handler);
927+
return php_uri_parser_register(&parse_url_uri_parser);
928928
}

‎ext/uri/config.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ dnl Configure options
22
dnl
33

44
PHP_INSTALL_HEADERS([ext/uri], m4_normalize([
5-
php_lexbor.h
65
php_uri.h
76
php_uri_common.h
8-
php_uriparser.h
7+
uri_parser_rfc3986.h
8+
uri_parser_whatwg.h
99
]))
1010

1111
AC_DEFINE([URI_ENABLE_ANSI], [1], [Define to 1 for enabling ANSI support of uriparser.])
@@ -18,6 +18,6 @@ $URIPARSER_DIR/src/UriMemory.c $URIPARSER_DIR/src/UriNormalize.c $URIPARSER_DIR/
1818
$URIPARSER_DIR/src/UriParse.c $URIPARSER_DIR/src/UriParseBase.c $URIPARSER_DIR/src/UriQuery.c \
1919
$URIPARSER_DIR/src/UriRecompose.c $URIPARSER_DIR/src/UriResolve.c $URIPARSER_DIR/src/UriShorten.c"
2020

21-
PHP_NEW_EXTENSION(uri, [php_lexbor.c php_uri.c php_uri_common.c php_uriparser.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
21+
PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c uri_parser_rfc3986.c uri_parser_whatwg.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
2222
PHP_ADD_EXTENSION_DEP(uri, lexbor)
2323
PHP_ADD_BUILD_DIR($ext_builddir/$URIPARSER_DIR/src $ext_builddir/$URIPARSER_DIR/include)

‎ext/uri/config.w32‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
EXTENSION("uri", "php_lexbor.c php_uri.c php_uri_common.c php_uriparser.c", false /* never shared */, "/I ext/lexbor /I ext/uri/uriparser/include /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
1+
EXTENSION("uri", "php_uri.c php_uri_common.c uri_parser_rfc3986.c uri_parser_whatwg.c ", false /* never shared */, "/I ext/lexbor /I ext/uri/uriparser/include /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
22

33
AC_DEFINE("URI_ENABLE_ANSI", 1, "Define to 1 for enabling ANSI support of uriparser.")
44
AC_DEFINE("URI_NO_UNICODE", 1, "Define to 1 for disabling unicode support of uriparser.")
55
ADD_FLAG("CFLAGS_URI", "/D URI_STATIC_BUILD");
66

77
ADD_EXTENSION_DEP('uri', 'lexbor');
88
ADD_SOURCES("ext/uri/uriparser/src", "UriCommon.c UriCompare.c UriCopy.c UriEscape.c UriFile.c UriIp4.c UriIp4Base.c UriMemory.c UriNormalize.c UriNormalizeBase.c UriParse.c UriParseBase.c UriQuery.c UriRecompose.c UriResolve.c UriShorten.c", "uri");
9-
PHP_INSTALL_HEADERS("ext/uri", "php_lexbor.h php_uri.h php_uri_common.h php_uriparser.h uriparser/src uriparser/include");
9+
PHP_INSTALL_HEADERS("ext/uri", "php_uri.h php_uri_common.h uri_parser_rfc3986.h uri_parser_whatwg.h uriparser/src uriparser/include");

0 commit comments

Comments
 (0)