Overview
| Comment: | Additional improvements |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | a00671c11b190935089c7fd3c02ed52f62d1e77a |
| User & Date: | rkeene on 2014-02-05 09:04:11 |
| Other Links: | manifest | tags |
Context
|
2014-02-05
| ||
| 09:06 | Reverted default port changed inadvertantly and added comments check-in: 69c6325220 user: rkeene tags: trunk | |
| 09:04 | Additional improvements check-in: a00671c11b user: rkeene tags: trunk | |
| 09:01 | Added support for a "no logging" compile-time option (for now) and updated to support sendfile restarts check-in: c7e703e4e5 user: rkeene tags: trunk | |
Changes
Modified filed.c from [f27d202156] to [980ea4ded8].
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 ... 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 ... 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 |
lseek(fd, 0, SEEK_SET); cache->fd = fd; cache->len = len; cache->path = strdup(path); /* XXX:TODO: Determine */ cache->type = "text/plain"; cache->lastmod = filed_format_time(cache->lastmod_b, sizeof(cache->lastmod_b), time(NULL) - 30); } else { filed_log_msg_debug("Cache hit for idx: %lu: PATH \"%s\"", (unsigned long) cache_idx, path); } /* * We have to make a duplicate FD, because once we release the cache ................................................................................ } return(path); } /* Return an error page */ static void filed_error_page(FILE *fp, const char *date_current, int error_number) { char *error_string = "ERROR"; fprintf(fp, "HTTP/1.1 %i OK\r\nDate: %s\r\nServer: filed\r\nLast-Modified: %s\r\nContent-Length: %llu\r\nContent-Type: %s\r\nConnection: close\r\n\r\n%s", error_number, date_current, date_current, (unsigned long long) strlen(error_string), "text/html", ................................................................................ /* Reset failure count*/ failure_count = 0; /* Handle socket */ filed_handle_client(fd); } /* XXX:TODO: Report error */ return(NULL); } /* Create worker threads */ static int filed_worker_threads_init(int fd, int thread_count) { struct filed_worker_thread_args *arg; pthread_t threadid; |
| | | > > |
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 ... 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 ... 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 |
lseek(fd, 0, SEEK_SET); cache->fd = fd; cache->len = len; cache->path = strdup(path); /* XXX:TODO: Determine */ cache->type = "application/octet-stream"; cache->lastmod = filed_format_time(cache->lastmod_b, sizeof(cache->lastmod_b), time(NULL) - 30); } else { filed_log_msg_debug("Cache hit for idx: %lu: PATH \"%s\"", (unsigned long) cache_idx, path); } /* * We have to make a duplicate FD, because once we release the cache ................................................................................ } return(path); } /* Return an error page */ static void filed_error_page(FILE *fp, const char *date_current, int error_number) { char *error_string = "<html><head><title>ERROR</title></head><body>Unable to process request</body></html>"; fprintf(fp, "HTTP/1.1 %i OK\r\nDate: %s\r\nServer: filed\r\nLast-Modified: %s\r\nContent-Length: %llu\r\nContent-Type: %s\r\nConnection: close\r\n\r\n%s", error_number, date_current, date_current, (unsigned long long) strlen(error_string), "text/html", ................................................................................ /* Reset failure count*/ failure_count = 0; /* Handle socket */ filed_handle_client(fd); } /* Report error */ filed_log_msg("THREAD_DIED ABNORMAL"); return(NULL); } /* Create worker threads */ static int filed_worker_threads_init(int fd, int thread_count) { struct filed_worker_thread_args *arg; pthread_t threadid; |