aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Add flag to run in the foregroundgentooWolfgang Müller2023-10-12-4/+12
| | | | | | | | | | | | | | | | | slowcgi already has the -d flag to disable forking, but that particular flag also stops slowcgi from logging to syslog and is intended for debugging purposes. Ordinarily this would be fine, but sadly we know of no clean way to track the PID of a forked process with Gentoo's OpenRC and its start-stop-daemon(8). We could add support to write a pidfile instead, but since we want to support multiple invocations of slowcgi through OpenRC and ${RC_SVCNAME}, we need a way of specifying the pidfile location in the init script itself. To solve this reasonably cleanly, add a flag that *only* controls whether or not the program daemonizes or not. Make sure to mention this in the manual too.
* zap extra space in usage added by mistake in last commit.HEAD7.3upstreammasterop2023-10-12-2/+2
|
* add a -t flag to change the request timeoutop2023-10-12-7/+101
| | | | | original diff from Alfred Morgan (alfred [at] 54 dot org) ok florian@ and manpage tweaks by me.
* list -v with -d in SYNOPSIS, instead of seperately, and add -v to usage();7.0jmc2021-09-08-5/+4
|
* Stop sending debug logging to syslog (which would then drop it on the floor) ↵florian2021-09-08-9/+17
| | | | all the time. Instead debug logging must be requested with the new -v flag. Problem reported and fix provided by weerd@
* Revert "Do not send debug messages to syslog by default"Wolfgang Müller2021-09-08-3/+0
| | | | | This reverts commit bc9f2d8687625b7eafd70b9afba9fa71983a640a to make way for the patch that has been accepted upstream.
* Use LIST instead of SLIST for requests. The way SLIST_REMOVE was used did a ↵6.9claudio2021-05-27-33/+8
| | | | double traverse of the list which now is replaced with no traversal at all. Also stop double wrapping requests just for the list. OK millert@
* Ignore SIGPIPE by default and restore default behaviour before executing the ↵claudio2021-05-27-8/+4
| | | | CGI. OK bluhm@ florian@
* accept_reserve() counter function argument doesn't need to be volatile. ↵millert2021-05-27-4/+3
| | | | Revision 1.21 removed the volatile from the cgi_inflight global but accept_reserve() was not updated to match. OK florian@
* Add .mailmap for consistencyWolfgang Müller2021-05-04-0/+1
|
* Do not send debug messages to syslog by default6.8.1Wynn Wolf Arbor2021-01-26-0/+3
| | | | | | | | | | | | | | | | | | | This partially reverts 56691b1 (Allow specifying -d multiple times, 2020-05-11). In that commit, a check for the debug variable in syslog_debug was removed because a debug level of > 0 would have slowcgi log to the console instead of syslog, making the check pointless. However, this also means that slowcgi will now print debug messages by default, even if run without the '-d' flag. The commit messages states that the syslog daemon should handle debug output instead. We feel that this is unsound reasoning, and that it goes against a de-facto standard seen in the wild so far: only issue debug output (whether to console or not), if specifically asked for. Therefore, reintroduce the check for the debug variable. Whilst this will in fact make the whole syslog_debug method pointless, we do not want to commit to a complete rewrite of the debug functionality at this time (even if such an undertaking is, in our opinion, warranted).
* Have getdtablecount() return the right number of file descriptors6.8Wynn Wolf Arbor2021-01-17-1/+2
| | | | | | | | | | | To find the number of file descriptors that the process has currently open, getdtablecount() counts the number of files under '/proc/self/fd'. Previously, the special directories '.' and '..' were counted alongside any symbolic links, making getdtablecount() return the wrong number of file descriptors. Make sure that these special directories are ignored by only counting files whose name consists entirely of digits.
* Allow specifying -d multiple times. Only print the fcgi header data if debug ↵claudio2020-05-24-7/+4
| | | | > 1 (-dd) since it adds a lot of noise to the output. In syslog_debug do not check for the debug variable instead let syslog handle it. Currently syslog_debug() would never print anything since it is only called with debug = 0 (debug > 0 implies the console logger). OK florian@
* Just a bit of KNF. OK florian@claudio2020-05-24-4/+4
|
* Add gitignore6.7Wynn Wolf Arbor2020-05-24-0/+3
|
* Use -1 instead of WAIT_ANYWynn Wolf Arbor2020-05-24-1/+1
| | | | | This change is needed to build slowcgi(8) successfully on musl-based systems, as the musl libc does not define WAIT_ANY.
* Convert MakefileWynn Wolf Arbor2020-05-24-13/+30
|
* Add getdtablecount(2)Wynn Wolf Arbor2020-05-24-0/+33
| | | | This was taken from https://github.com/Duncaen/lobase
* Include grp.hWynn Wolf Arbor2020-05-24-0/+1
| | | | This is needed for setgroups(2)
* Add queue.h from OpenBSDWynn Wolf Arbor2020-05-24-1/+536
| | | | | The original file location in the OpenBSD tree - sys/sys/queue.h
* Add strlcpy(3) from OpenBSDWynn Wolf Arbor2020-05-24-0/+62
| | | | | The original file location in the OpenBSD tree - lib/libc/string/strlcpy.c
* Use pledge(2) only on OpenBSDWynn Wolf Arbor2020-05-24-0/+4
|
* Use corresponding attributes for __packed and __deadWynn Wolf Arbor2020-05-24-0/+8
|
* When calculating the fd limit before accepting a new connection also account ↵claudio2020-05-24-2/+2
| | | | for the inflight fds caused by the new connection. Without this slowcgi could fail when close to the limit because FD_RESERVE is smaller then FD_NEEDED. OK florian@, tested by Kristaps Dzonsons
* Call daemon with 0 as first argument so that it changes the cwd to /. It is ↵florian2020-05-24-2/+2
| | | | not a problem in slowcgi since it calls chroot(2) and then chdir(2) shortly afterwards but hopefully prevents copying code into daemons where it does matter. Problem first observed by dlg in ntpd(8) which keeps sitting in the directory from where it was started which might for example prevent an unmount. Discussed with deraadt@
* Make the owner of fcgi socket configurable.florian2020-05-24-8/+21
| | | | | | | | | | Andrew Daugherity (andrew.daugherity AT gmail) pointed out that this is helpful for his port to linux. For example on openSUSE nginx and Apache run as different users so a compile time default user won't cut it. Man page tweaks jmc@ While here, consistently log users at debug level; from Andrew.
* Clarify that we chroot to the users home directory if -u is provided. ↵florian2020-05-24-3/+7
| | | | Pointed out by Andrew Daugherity (andrew.daugherity AT gmail), thanks! Tweaks and OK jmc
* add missing HISTORY; based on CVS logs and release announcementsschwarze2020-05-24-2/+9
|
* consistently use the evtimer wrappers around the connection timeout.florian2020-05-24-3/+3
| | | | | | | | | this is instead of setting the timeout up with event_set and event_add, but removing it with evtimer_del. this uses evtimer_set and evtimer_add. prompted by dlg's commit to identd OK dlg
* Sync the severity of the syslog_* functions shared between identd, slowcgi, ↵florian2020-05-24-5/+5
| | | | | | tftp-proxy and tftpd to the severity used in log.c style loggers. This also fixes an issue where syslog_err and syslog_errx logged with different severities. Sure deraadt@
* Add format attribute to logger functions. Fix format string while here. ↵florian2020-05-24-15/+28
| | | | Input & OK benno@
* As suggested by the FastCGI spec, zero-pad the response buffers to be ↵reyk2020-05-24-3/+22
| | | | | | aligned to 8 bytes. This matches what most other implementations are doing. While here, make sure that the allocated response buffers are zero'ed out. OK florian@
* typo in error message: to -> tootb@openbsd.org2020-05-24-2/+2
| | | | ok florian@
* pledge(2) for slowcgi. After initialization slowcgi accepts from a AF_UNIX ↵florian2020-05-24-1/+6
| | | | socket, forks and execs. After fork we only need to close(2), chdir(2) and exec. OK benno@
* re-shuffle slowcgi_listen to run less code as root. OK benno@florian2020-05-24-15/+16
|
* Output the contents of the environment in debug mode which is most helpful ↵millert2020-05-24-1/+2
| | | | in debugging interactions between httpd and slowcgi. OK florian@
* Clean up includes, while here fix a white space which lead to a false ↵florian2020-05-24-5/+5
| | | | positive during grep'ing. OK reyk
* The kernel doesn't actually care what a sockaddr's sa_len is on input, so ↵guenther2020-05-24-5/+3
| | | | | | don't waste code setting it improvment and ok florian@
* Replace <sys/param.h> with <limits.h> and other less dirty headers where ↵deraadt2020-05-24-4/+5
| | | | possible. Annotate <sys/param.h> lines with their current reasons. Switch to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where sensible to avoid pulling in the pollution. These are the files confirmed through binary verification. ok guenther, millert, doug (helped with the verification protocol)
* read(2) returns ssize_t, not size_tblambert2020-05-24-2/+3
| | | | ok florian@
* enable warningsflorian2020-05-24-1/+6
|
* Bail out if the buffer is too small to contain the length of a parameter ↵florian2020-05-24-4/+4
| | | | value. Found while investigating a dead store pointed out by llvm scan-build.
* dead stores; pointed out by llvm scan-build; no binary changeflorian2020-05-24-5/+1
|
* pause shadows global; pointed out by gcc; no binary changeflorian2020-05-24-5/+5
|
* mode is unused; pointed out by gcc; no binary changeflorian2020-05-24-2/+2
|
* declare lerr and lerrx __dead; unconfuses llvm scan-buildflorian2020-05-24-12/+12
|
* Instead of doing the fcntl(2) and ioctl(2) song and dance just tell ↵florian2020-05-24-11/+5
| | | | socket(2) and accept4(2) that we want non-blocking-close-on-exec sockets. OK benno@
* fix previous, and add a SEE ALSO section for httpd;jmc2020-05-24-5/+5
|
* remove nginx referencesrobert2020-05-24-5/+2
|
* Use lerrx instead of errx since the logging subsystem is already ↵claudio2020-05-24-3/+3
| | | | initialized. OK florian@
powered by cgit and git | oriole.systems | how to verify signatures