Changeset 652d766e888968c4809a0101e9cca758fc88f521

Show
Ignore:
Timestamp:
09/27/09 03:04:22 (5 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1254020662 +0000
git-parent:

[6dce755701391df148a6d93e5c9cb138d73ee5c1]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1254020662 +0000
Message:

cleanup warning and handle an EVENTER_EXCEPTION, refs #34

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/noit_http.c

    r216024f r652d766  
    263263  req->current_request_chain = req->first_input; 
    264264  noitL(noit_debug, " noit_http_request_finalize : match(%d in %d)\n", 
    265         req->current_offset - req->current_input->start
    266         req->current_input->size); 
     265        (int)(req->current_offset - req->current_input->start)
     266        (int)req->current_input->size); 
    267267  if(req->current_offset < 
    268268     req->current_input->start + req->current_input->size) { 
     
    514514  struct bchain *in, *tofree; 
    515515  noitL(noit_debug, " ... noit_http_session_req_consume(%d) %d of %d\n", 
    516         ctx->conn.e->fd, len, 
    517         ctx->req.content_length - ctx->req.content_length_read); 
     516        ctx->conn.e->fd, (int)len, 
     517        (int)(ctx->req.content_length - ctx->req.content_length_read)); 
    518518  len = MIN(len, ctx->req.content_length - ctx->req.content_length_read); 
    519519  while(bytes_read < len) { 
     
    526526      ctx->req.content_length_read += partial_len; 
    527527      noitL(noit_debug, " ... filling %d bytes (read through %d/%d)\n", 
    528             bytes_read, ctx->req.content_length_read, ctx->req.content_length); 
     528            (int)bytes_read, (int)ctx->req.content_length_read, 
     529            (int)ctx->req.content_length); 
    529530      in->start += partial_len; 
    530531      in->size -= partial_len; 
     
    537538          ctx->req.last_input = NULL; 
    538539          noitL(noit_debug, " ... noit_http_session_req_consume = %d\n", 
    539                 bytes_read); 
     540                (int)bytes_read); 
    540541          return bytes_read; 
    541542        } 
     
    584585  int mask = origmask; 
    585586 
     587  if(origmask & EVENTER_EXCEPTION) 
     588    goto abort_drive; 
     589 
    586590  /* Drainage -- this is as nasty as it sounds  
    587591   * The last request could have unread upload content, we would have