Merge /u/hzeller/minidlna.fork/ branch master into master
https://sourceforge.net/p/minidlna/git/merge-requests/28/
This commit is contained in:
commit
b98d1b53ad
@ -1323,6 +1323,10 @@ send_file(struct upnphttp * h, int sendfd, off_t offset, off_t end_offset)
|
|||||||
else if( errno != EAGAIN )
|
else if( errno != EAGAIN )
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
else if( ret == 0 )
|
||||||
|
{
|
||||||
|
break; /* Premature end of file */
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//DPRINTF(E_DEBUG, L_HTTP, "sent %lld bytes to %d. offset is now %lld.\n", ret, h->socket, offset);
|
//DPRINTF(E_DEBUG, L_HTTP, "sent %lld bytes to %d. offset is now %lld.\n", ret, h->socket, offset);
|
||||||
@ -1343,6 +1347,10 @@ send_file(struct upnphttp * h, int sendfd, off_t offset, off_t end_offset)
|
|||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
else if( ret == 0 )
|
||||||
|
{
|
||||||
|
break; /* premature end of file */
|
||||||
|
}
|
||||||
ret = write(h->ev.fd, buf, ret);
|
ret = write(h->ev.fd, buf, ret);
|
||||||
if( ret == -1 ) {
|
if( ret == -1 ) {
|
||||||
DPRINTF(E_DEBUG, L_HTTP, "write error :: error no. %d [%s]\n", errno, strerror(errno));
|
DPRINTF(E_DEBUG, L_HTTP, "write error :: error no. %d [%s]\n", errno, strerror(errno));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user