VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 23:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the byterange code out of mod_file_cache's handler. That

Browse Source 
is completely in the core now.

Note that file handle caching is broken (nothing to do with
byte ranges).  mmap caches seem to work o.k.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86873 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2000-11-08 19:07:34 +00:00
parent c43a79fd20
commit 5d452728e4
1 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
modules/cache/mod_file_cache.c vendored
View File

@ -388,39 +388,21 @@ static int file_cache_xlat(request_rec *r)
}
static int mmap_handler(request_rec *r, a_file *file, int rangestatus)
static int mmap_handler(request_rec *r, a_file *file)
{
#if APR_HAS_MMAP
if (!rangestatus) {
ap_send_mmap (file->mm, r, 0, file->finfo.size);
}
else {
apr_size_t length;
apr_off_t offset;
while (ap_each_byterange(r, &offset, &length)) {
ap_send_mmap(file->mm, r, offset, length);
}
}
ap_send_mmap (file->mm, r, 0, file->finfo.size);
#endif
return OK;
}
static int sendfile_handler(request_rec *r, a_file *file, int rangestatus)
static int sendfile_handler(request_rec *r, a_file *file)
{
#if APR_HAS_SENDFILE
apr_size_t length, nbytes;
apr_off_t offset = 0;
apr_size_t nbytes;
apr_status_t rv = APR_EINIT;
if (!rangestatus) {
rv = ap_send_fd(file->file, r, 0, file->finfo.size, &nbytes);
}
else {
while (ap_each_byterange(r, &offset, &length)) {
if ((rv = ap_send_fd(file->file, r, offset, length, &nbytes)) != APR_SUCCESS)
break;
}
}
rv = ap_send_fd(file->file, r, 0, file->finfo.size, &nbytes);
if (rv != APR_SUCCESS) {
/* ap_send_fd will log the error */
return HTTP_INTERNAL_SERVER_ERROR;
@ -432,7 +414,7 @@ static int sendfile_handler(request_rec *r, a_file *file, int rangestatus)
static int file_cache_handler(request_rec *r)
{
a_file *match;
int rangestatus, errstatus;
int errstatus;
int rc = OK;
/* we don't handle anything but GET */
@ -462,15 +444,14 @@ static int file_cache_handler(request_rec *r)
}
ap_set_content_length(r, match->finfo.size);
rangestatus = ap_set_byterange(r);
ap_send_http_header(r);
/* Call appropriate handler */
if (!r->header_only) {
if (match->is_mmapped == TRUE)
rc = mmap_handler(r, match, rangestatus);
rc = mmap_handler(r, match);
else
rc = sendfile_handler(r, match, rangestatus);
rc = sendfile_handler(r, match);
}
return rc;