mirror/darkhttpd
1
0
Fork 0
mirror of https://github.com/emikulic/darkhttpd.git synced 2023-08-10 21:13:08 +03:00
Code Issues Projects Releases Wiki Activity

More longlong fixes.

Browse Source
This commit is contained in:
Emil Mikulic 2010-11-25 01:43:51 +11:00
parent 63bdabd79f
commit 3cc77c31d6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
darkhttpd.c
View File

@ -1955,14 +1955,14 @@ static void process_get(struct connection *conn)
"Date: %s\r\n" "Date: %s\r\n"
"Server: %s\r\n" "Server: %s\r\n"
"%s" /* keep-alive */ "%s" /* keep-alive */
"Content-Length: %d\r\n" "Content-Length: %lld\r\n"
"Content-Range: bytes %lld-%lld/%lld\r\n" "Content-Range: bytes %lld-%lld/%lld\r\n"
"Content-Type: %s\r\n" "Content-Type: %s\r\n"
"Last-Modified: %s\r\n" "Last-Modified: %s\r\n"
"\r\n" "\r\n"
, ,
rfc1123_date(date, now), pkgname, keep_alive(conn), rfc1123_date(date, now), pkgname, keep_alive(conn),
conn->reply_length, (long long)from, (long long)to, (long long)conn->reply_length, (long long)from, (long long)to,
(long long)filestat.st_size, (long long)filestat.st_size,
mimetype, lastmod mimetype, lastmod
); );
@ -2237,18 +2237,18 @@ static void poll_send_reply(struct connection *conn)
{ {
errno = 0; errno = 0;
sent = send_from_file(conn->socket, conn->reply_fd, sent = send_from_file(conn->socket, conn->reply_fd,
(off_t)(conn->reply_start + conn->reply_sent), conn->reply_start + conn->reply_sent,
conn->reply_length - conn->reply_sent); conn->reply_length - conn->reply_sent);
if (debug && (sent < 1)) if (debug && (sent < 1))
printf("send_from_file returned %lld (errno=%d %s)\n", printf("send_from_file returned %lld (errno=%d %s)\n",
(long long)sent, errno, strerror(errno)); (long long)sent, errno, strerror(errno));
} }
conn->last_active = now; conn->last_active = now;
if (debug) printf("poll_send_reply(%d) sent %d: %d+[%d-%d] of %d\n", if (debug) printf("poll_send_reply(%d) sent %d: %lld+[%lld-%lld] of %lld\n",
conn->socket, (int)sent, (int)conn->reply_start, conn->socket, (int)sent, (long long)conn->reply_start,
(int)conn->reply_sent, (long long)conn->reply_sent,
(int)(conn->reply_sent + sent - 1), (long long)(conn->reply_sent + sent - 1),
(int)conn->reply_length); (long long)conn->reply_length);
/* handle any errors (-1) or closure (0) in send() */ /* handle any errors (-1) or closure (0) in send() */
if (sent < 1) if (sent < 1)
@ -2270,8 +2270,8 @@ static void poll_send_reply(struct connection *conn)
conn->state = DONE; conn->state = DONE;
return; return;
} }
conn->reply_sent += (unsigned int)sent; conn->reply_sent += sent;
conn->total_sent += (unsigned int)sent; conn->total_sent += sent;
total_out += sent; total_out += sent;
/* check if we're done sending */ /* check if we're done sending */