diff options
Diffstat (limited to 'httpd.c')
| -rw-r--r-- | httpd.c | 36 |
1 files changed, 24 insertions, 12 deletions
@@ -279,6 +279,7 @@ void httpd_connection(FILE *f) xs *payload = NULL; xs *etag = NULL; xs *last_modified = NULL; + xs *link = NULL; int p_size = 0; const char *p; int fcgi_id; @@ -326,7 +327,7 @@ void httpd_connection(FILE *f) status = oauth_get_handler(req, q_path, &body, &b_size, &ctype); if (status == 0) - status = mastoapi_get_handler(req, q_path, &body, &b_size, &ctype); + status = mastoapi_get_handler(req, q_path, &body, &b_size, &ctype, &link); #endif /* NO_MASTODON_API */ if (status == 0) @@ -426,6 +427,8 @@ void httpd_connection(FILE *f) headers = xs_dict_append(headers, "etag", etag); if (!xs_is_null(last_modified)) headers = xs_dict_append(headers, "last-modified", last_modified); + if (!xs_is_null(link)) + headers = xs_dict_append(headers, "Link", link); /* if there are any additional headers, add them */ const xs_dict *more_headers = xs_dict_get(srv_config, "http_headers"); @@ -775,6 +778,26 @@ void httpd(void) xs *shm_name = NULL; sem_t anon_job_sem; xs *pidfile = xs_fmt("%s/server.pid", srv_basedir); + int pidfd; + + { + /* do some pidfile locking acrobatics */ + if ((pidfd = open(pidfile, O_RDWR | O_CREAT, 0660)) == -1) { + srv_log(xs_fmt("Cannot create pidfile %s -- cannot continue", pidfile)); + return; + } + + if (lockf(pidfd, F_TLOCK, 1) == -1) { + srv_log(xs_fmt("Cannot lock pidfile %s -- server already running?", pidfile)); + close(pidfd); + return; + } + + ftruncate(pidfd, 0); + + xs *s = xs_fmt("%d\n", (int)getpid()); + write(pidfd, s, strlen(s)); + } address = xs_dict_get(srv_config, "address"); @@ -810,17 +833,6 @@ void httpd(void) srv_log(xs_fmt("httpd%s start %s %s", p_state->use_fcgi ? " (FastCGI)" : "", full_address, USER_AGENT)); - { - FILE *f; - - if ((f = fopen(pidfile, "w")) != NULL) { - fprintf(f, "%d\n", getpid()); - fclose(f); - } - else - srv_log(xs_fmt("Cannot create %s: %s", pidfile, strerror(errno))); - } - /* show the number of usable file descriptors */ struct rlimit r; getrlimit(RLIMIT_NOFILE, &r); |