#include <time.h>
#include <strings.h>
#include <dirent.h>
-#include <stdint.h>
+#include <inttypes.h>
#include <libubox/blobmsg.h>
#include "uhttpd.h"
#include "mimetypes.h"
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+
static LIST_HEAD(index_files);
static LIST_HEAD(dispatch_handlers);
static LIST_HEAD(pending_requests);
static const char * uh_file_mktag(struct stat *s, char *buf, int len)
{
snprintf(buf, len, "\"%" PRIx64 "-%" PRIx64 "-%" PRIx64 "\"",
- s->st_ino, s->st_size, s->st_mtime);
+ s->st_ino, s->st_size, (uint64_t)s->st_mtime);
return buf;
}
if (fd < 0)
goto error;
+ req->disable_chunked = true;
cl->dispatch.file.hdr = tb;
uh_file_data(cl, pi, fd);
cl->dispatch.file.hdr = NULL;
dr = list_first_entry(&pending_requests, struct deferred_request, list);
list_del(&dr->list);
+ cl = dr->cl;
dr->called = true;
- uh_invoke_script(dr->cl, dr->d, dr->path ? &dr->pi : NULL);
+ cl->dispatch.data_blocked = false;
+ uh_invoke_script(cl, dr->d, dr->path ? &dr->pi : NULL);
+ client_poll_post_data(cl);
}
}
}
cl->dispatch.req_data = dr;
+ cl->dispatch.data_blocked = true;
dr->cl = cl;
dr->d = d;
list_add(&dr->list, &pending_requests);
return true;
}
+static char *uh_handle_alias(char *old_url)
+{
+ struct alias *alias;
+ static char *new_url;
+ static int url_len;
+
+ if (!list_empty(&conf.cgi_alias)) list_for_each_entry(alias, &conf.cgi_alias, list) {
+ int old_len;
+ int new_len;
+ int path_len = 0;
+
+ if (uh_path_match(alias->alias, old_url))
+ continue;
+
+ if (alias->path)
+ path_len = strlen(alias->path);
+
+ old_len = strlen(old_url) + 1;
+ new_len = old_len + MAX(conf.cgi_prefix_len, path_len);
+
+ if (new_len > url_len) {
+ new_url = realloc(new_url, new_len);
+ url_len = new_len;
+ }
+
+ *new_url = '\0';
+
+ if (alias->path)
+ strcpy(new_url, alias->path);
+ else if (conf.cgi_prefix)
+ strcpy(new_url, conf.cgi_prefix);
+ strcat(new_url, old_url);
+
+ return new_url;
+ }
+ return old_url;
+}
+
void uh_handle_request(struct client *cl)
{
struct http_request *req = &cl->request;
char *url = blobmsg_data(blob_data(cl->hdr.head));
char *error_handler;
+ url = uh_handle_alias(url);
+
req->redirect_status = 200;
d = dispatch_find(url, NULL);
if (d)