From 2ddf522804fd86083a2a3a4c1e9e28e4cac3d2d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Draxinger Date: Fri, 19 Jul 2013 19:07:22 +0200 Subject: read character history no longer required --- picohttp.c | 20 -------------------- picohttp.h | 12 ------------ 2 files changed, 32 deletions(-) diff --git a/picohttp.c b/picohttp.c index 7376fa1..0e6a360 100644 --- a/picohttp.c +++ b/picohttp.c @@ -295,8 +295,6 @@ int picohttpGetch(struct picohttpRequest * const req) } if( 0 <= (ch = picohttpIoGetch(req->ioops)) ) { - memmove(req->query.prev_ch + 1, req->query.prev_ch, 4); - req->query.prev_ch[0] = ch; req->received_octets++; } else { return ch; @@ -375,12 +373,6 @@ int picohttpRead(struct picohttpRequest * const req, size_t len, char * const bu } int r = picohttpIoRead(req->ioops, len, buf); - if( 5 < r ) { - memmove(req->query.prev_ch + r, req->query.prev_ch, 5-r); - memcpy(req->query.prev_ch, buf, r); - } else if (0 < r) { - memcpy(req->query.prev_ch, buf + len - 5, 5); - } if(req->query.transferencoding == PICOHTTP_CODING_CHUNKED ) { if( !req->query.chunklength <= req->received_octets ) { @@ -978,12 +970,6 @@ void picohttpProcessRequest ( } } - request.query.prev_ch[0] = '\n'; - request.query.prev_ch[1] = '\r'; - request.query.prev_ch[2] = - request.query.prev_ch[3] = - request.query.prev_ch[4] = 0; - request.status = PICOHTTP_STATUS_200_OK; request.route->handler(&request); @@ -1345,12 +1331,6 @@ int picohttpMultipartNext( mp->in_boundary = mp->replayhead = 0; - mp->req->query.prev_ch[0] = '\n'; - mp->req->query.prev_ch[1] = '\r'; - mp->req->query.prev_ch[2] = - mp->req->query.prev_ch[3] = - mp->req->query.prev_ch[4] = 0; - return 0; } } diff --git a/picohttp.h b/picohttp.h index 7f6e65a..644761f 100644 --- a/picohttp.h +++ b/picohttp.h @@ -103,17 +103,6 @@ struct picohttpDateTime { unsigned int s:5; /* seconds / 2 */ }; -#define PICOHTTP_EPOCH_YEAR 1980 - -struct picohttpDateTime { - unsigned int Y:7; /* EPOCH + 127 years */ - unsigned int M:4; - unsigned int D:5; - unsigned int h:5; - unsigned int m:6; - unsigned int s:5; /* seconds / 2 */ -}; - struct picohttpRequest { struct picohttpIoOps const * ioops; struct picohttpURLRoute const * route; @@ -132,7 +121,6 @@ struct picohttpRequest { uint8_t contentencoding; uint8_t transferencoding; unsigned char multipartboundary[PICOHTTP_MULTIPARTBOUNDARY_MAX_LEN+1]; - unsigned char prev_ch[5]; size_t chunklength; } query; struct { -- cgit v1.2.3