Skip to content

Commit 27b40a0

Browse files
TimWollaTimWolla
committed
uri: Properly prefix symbols in uri_parser_php_parse_url.[ch]
1 parent fb900cf commit 27b40a0

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎ext/filter/logical_filters.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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_parser->name, URI_PARSER_PHP) == 0 &&
633+
strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 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_parser->name, URI_PARSER_PHP) == 0 &&
654+
if (strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 0 &&
655655
(
656656
(uri->user != NULL && !is_userinfo_valid(uri->user)) ||
657657
(uri->password != NULL && !is_userinfo_valid(uri->password))

‎ext/uri/php_uri.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static HashTable *uri_get_debug_properties(zend_object *object)
110110
PHPAPI uri_parser_t *php_uri_get_parser(const zend_string *uri_parser_name)
111111
{
112112
if (uri_parser_name == NULL) {
113-
return uri_parser_by_name(URI_PARSER_PHP, sizeof(URI_PARSER_PHP) - 1);
113+
return uri_parser_by_name(PHP_URI_PARSER_PHP_PARSE_URL, sizeof(PHP_URI_PARSER_PHP_PARSE_URL) - 1);
114114
}
115115

116116
return uri_parser_by_name(ZSTR_VAL(uri_parser_name), ZSTR_LEN(uri_parser_name));
@@ -1022,8 +1022,8 @@ PHPAPI zend_result php_uri_parser_register(const uri_parser_t *uri_parser)
10221022

10231023
ZEND_ASSERT(uri_parser->name != NULL);
10241024
ZEND_ASSERT(uri_parser->parse_uri != NULL);
1025-
ZEND_ASSERT(uri_parser->clone_uri != NULL || strcmp(uri_parser->name, URI_PARSER_PHP) == 0);
1026-
ZEND_ASSERT(uri_parser->uri_to_string != NULL || strcmp(uri_parser->name, URI_PARSER_PHP) == 0);
1025+
ZEND_ASSERT(uri_parser->clone_uri != NULL || strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 0);
1026+
ZEND_ASSERT(uri_parser->uri_to_string != NULL || strcmp(uri_parser->name, PHP_URI_PARSER_PHP_PARSE_URL) == 0);
10271027
ZEND_ASSERT(uri_parser->free_uri != NULL);
10281028

10291029
zend_result result = zend_hash_add_ptr(&uri_parsers, key, (void *) uri_parser) != NULL ? SUCCESS : FAILURE;
@@ -1058,7 +1058,7 @@ static PHP_MINIT_FUNCTION(uri)
10581058
return FAILURE;
10591059
}
10601060

1061-
if (php_uri_parser_register(&parse_url_uri_parser) == FAILURE) {
1061+
if (php_uri_parser_register(&php_uri_parser_php_parse_url) == FAILURE) {
10621062
return FAILURE;
10631063
}
10641064

‎ext/uri/php_uri_common.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static inline uri_internal_t *uri_internal_from_obj(const zend_object *object) {
164164

165165
#define PHP_URI_PARSER_RFC3986 "Uri\\Rfc3986\\Uri"
166166
#define PHP_URI_PARSER_WHATWG "Uri\\WhatWg\\Url"
167-
#define URI_PARSER_PHP "parse_url"
167+
#define PHP_URI_PARSER_PHP_PARSE_URL "parse_url"
168168
#define URI_SERIALIZED_PROPERTY_NAME "uri"
169169

170170
const uri_property_handler_t *uri_property_handler_from_internal_uri(const uri_internal_t *internal_uri, uri_property_name_t property_name);

‎ext/uri/uri_parser_php_parse_url.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "Zend/zend_exceptions.h"
2222
#include "ext/standard/url.h"
2323

24-
static void parse_url_decode_component(zval *zv, uri_component_read_mode_t read_mode)
24+
static void decode_component(zval *zv, uri_component_read_mode_t read_mode)
2525
{
2626
if (Z_TYPE_P(zv) != IS_STRING) {
2727
return;
@@ -34,111 +34,111 @@ static void parse_url_decode_component(zval *zv, uri_component_read_mode_t read_
3434
php_raw_url_decode(Z_STRVAL_P(zv), Z_STRLEN_P(zv));
3535
}
3636

37-
static zend_result parse_url_read_scheme(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
37+
static zend_result uri_parser_php_parse_url_scheme_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
3838
{
3939
const php_url *parse_url_uri = internal_uri->uri;
4040

4141
if (parse_url_uri->scheme) {
4242
ZVAL_STR_COPY(retval, parse_url_uri->scheme);
43-
parse_url_decode_component(retval, read_mode);
43+
decode_component(retval, read_mode);
4444
} else {
4545
ZVAL_NULL(retval);
4646
}
4747

4848
return SUCCESS;
4949
}
5050

51-
static zend_result parse_url_read_username(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
51+
static zend_result uri_parser_php_parse_url_username_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
5252
{
5353
const php_url *parse_url_uri = internal_uri->uri;
5454

5555
if (parse_url_uri->user) {
5656
ZVAL_STR_COPY(retval, parse_url_uri->user);
57-
parse_url_decode_component(retval, read_mode);
57+
decode_component(retval, read_mode);
5858
} else {
5959
ZVAL_NULL(retval);
6060
}
6161

6262
return SUCCESS;
6363
}
6464

65-
static zend_result parse_url_read_password(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
65+
static zend_result uri_parser_php_parse_url_password_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
6666
{
6767
const php_url *parse_url_uri = internal_uri->uri;
6868

6969
if (parse_url_uri->pass) {
7070
ZVAL_STR_COPY(retval, parse_url_uri->pass);
71-
parse_url_decode_component(retval, read_mode);
71+
decode_component(retval, read_mode);
7272
} else {
7373
ZVAL_NULL(retval);
7474
}
7575

7676
return SUCCESS;
7777
}
7878

79-
static zend_result parse_url_read_host(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
79+
static zend_result uri_parser_php_parse_url_host_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
8080
{
8181
const php_url *parse_url_uri = internal_uri->uri;
8282

8383
if (parse_url_uri->host) {
8484
ZVAL_STR_COPY(retval, parse_url_uri->host);
85-
parse_url_decode_component(retval, read_mode);
85+
decode_component(retval, read_mode);
8686
} else {
8787
ZVAL_NULL(retval);
8888
}
8989

9090
return SUCCESS;
9191
}
9292

93-
static zend_result parse_url_read_port(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
93+
static zend_result uri_parser_php_parse_url_port_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
9494
{
9595
const php_url *parse_url_uri = internal_uri->uri;
9696

9797
if (parse_url_uri->port) {
9898
ZVAL_LONG(retval, parse_url_uri->port);
99-
parse_url_decode_component(retval, read_mode);
99+
decode_component(retval, read_mode);
100100
} else {
101101
ZVAL_NULL(retval);
102102
}
103103

104104
return SUCCESS;
105105
}
106106

107-
static zend_result parse_url_read_path(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
107+
static zend_result uri_parser_php_parse_url_path_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
108108
{
109109
const php_url *parse_url_uri = internal_uri->uri;
110110

111111
if (parse_url_uri->path) {
112112
ZVAL_STR_COPY(retval, parse_url_uri->path);
113-
parse_url_decode_component(retval, read_mode);
113+
decode_component(retval, read_mode);
114114
} else {
115115
ZVAL_NULL(retval);
116116
}
117117

118118
return SUCCESS;
119119
}
120120

121-
static zend_result parse_url_read_query(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
121+
static zend_result uri_parser_php_parse_url_query_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
122122
{
123123
const php_url *parse_url_uri = internal_uri->uri;
124124

125125
if (parse_url_uri->query) {
126126
ZVAL_STR_COPY(retval, parse_url_uri->query);
127-
parse_url_decode_component(retval, read_mode);
127+
decode_component(retval, read_mode);
128128
} else {
129129
ZVAL_NULL(retval);
130130
}
131131

132132
return SUCCESS;
133133
}
134134

135-
static zend_result parse_url_read_fragment(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
135+
static zend_result uri_parser_php_parse_url_fragment_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
136136
{
137137
const php_url *parse_url_uri = internal_uri->uri;
138138

139139
if (parse_url_uri->fragment) {
140140
ZVAL_STR_COPY(retval, parse_url_uri->fragment);
141-
parse_url_decode_component(retval, read_mode);
141+
decode_component(retval, read_mode);
142142
} else {
143143
ZVAL_NULL(retval);
144144
}
@@ -151,7 +151,7 @@ static void throw_invalid_uri_exception(void)
151151
zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI is malformed", 0);
152152
}
153153

154-
static void *parse_url_parse_uri(const char *uri_str, size_t uri_str_len, const void *base_url, zval *errors, bool silent)
154+
static void *uri_parser_php_parse_url_parse(const char *uri_str, size_t uri_str_len, const void *base_url, zval *errors, bool silent)
155155
{
156156
bool has_port;
157157

@@ -163,27 +163,27 @@ static void *parse_url_parse_uri(const char *uri_str, size_t uri_str_len, const
163163
return url;
164164
}
165165

166-
static void parse_url_free_uri(void *uri)
166+
static void uri_parser_php_parse_url_free(void *uri)
167167
{
168168
php_url *parse_url_uri = uri;
169169

170170
php_url_free(parse_url_uri);
171171
}
172172

173-
const uri_parser_t parse_url_uri_parser = {
174-
.name = URI_PARSER_PHP,
175-
.parse_uri = parse_url_parse_uri,
173+
const uri_parser_t php_uri_parser_php_parse_url = {
174+
.name = PHP_URI_PARSER_PHP_PARSE_URL,
175+
.parse_uri = uri_parser_php_parse_url_parse,
176176
.clone_uri = NULL,
177177
.uri_to_string = NULL,
178-
.free_uri = parse_url_free_uri,
178+
.free_uri = uri_parser_php_parse_url_free,
179179
{
180-
.scheme = {.read_func = parse_url_read_scheme, .write_func = NULL},
181-
.username = {.read_func = parse_url_read_username, .write_func = NULL},
182-
.password = {.read_func = parse_url_read_password, .write_func = NULL},
183-
.host = {.read_func = parse_url_read_host, .write_func = NULL},
184-
.port = {.read_func = parse_url_read_port, .write_func = NULL},
185-
.path = {.read_func = parse_url_read_path, .write_func = NULL},
186-
.query = {.read_func = parse_url_read_query, .write_func = NULL},
187-
.fragment = {.read_func = parse_url_read_fragment, .write_func = NULL},
180+
.scheme = {.read_func = uri_parser_php_parse_url_scheme_read, .write_func = NULL},
181+
.username = {.read_func = uri_parser_php_parse_url_username_read, .write_func = NULL},
182+
.password = {.read_func = uri_parser_php_parse_url_password_read, .write_func = NULL},
183+
.host = {.read_func = uri_parser_php_parse_url_host_read, .write_func = NULL},
184+
.port = {.read_func = uri_parser_php_parse_url_port_read, .write_func = NULL},
185+
.path = {.read_func = uri_parser_php_parse_url_path_read, .write_func = NULL},
186+
.query = {.read_func = uri_parser_php_parse_url_query_read, .write_func = NULL},
187+
.fragment = {.read_func = uri_parser_php_parse_url_fragment_read, .write_func = NULL},
188188
}
189189
};

‎ext/uri/uri_parser_php_parse_url.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020

2121
#include "php_uri_common.h"
2222

23-
extern const uri_parser_t parse_url_uri_parser;
23+
extern const uri_parser_t php_uri_parser_php_parse_url;
2424

2525
#endif

0 commit comments

Comments
 (0)