collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bugfix: the end matching length is 0.

Browse source
This commit is contained in:
Yuansheng 2019-07-20 06:41:18 +08:00
parent 577cfa0ccb
commit 0d70b8f5de
1 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/node.c
View file

@ -223,7 +223,7 @@ int r3_tree_compile_patterns(R3Node * n, char **errstr) {
free(n->combined_pattern); free(n->combined_pattern);
n->combined_pattern = cpat; n->combined_pattern = cpat;
const char *pcre_error = NULL; const char *pcre_error = NULL ;
int pcre_erroffset; int pcre_erroffset;
unsigned int option_bits = 0; unsigned int option_bits = 0;
@ -262,20 +262,8 @@ int r3_tree_compile_patterns(R3Node * n, char **errstr) {
} }
static R3Node * r3_tree_matchl_base(const R3Node * n, const char * path,
unsigned int path_len, match_entry * entry, int is_end) {
/**
* This function matches the URL path and return the left node
*
* r3_tree_matchl returns NULL when the path does not match. returns *node when the path matches.
*
* @param node n the root of the tree
* @param char* path the URL path to dispatch
* @param int path_len the length of the URL path.
* @param match_entry* entry match_entry is used for saving the captured dynamic strings from pcre result.
*/
R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_len, match_entry * entry) {
info("try matching: %s\n", path); info("try matching: %s\n", path);
R3Edge *e; R3Edge *e;
@ -334,8 +322,11 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l
if (entry) { if (entry) {
str_array_append(&entry->vars , path, pp - path); str_array_append(&entry->vars , path, pp - path);
} }
restlen = pp_end - pp;
return e->child && e->child->endpoint ? e->child : NULL; if (!restlen) {
return e->child && e->child->endpoint ? e->child : NULL;
}
return r3_tree_matchl_base(e->child, pp, restlen, entry, is_end);
} }
e++; e++;
@ -351,7 +342,7 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l
int ov[ n->ov_cnt ]; int ov[ n->ov_cnt ];
int rc; int rc;
info("pcre matching %s on %s\n", n->combined_pattern, path); info("pcre matching %s on [%s]\n", n->combined_pattern, path);
rc = pcre_exec( rc = pcre_exec(
n->pcre_pattern, /* the compiled pattern */ n->pcre_pattern, /* the compiled pattern */
@ -393,7 +384,7 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l
substring_length = *(inv+1) - *inv; substring_length = *(inv+1) - *inv;
// if it's not matched for this edge, just skip them quickly // if it's not matched for this edge, just skip them quickly
if ( !substring_length ) { if (!is_end && !substring_length) {
inv += 2; inv += 2;
continue; continue;
} }
@ -419,7 +410,7 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l
substring_length = *(inv+1) - *inv; substring_length = *(inv+1) - *inv;
// if it's not matched for this edge, just skip them quickly // if it's not matched for this edge, just skip them quickly
if ( !substring_length ) { if (!is_end && !substring_length) {
inv += 2; inv += 2;
continue; continue;
} }
@ -433,7 +424,7 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l
} }
// get the length of orginal string: $0 // get the length of orginal string: $0
return r3_tree_matchl( e->child, path + (ov[1] - ov[0]), restlen, entry); return r3_tree_matchl_base( e->child, path + (ov[1] - ov[0]), restlen, entry, is_end);
} }
// does not match // does not match
return NULL; return NULL;
@ -444,14 +435,34 @@ R3Node * r3_tree_matchl(const R3Node * n, const char * path, unsigned int path_l
if ((e = r3_node_find_edge_str(n, path, path_len))) { if ((e = r3_node_find_edge_str(n, path, path_len))) {
restlen = path_len - e->pattern.len; restlen = path_len - e->pattern.len;
if (!restlen) { if (!restlen) {
return e->child && e->child->endpoint ? e->child : NULL; if (is_end) {
return e->child && e->child->endpoint ? e->child : NULL;
}
is_end = 1;
} }
return r3_tree_matchl(e->child, path + e->pattern.len, restlen, entry); return r3_tree_matchl_base(e->child, path + e->pattern.len, restlen, entry, is_end);
} }
return NULL; return NULL;
} }
/**
* This function matches the URL path and return the left node
*
* r3_tree_matchl returns NULL when the path does not match. returns *node when the path matches.
*
* @param node n the root of the tree
* @param char* path the URL path to dispatch
* @param int path_len the length of the URL path.
* @param match_entry* entry match_entry is used for saving the captured dynamic strings from pcre result.
*/
R3Node * r3_tree_matchl(const R3Node * n, const char * path,
unsigned int path_len, match_entry * entry) {
return r3_tree_matchl_base(n, path, path_len, entry, 0);
}
R3Route * r3_tree_match_route(const R3Node *tree, match_entry * entry) { R3Route * r3_tree_match_route(const R3Node *tree, match_entry * entry) {
R3Node *n; R3Node *n;