remove unused fields and redundant check for HTTP method
This commit is contained in:
parent
6ec37625f8
commit
241449454f
1 changed files with 2 additions and 23 deletions
21
quark.c
21
quark.c
|
@ -32,45 +32,29 @@ char *argv0;
|
||||||
|
|
||||||
#undef MIN
|
#undef MIN
|
||||||
#define MIN(x,y) ((x) < (y) ? (x) : (y))
|
#define MIN(x,y) ((x) < (y) ? (x) : (y))
|
||||||
#undef MAX
|
|
||||||
#define MAX(x,y) ((x) > (y) ? (x) : (y))
|
|
||||||
|
|
||||||
#define TIMESTAMP_LEN 30
|
#define TIMESTAMP_LEN 30
|
||||||
|
|
||||||
enum req_field {
|
enum req_field {
|
||||||
REQ_HOST,
|
|
||||||
REQ_RANGE,
|
REQ_RANGE,
|
||||||
REQ_MOD,
|
REQ_MOD,
|
||||||
NUM_REQ_FIELDS,
|
NUM_REQ_FIELDS,
|
||||||
};
|
};
|
||||||
|
|
||||||
static char *req_field_str[] = {
|
static char *req_field_str[] = {
|
||||||
[REQ_HOST] = "Host",
|
|
||||||
[REQ_RANGE] = "Range",
|
[REQ_RANGE] = "Range",
|
||||||
[REQ_MOD] = "If-Modified-Since",
|
[REQ_MOD] = "If-Modified-Since",
|
||||||
};
|
};
|
||||||
|
|
||||||
enum req_method {
|
enum req_method {
|
||||||
M_OPTIONS,
|
|
||||||
M_GET,
|
M_GET,
|
||||||
M_HEAD,
|
M_HEAD,
|
||||||
M_POST,
|
|
||||||
M_PUT,
|
|
||||||
M_DELETE,
|
|
||||||
M_TRACE,
|
|
||||||
M_CONNECT,
|
|
||||||
NUM_REQ_METHODS,
|
NUM_REQ_METHODS,
|
||||||
};
|
};
|
||||||
|
|
||||||
static char *req_method_str[] = {
|
static char *req_method_str[] = {
|
||||||
[M_OPTIONS] = "OPTIONS",
|
|
||||||
[M_GET] = "GET",
|
[M_GET] = "GET",
|
||||||
[M_HEAD] = "HEAD",
|
[M_HEAD] = "HEAD",
|
||||||
[M_POST] = "POST",
|
|
||||||
[M_PUT] = "PUT",
|
|
||||||
[M_DELETE] = "DELETE",
|
|
||||||
[M_TRACE] = "TRACE",
|
|
||||||
[M_CONNECT] = "CONNECT",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct request {
|
struct request {
|
||||||
|
@ -519,11 +503,6 @@ sendresponse(int fd, struct request *r)
|
||||||
static char realtarget[PATH_MAX], tmptarget[PATH_MAX], t[TIMESTAMP_LEN];
|
static char realtarget[PATH_MAX], tmptarget[PATH_MAX], t[TIMESTAMP_LEN];
|
||||||
char *p, *q, *mime;
|
char *p, *q, *mime;
|
||||||
|
|
||||||
/* check method */
|
|
||||||
if (r->method != M_GET && r->method != M_HEAD) {
|
|
||||||
return sendstatus(fd, S_METHOD_NOT_ALLOWED);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* normalize target */
|
/* normalize target */
|
||||||
memcpy(realtarget, r->target, sizeof(realtarget));
|
memcpy(realtarget, r->target, sizeof(realtarget));
|
||||||
if (normabspath(realtarget)) {
|
if (normabspath(realtarget)) {
|
||||||
|
|
Loading…
Reference in a new issue