diff options
author | Wolfgang Draxinger <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2013-07-19 19:07:55 +0200 |
---|---|---|
committer | Wolfgang Draxinger <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2013-07-19 19:07:55 +0200 |
commit | 8f5ea60c40d61a1a99037eb5990ae0846f01b51b (patch) | |
tree | 8cf227422a67f206063e8197263a062cf9020118 | |
parent | d7bc8ce4c3a4a615502861d636758fad058aa066 (diff) | |
parent | 2ddf522804fd86083a2a3a4c1e9e28e4cac3d2d1 (diff) | |
download | litheweb-8f5ea60c40d61a1a99037eb5990ae0846f01b51b.tar.gz litheweb-8f5ea60c40d61a1a99037eb5990ae0846f01b51b.tar.bz2 |
Merge branch 'master' of mhzoctdev.maiman:/srv/git/mhzoct/picoweb
-rw-r--r-- | picohttp.c | 20 | ||||
-rw-r--r-- | picohttp.h | 1 |
2 files changed, 0 insertions, 21 deletions
@@ -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; } } @@ -121,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 { |