Merge pull request #3 from Stephen-Seo/master

Fix bug where downloading a +2GB file over HTTPS fails at exactly 2GB
6 years ago · d740a7772d
parent b3eb9beb5e 4f1783339f
commit d740a7772d
2 changed files with 4 additions and 5 deletions
--- a/httpd.h
+++ b/httpd.h
@ -192,7 +192,7 @@ static void inline close_on_exec(int fd)
 #ifdef USE_SSL
 extern int ssl_read(struct REQUEST *req, char *buf, int len);
 extern int ssl_write(struct REQUEST *req, char *buf, int len);
-extern int ssl_blk_write(struct REQUEST *req, int offset, int len);
+extern int ssl_blk_write(struct REQUEST *req, off_t offset, size_t len);
 extern void init_ssl(void);
 extern void open_ssl_session(struct REQUEST *req);
 #endif
--- a/ssl.c
+++ b/ssl.c
@ -64,15 +64,14 @@ int ssl_write(struct REQUEST *req, char *buf, int len)
    return rc;
 }

-int ssl_blk_write(struct REQUEST *req, int offset, int len)
+int ssl_blk_write(struct REQUEST *req, off_t offset, size_t len)
 {
    int  rc;
    char buf[4096];

    if (lseek(req->bfd, offset, SEEK_SET) == -1) {
-	if (debug)
-	    perror("lseek");
-	return -1;
+        if (debug) perror("lseek");
+        return -1;
    }

    if (len > sizeof(buf))