mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 06:38:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "nhttpd: let sendfile() support files >= 2GB"

Browse Source 
This reverts commit 9842afecad8dfb91dfd7221aedbeaf5379a89534.


Origin commit data
------------------
Branch: ni/coolstream
Commit: cf0bf3fa20
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2014-08-17 15:15:22 +02:00
committed by [CST] Focus
parent 29d571c988
commit 56f7daa01a
9 changed files with 34 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/nhttpd/yhttpd_core/ysocket.cpp
View File

@@ -12,7 +12,6 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <errno.h>
#include <signal.h>
#include <unistd.h>
@@ -317,40 +316,25 @@ int CySocket::SendFile(int filed) {
#ifdef Y_CONFIG_HAVE_SENDFILE
// does not work with SSL !!!
off_t start = 0;
struct stat st;
fstat(filed, &st);
size_t end = st.st_size;
off_t written = 0;
off_t left = end;
while (left > 0) {
// Split sendfile() transfer to smaller chunks to reduce memory-mapping requirements --martii
if((written = ::sendfile(sock,filed,&start,0x8000000)) == -1) {
perror("sendfile failed");
if (errno != EINVAL)
return false;
break;
} else {
BytesSend += written;
left -= written;
off_t end = lseek(filed,0,SEEK_END);
int written = 0;
if((written = ::sendfile(sock,filed,&start,end)) == -1)
{
perror("sendfile failed\n");
return false;
}
else
BytesSend += written;
#else
char sbuf[1024];
unsigned int r = 0;
while ((r = read(filed, sbuf, 1024)) > 0) {
if (Send(sbuf, r) < 0) {
perror("sendfile failed\n");
return false;
}
}
if (left) {
::lseek(filed, start, SEEK_SET);
#endif // Y_CONFIG_HAVE_SENDFILE
char sbuf[65536];
int r;
while ((r = read(filed, sbuf, 65536)) > 0) {
if (Send(sbuf, r) < 0) {
perror("send failed");
return false;
}
BytesSend += written;
}
#ifdef Y_CONFIG_HAVE_SENDFILE
}
#endif // Y_CONFIG_HAVE_SENDFILE
log_level_printf(9, "<Sock:SendFile>: Bytes:%ld\n", BytesSend);
return true;
}