Skip to content

Implement followup for ext/uri #9

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

Draft
kocsismate wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Implement followup for ext/uri #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 1 addition & 29 deletions ext/lexbor/lexbor/url/url.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,6 @@
#define LXB_URL_BUFFER_SIZE 4096
#define LXB_URL_BUFFER_NUM_SIZE 128


typedef enum {
LXB_URL_MAP_UNDEF = 0x00,
LXB_URL_MAP_C0 = 0x01,
LXB_URL_MAP_FRAGMENT = 0x02,
LXB_URL_MAP_QUERY = 0x04,
LXB_URL_MAP_SPECIAL_QUERY = 0x08,
LXB_URL_MAP_PATH = 0x10,
LXB_URL_MAP_USERINFO = 0x20,
LXB_URL_MAP_COMPONENT = 0x40,
LXB_URL_MAP_X_WWW_FORM = 0x80,
LXB_URL_MAP_ALL = 0xff
}
lxb_url_map_type_t;

typedef enum {
LXB_URL_HOST_OPT_UNDEF = 0 << 0,
LXB_URL_HOST_OPT_NOT_SPECIAL = 1 << 0,
Expand Down Expand Up @@ -567,13 +552,6 @@ lxb_url_percent_encode_after_encoding(const lxb_char_t *data,
lxb_url_map_type_t enmap,
bool space_as_plus);

static lxb_status_t
lxb_url_percent_encode_after_utf_8(const lxb_char_t *data,
const lxb_char_t *end, lexbor_str_t *str,
lexbor_mraw_t *mraw,
lxb_url_map_type_t enmap,
bool space_as_plus);

static lxb_status_t
lxb_url_host_parse(lxb_url_parser_t *parser, const lxb_char_t *data,
const lxb_char_t *end, lxb_url_host_t *host,
Expand Down Expand Up @@ -860,12 +838,6 @@ lxb_url_is_url_codepoint(lxb_codepoint_t cp)
return lxb_url_codepoint_alphanumeric[(lxb_char_t) cp] != 0xFF;
}

lxb_inline bool
lxb_url_is_special(const lxb_url_t *url)
{
return url->scheme.type != LXB_URL_SCHEMEL_TYPE__UNKNOWN;
}

lxb_inline const lxb_url_scheme_data_t *
lxb_url_scheme_by_type(lxb_url_scheme_type_t type)
{
Expand Down Expand Up @@ -3259,7 +3231,7 @@ lxb_url_percent_encode_after_encoding(const lxb_char_t *data,
return LXB_STATUS_OK;
}

static lxb_status_t
lxb_status_t
lxb_url_percent_encode_after_utf_8(const lxb_char_t *data,
const lxb_char_t *end, lexbor_str_t *str,
lexbor_mraw_t *mraw,
Expand Down
28 changes: 28 additions & 0 deletions ext/lexbor/lexbor/url/url.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,33 @@ typedef struct {
}
lxb_url_search_params_t;

typedef enum {
LXB_URL_MAP_UNDEF = 0x00,
LXB_URL_MAP_C0 = 0x01,
LXB_URL_MAP_FRAGMENT = 0x02,
LXB_URL_MAP_QUERY = 0x04,
LXB_URL_MAP_SPECIAL_QUERY = 0x08,
LXB_URL_MAP_PATH = 0x10,
LXB_URL_MAP_USERINFO = 0x20,
LXB_URL_MAP_COMPONENT = 0x40,
LXB_URL_MAP_X_WWW_FORM = 0x80,
LXB_URL_MAP_ALL = 0xff
}
lxb_url_map_type_t;


typedef lexbor_action_t
(*lxb_url_search_params_match_f)(lxb_url_search_params_t *sp,
lxb_url_search_entry_t *entry, void *ctx);


LXB_API lxb_status_t
lxb_url_percent_encode_after_utf_8(const lxb_char_t *data,
const lxb_char_t *end, lexbor_str_t *str,
lexbor_mraw_t *mraw,
lxb_url_map_type_t enmap,
bool space_as_plus);

/*
* Create lxb_url_parser_t object.
*
Expand Down Expand Up @@ -773,6 +795,12 @@ lxb_url_scheme(const lxb_url_t *url)
return &url->scheme.name;
}

lxb_inline bool
lxb_url_is_special(const lxb_url_t *url)
{
return url->scheme.type != LXB_URL_SCHEMEL_TYPE__UNKNOWN;
}

lxb_inline const lexbor_str_t *
lxb_url_username(const lxb_url_t *url)
{
Expand Down
4 changes: 3 additions & 1 deletion ext/uri/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ PHP_ARG_WITH([external-uriparser],
PHP_INSTALL_HEADERS([ext/uri], m4_normalize([
php_uri.h
php_uri_common.h
php_uri_parser.h
php_uri_query.h
uri_parser_rfc3986.h
uri_parser_whatwg.h
uri_parser_php_parse_url.h
Expand Down Expand Up @@ -38,7 +40,7 @@ else
PHP_EVAL_INCLINE([$LIBURIPARSER_CFLAGS])
fi

PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c uri_parser_rfc3986.c uri_parser_whatwg.c uri_parser_php_parse_url.c $URIPARSER_SOURCES], [no],,[$URI_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c php_uri_parser.c php_uri_query.c uri_parser_rfc3986.c uri_parser_whatwg.c uri_parser_php_parse_url.c $URIPARSER_SOURCES], [no],,[$URI_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
PHP_ADD_EXTENSION_DEP(uri, lexbor)

if test "$PHP_EXTERNAL_URIPARSER" = "no"; then
Expand Down
Loading
Loading