lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-07-29 21:01:13 +03:00
Code Activity

Relaxed the ordering contraint on the URI matches.

Browse Source 
Solved by doing smart insertions.
This commit is contained in:
Thomas Davis
2013-09-01 01:45:46 -04:00
parent 8c547339e1
commit 031e2cd665
3 changed files with 60 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/embedded_cpp/embedded_cpp.cpp
View File

@ -40,6 +40,28 @@ public:
} }
}; };
class AHandler: public CivetHandler {
public:
bool handleGet(CivetServer *server, struct mg_connection *conn) {
mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
mg_printf(conn, "<html><body>");
mg_printf(conn, "<h2>This is the A handler!!!</h2>");
mg_printf(conn, "</body></html>\n");
return true;
}
};
class ABHandler: public CivetHandler {
public:
bool handleGet(CivetServer *server, struct mg_connection *conn) {
mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
mg_printf(conn, "<html><body>");
mg_printf(conn, "<h2>This is the AB handler!!!</h2>");
mg_printf(conn, "</body></html>\n");
return true;
}
};
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
const char * options[] = { "document_root", DOCUMENT_ROOT, const char * options[] = { "document_root", DOCUMENT_ROOT,
@ -49,6 +71,8 @@ int main(int argc, char *argv[]) {
server.addHandler(EXAMPLE_URI, new ExampleHandler()); server.addHandler(EXAMPLE_URI, new ExampleHandler());
server.addHandler(EXIT_URI, new ExitHandler()); server.addHandler(EXIT_URI, new ExitHandler());
server.addHandler("/a", new AHandler());
server.addHandler("/a/b", new ABHandler()); // going out of order with this to see if it will work.
printf("Browse files at http://localhost:%s/\n", PORT); printf("Browse files at http://localhost:%s/\n", PORT);
printf("Run example at http://localhost:%s%s\n", PORT, EXAMPLE_URI); printf("Run example at http://localhost:%s%s\n", PORT, EXAMPLE_URI);

8
include/civetweb.h
View File

@ -186,16 +186,10 @@ typedef int (* mg_request_handler)(struct mg_connection *conn, void *cbdata);
// Sets or removes a URI mapping for a request handler. // Sets or removes a URI mapping for a request handler.
// //
// URI's are ordered and prefixed URI's are supported. For example, // URI's are ordered and prefixed URI's are supported. For example,
// consider two URIs in order: // consider two URIs: /a/b and /a
// /a/b then /a
// /a matches /a // /a matches /a
// /a/b matches /a/b // /a/b matches /a/b
// /a/c matches /a // /a/c matches /a
// Reversing the order:
// /a then /a/b
// /a matches /a
// /a/b matches /a
// /a/c matches /a
// //
// Parameters: // Parameters:
// ctx: server context // ctx: server context

56
src/civetweb.c
View File

@ -4279,30 +4279,42 @@ static void redirect_to_https_port(struct mg_connection *conn, int ssl_index) {
void mg_set_request_handler(struct mg_context *ctx, const char *uri, mg_request_handler handler, void *cbdata) { void mg_set_request_handler(struct mg_context *ctx, const char *uri, mg_request_handler handler, void *cbdata) {
struct mg_request_handler_info *tmp_rh, *lastref = 0; struct mg_request_handler_info *tmp_rh, *lastref = 0;
size_t urilen = strlen(uri);
// first see it the uri exists // first see it the uri exists
for (tmp_rh = ctx->request_handlers; for (tmp_rh = ctx->request_handlers;
tmp_rh != NULL && strcmp(uri, tmp_rh->uri); tmp_rh != NULL && strcmp(uri, tmp_rh->uri);
lastref = tmp_rh, tmp_rh = tmp_rh->next) lastref = tmp_rh, tmp_rh = tmp_rh->next)
; {
// first try for an exact match
if (urilen == tmp_rh->uri_len && !strcmp(tmp_rh->uri,uri)) {
// already there...
if (tmp_rh != NULL) { if (handler != NULL) {
// already there... // change this entry
tmp_rh->handler = handler;
if (handler != NULL) { tmp_rh->cbdata = cbdata;
// change this entry } else {
tmp_rh->handler = handler; // remove this entry
tmp_rh->cbdata = cbdata; if (lastref != NULL)
} else { lastref->next = tmp_rh->next;
// remove this entry else
if (lastref != NULL) ctx->request_handlers = tmp_rh->next;
lastref->next = tmp_rh->next; free(tmp_rh->uri);
else free(tmp_rh);
ctx->request_handlers = tmp_rh->next; }
free(tmp_rh->uri); return;
free(tmp_rh); }
}
return; // next try for a partial match, we will accept uri/something
if (tmp_rh->uri_len < urilen
&& uri[tmp_rh->uri_len] == '/'
&& memcmp(tmp_rh->uri, uri, tmp_rh->uri_len) == 0) {
// if there is a partical match this new entry MUST go BEFORE
// the current position otherwise it will never be matched.
break;
}
} }
if (handler == NULL) { if (handler == NULL) {
@ -4315,12 +4327,14 @@ void mg_set_request_handler(struct mg_context *ctx, const char *uri, mg_request_
tmp_rh->uri_len = strlen(uri); tmp_rh->uri_len = strlen(uri);
tmp_rh->handler = handler; tmp_rh->handler = handler;
tmp_rh->cbdata = cbdata; tmp_rh->cbdata = cbdata;
tmp_rh->next = NULL;
if (lastref == NULL) if (lastref == NULL) {
tmp_rh->next = ctx->request_handlers;
ctx->request_handlers = tmp_rh; ctx->request_handlers = tmp_rh;
else } else {
tmp_rh->next = lastref->next;
lastref->next = tmp_rh; lastref->next = tmp_rh;
}
} }