OpenBSD CVS

CVS log for src/usr.sbin/httpd/config.c


[BACK] Up to [local] / src / usr.sbin / httpd

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.65 / (download) - annotate - [select for diffs], Wed Jan 17 08:22:40 2024 UTC (4 months, 3 weeks ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, HEAD
Changes since 1.64: +10 -7 lines
Diff to previous 1.64 (colored)

Convert to use imsg_get_fd() since proc_forward_imsg() never forwards a
file descriptor just use -1 there.
OK tb@

Revision 1.64 / (download) - annotate - [select for diffs], Wed Jan 17 08:20:58 2024 UTC (4 months, 3 weeks ago) by claudio
Branch: MAIN
Changes since 1.63: +9 -9 lines
Diff to previous 1.63 (colored)

Get all variable-length values for the parent server before linking the
server onto various list. Fixes a use-after-free if former fails.
OK tb@

Revision 1.63 / (download) - annotate - [select for diffs], Wed Dec 28 21:30:16 2022 UTC (17 months, 1 week ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.62: +2 -2 lines
Diff to previous 1.62 (colored)

spelling fixes; from paul tagliamonte
any parts of his diff not taken are noted on tech

Revision 1.62 / (download) - annotate - [select for diffs], Sun Oct 24 16:01:04 2021 UTC (2 years, 7 months ago) by ian
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.61: +8 -1 lines
Diff to previous 1.61 (colored)

Add httpd custom error page facility. Adapted by me from
https://github.com/mpfr/httpd-plus.
Improvements from & (earlier version) reads fine to tracey@;
improvements & OK this version benno@, florian@. Thanks.

Revision 1.61 / (download) - annotate - [select for diffs], Mon Sep 21 09:42:07 2020 UTC (3 years, 8 months ago) by tobhe
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.60: +3 -1 lines
Diff to previous 1.60 (colored)

Fix memory leak in "iov".

ok jca@

Revision 1.60 / (download) - annotate - [select for diffs], Wed Aug 26 06:50:20 2020 UTC (3 years, 9 months ago) by florian
Branch: MAIN
Changes since 1.59: +1 -15 lines
Diff to previous 1.59 (colored)

Set fastcgi socket default on server and location.
This allows "fastcgi" directly inside of a server directive without
giving specifying socket.
OK tracey

Revision 1.59 / (download) - annotate - [select for diffs], Mon Aug 24 15:49:10 2020 UTC (3 years, 9 months ago) by tracey
Branch: MAIN
Changes since 1.58: +12 -3 lines
Diff to previous 1.58 (colored)

Add support for non-localhost fastcgi sockets.

Lots of review time kn@
Lots of review time, tweaks, and ok florian@

Revision 1.58 / (download) - annotate - [select for diffs], Mon Aug 3 10:55:58 2020 UTC (3 years, 10 months ago) by benno
Branch: MAIN
Changes since 1.57: +1 -6 lines
Diff to previous 1.57 (colored)

remove dead assignments
from Ross L Richardson <openbsd AT rlr DOT id DOT au>, Thanks
ok claudio@

Revision 1.57 / (download) - annotate - [select for diffs], Wed May 8 19:57:45 2019 UTC (5 years, 1 month ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.56: +3 -3 lines
Diff to previous 1.56 (colored)

spacing

Revision 1.56 / (download) - annotate - [select for diffs], Tue Feb 19 11:37:26 2019 UTC (5 years, 3 months ago) by pirofti
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.55: +100 -1 lines
Diff to previous 1.55 (colored)

httpd(8): add support for setting custom FastCGI parameters.

This commit extends the existing grammar by adding the param option
to the fastcgi directive: fastcgi param name value.

Example usage:
  fastcgi param VAR1 hello
  fastcgi param VAR2 world

With help and OK florian@
Rogue manpage bits, feel free to modify them.

Revision 1.55 / (download) - annotate - [select for diffs], Wed Jun 20 16:43:05 2018 UTC (5 years, 11 months ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.54: +8 -1 lines
Diff to previous 1.54 (colored)

Add support for simple one-off internal rewrites.

For example:

	location match "/page/(%d+)/.*" {
		request rewrite "/static/index.php?id=%1&$QUERY_STRING"
	}

Requested by many.

Ok benno@

Revision 1.54 / (download) - annotate - [select for diffs], Sat May 19 13:56:56 2018 UTC (6 years ago) by jsing
Branch: MAIN
Changes since 1.53: +22 -1 lines
Diff to previous 1.53 (colored)

Add support for client certificate authentication to httpd.

From Jack Burton <jack at saosce dot com dot au> - thanks!

Also tested by Jan Klemkow <j.klemkow at wemelug dot de>.

ok beck@ reyk@

Revision 1.53 / (download) - annotate - [select for diffs], Wed Jul 19 17:36:25 2017 UTC (6 years, 10 months ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.52: +117 -83 lines
Diff to previous 1.52 (colored)

Rework the way that TLS configuration is sent/received via imsgs, so that
are no longer limited by the 16KB maximum size of a single imsg.
Configuration data that is larger than a single message is now chunked and
sent via multiple imsgs.

Prompted by a diff from Jack Burton <jack at saosce dot com dot au>.

ok reyk@

Revision 1.52 / (download) - annotate - [select for diffs], Sun May 28 10:37:26 2017 UTC (7 years ago) by benno
Branch: MAIN
Changes since 1.51: +4 -4 lines
Diff to previous 1.51 (colored)

use __func__ in log messages.
From Hiltjo Posthuma hiltjo -AT codemadness -DOT- org, thanks!
ok florian, claudio

Revision 1.51 / (download) - annotate - [select for diffs], Sat Mar 25 17:25:34 2017 UTC (7 years, 2 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.50: +5 -1 lines
Diff to previous 1.50 (colored)

Implement TLS ticket support in httpd. Off by default. Use
	tls ticket lifetime default
to turn it on with a 2h ticket lifetime.
Rekeying happens after a quarter of that time.
OK reky@ and bob@

Revision 1.50 / (download) - annotate - [select for diffs], Sun Nov 6 10:49:38 2016 UTC (7 years, 7 months ago) by beck
Branch: MAIN
Changes since 1.49: +32 -2 lines
Diff to previous 1.49 (colored)

Add OCSP stapling support to httpd
ok jsing@ bcook@

Revision 1.49 / (download) - annotate - [select for diffs], Wed Oct 12 10:57:30 2016 UTC (7 years, 7 months ago) by reyk
Branch: MAIN
Changes since 1.48: +15 -1 lines
Diff to previous 1.48 (colored)

Prevent fd exhaustion in the parent when loading the listening server
sockets by sending the fd one-by-one.  This allows to start httpd with
max 32 server instances and many server sockets without changing the
default rlimits in any way.

OK rzalamena@

Revision 1.48 / (download) - annotate - [select for diffs], Thu Sep 1 16:07:55 2016 UTC (7 years, 9 months ago) by reyk
Branch: MAIN
Changes since 1.47: +6 -7 lines
Diff to previous 1.47 (colored)

The fork+exec diff broke "what?!", the ps_what field determines the
configuration that has to be initialized in each process and was
inherited from the parent instead of setting it everywhere.  I'm
surprised that it worked.

OK florian

Revision 1.47 / (download) - annotate - [select for diffs], Mon Aug 15 14:14:55 2016 UTC (7 years, 9 months ago) by jsing
Branch: MAIN
Changes since 1.46: +5 -5 lines
Diff to previous 1.46 (colored)

Use lowercase 'tls' in debug and log messages for consistency.

Requested by reyk@

Revision 1.46 / (download) - annotate - [select for diffs], Tue May 31 15:28:08 2016 UTC (8 years ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.45: +2 -2 lines
Diff to previous 1.45 (colored)

Unbreak compilation with -DDEBUG.

From Fabian Raetz <fabian dot raetz at gmail dot com>

Revision 1.45 / (download) - annotate - [select for diffs], Thu Apr 28 14:20:11 2016 UTC (8 years, 1 month ago) by jsing
Branch: MAIN
Changes since 1.44: +27 -32 lines
Diff to previous 1.44 (colored)

Simplify TLS configuration handling. Instead of matching by address/port,
match by configuration ID. This also prevents a memory leak when there are
multiple certificates specified for the same server.

ok beck@

Revision 1.44 / (download) - annotate - [select for diffs], Wed Dec 2 15:13:00 2015 UTC (8 years, 6 months ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.43: +10 -14 lines
Diff to previous 1.43 (colored)

sync with relayd, use proc_compose()

Revision 1.43 / (download) - annotate - [select for diffs], Thu Aug 20 13:00:23 2015 UTC (8 years, 9 months ago) by reyk
Branch: MAIN
Changes since 1.42: +16 -16 lines
Diff to previous 1.42 (colored)

Change httpd(8) to use C99-style fixed-width integers (uintN_t instead
of u_intN_t) and replace u_int with unsigned int.  Mixing both
variants is a bad style and most contributors seem to prefer this
style; it also helps us to get used to it, portability, and
standardization.

Theoretically no binary change, except one in practice: httpd.o has a
different checksum because gcc with -O2 pads/optimizes "struct
privsep" differently when using "unsigned int" instead "u_int" for the
affected members.  "u_int" is just a typedef of "unsigned int", -O0
doesn't build the difference and clang with -O2 doesn't do it either -
it is just another curiosity from gcc-land.

OK semarie@

Revision 1.42 / (download) - annotate - [select for diffs], Sun Jul 19 05:17:27 2015 UTC (8 years, 10 months ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8
Changes since 1.41: +2 -2 lines
Diff to previous 1.41 (colored)

For the completeness of HSTS, add the non-standard preload option.

OK florian@

Revision 1.41 / (download) - annotate - [select for diffs], Sat Jul 18 06:00:43 2015 UTC (8 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.40: +8 -1 lines
Diff to previous 1.40 (colored)

Allow to change the default media type globally or per-location,
eg. default type text/html.

OK florian@

Revision 1.40 / (download) - annotate - [select for diffs], Sat Jul 18 05:41:18 2015 UTC (8 years, 10 months ago) by florian
Branch: MAIN
Changes since 1.39: +6 -1 lines
Diff to previous 1.39 (colored)

Implement HTTP Strict Transport Security (HSTS).
Input & OK reyk

Revision 1.39 / (download) - annotate - [select for diffs], Wed Jul 15 16:00:39 2015 UTC (8 years, 10 months ago) by jsing
Branch: MAIN
Changes since 1.38: +124 -24 lines
Diff to previous 1.38 (colored)

Send the TLS certificate and key via separate imsgs, rather than
including them in the IMSG_CFG_SERVER imsg. This allows the certificate
and key to each be almost 16KB (the maximum size for an imsg), rather than
having a combined total of less than 16KB (which can be reached with large
keys, certificate bundles or by including text versions of certificates).

ok reyk@

Revision 1.38 / (download) - annotate - [select for diffs], Wed Jul 15 14:39:13 2015 UTC (8 years, 10 months ago) by jsing
Branch: MAIN
Changes since 1.37: +3 -5 lines
Diff to previous 1.37 (colored)

Fix memory leaks that can occur when config_getserver() fails.

config.c r1.34 and r1.30 introduced potential memory leaks for auth and
return_uri when config_getserver fails. Fix this by switching to
serverconfig_free() and adding the missing free for srv_conf->auth.
While here, make serverconfig_free() a little more bulletproof by
explicit_bzero()ing key material.

ok reyk@

Revision 1.37 / (download) - annotate - [select for diffs], Sat Apr 11 14:52:49 2015 UTC (9 years, 2 months ago) by jsing
Branch: MAIN
Changes since 1.36: +15 -5 lines
Diff to previous 1.36 (colored)

Always check the return value of proc_composev_imsg() and handle failures
appropriately. Otherwise imsg construction can silently fail, resulting in
non-obvious problems.

Found the hard way by Theodore Wynnychenko.

ok doug@ florian@

Revision 1.36 / (download) - annotate - [select for diffs], Mon Feb 23 11:48:41 2015 UTC (9 years, 3 months ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.35: +18 -9 lines
Diff to previous 1.35 (colored)

Fix an issues that was found by halex@: we didn't set the return_uri
in non-location virtual hosts.  Add comments clarify the
variable-length values.

OK halex@

Revision 1.35 / (download) - annotate - [select for diffs], Sat Feb 7 23:56:02 2015 UTC (9 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.34: +2 -2 lines
Diff to previous 1.34 (colored)

Remove server_load_file() in favor of tls_load_file(3)

Revision 1.34 / (download) - annotate - [select for diffs], Sat Feb 7 01:23:12 2015 UTC (9 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.33: +31 -1 lines
Diff to previous 1.33 (colored)

Add support for blocking, dropping, and redirecting requests.

OK florian@

Revision 1.33 / (download) - annotate - [select for diffs], Thu Feb 5 10:46:17 2015 UTC (9 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.32: +7 -2 lines
Diff to previous 1.32 (colored)

Add missing error case to free allocated server_config on failure.

Revision 1.32 / (download) - annotate - [select for diffs], Wed Jan 21 22:21:05 2015 UTC (9 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.31: +4 -16 lines
Diff to previous 1.31 (colored)

httpd is based on relayd and had included many headers that are only
needed by its ancestor.  jsg@, include-what-you-use, and some manual
review helped to cleanup the headers (take iwyu with a grain of salt).
Based on common practice, httpd.h now also includes the necessary
headers for itself.

OK florian@

Revision 1.31 / (download) - annotate - [select for diffs], Mon Jan 19 21:07:33 2015 UTC (9 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.30: +1 -2 lines
Diff to previous 1.30 (colored)

No need to include pfvar.h, another leftover from relayd.  It was also
used for portrange operators which weren't used in httpd.

OK florian@

Revision 1.30 / (download) - annotate - [select for diffs], Mon Jan 19 19:37:50 2015 UTC (9 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.29: +103 -6 lines
Diff to previous 1.29 (colored)

Decouple auth parameters from struct server_config into struct auth.

OK florian@

Revision 1.29 / (download) - annotate - [select for diffs], Tue Jan 13 09:21:15 2015 UTC (9 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.28: +2 -2 lines
Diff to previous 1.28 (colored)

bump copyright year

Revision 1.28 / (download) - annotate - [select for diffs], Tue Jan 6 14:07:48 2015 UTC (9 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.27: +10 -7 lines
Diff to previous 1.27 (colored)

Only open a socket once for each unique "listen on" statement.  This
prevents running out of file descriptors when loading a configuration
with many aliases.

OK florian@

Revision 1.27 / (download) - annotate - [select for diffs], Sat Jan 3 15:49:18 2015 UTC (9 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.26: +4 -2 lines
Diff to previous 1.26 (colored)

Support alias names and multiple listen statements per server block.
The implementation is done in the parser by expanding each
alias/listen into an independent server configuration; this makes it
easier to handle internally without adding additional loops or
conditions.

OK florian@

Revision 1.26 / (download) - annotate - [select for diffs], Sun Dec 21 00:54:49 2014 UTC (9 years, 5 months ago) by guenther
Branch: MAIN
Changes since 1.25: +1 -3 lines
Diff to previous 1.25 (colored)

Stop pulling in <arpa/inet.h> or <arpa/nameser.h> when unnecessary.
*Do* pull it in when in_{port,addr}_h is needed and <netinet/in.h> isn't.

ok reyk@

Revision 1.25 / (download) - annotate - [select for diffs], Fri Dec 12 14:45:59 2014 UTC (9 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.24: +19 -19 lines
Diff to previous 1.24 (colored)

Like previously done in relayd, change the keyword "ssl" to "tls" to
reflect reality.

OK benno@

Revision 1.24 / (download) - annotate - [select for diffs], Sun Dec 7 16:05:08 2014 UTC (9 years, 6 months ago) by florian
Branch: MAIN
Changes since 1.23: +5 -3 lines
Diff to previous 1.23 (colored)

Avoid NULL deref in error case; found with llvm.
OK reyk

Revision 1.23 / (download) - annotate - [select for diffs], Sat Nov 22 00:24:22 2014 UTC (9 years, 6 months ago) by tedu
Branch: MAIN
Changes since 1.22: +2 -2 lines
Diff to previous 1.22 (colored)

use size_t where appropriate. ok deraadt reyk

Revision 1.21.2.1 / (download) - annotate - [select for diffs], Thu Nov 20 07:48:45 2014 UTC (9 years, 6 months ago) by jasper
Branch: OPENBSD_5_6
Changes since 1.21: +32 -19 lines
Diff to previous 1.21 (colored) next main 1.22 (colored)

httpd was developed very rapidly in the weeks before 5.6 release,
and it has a few flaws.  It would be nice to get these flaws fully
remediated before the next release, and that requires the community
to want to use it.
Therefore here is a "jumbo" patch that brings in the most important fixes.

committing on behalf of reyk@

Revision 1.22 / (download) - annotate - [select for diffs], Fri Sep 5 10:04:20 2014 UTC (9 years, 9 months ago) by reyk
Branch: MAIN
Changes since 1.21: +43 -28 lines
Diff to previous 1.21 (colored)

Remove a limitation that only allowed to specify a server name once.
The key has been changed to server name + address + port and now it is
possible to use the same server name for multiple servers with
different addresses, eg. http://www.example.com and
https://www.example.com/.

OK doug@ florian@

Revision 1.21 / (download) - annotate - [select for diffs], Wed Aug 6 18:21:14 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE
Branch point for: OPENBSD_5_6
Changes since 1.20: +2 -1 lines
Diff to previous 1.20 (colored)

Limit the body size in client requests (eg. POST data) to 1M by default;
add a configuration option to change the limit.

ok florian@

Revision 1.20 / (download) - annotate - [select for diffs], Wed Aug 6 02:04:42 2014 UTC (9 years, 10 months ago) by jsing
Branch: MAIN
Changes since 1.19: +36 -2 lines
Diff to previous 1.19 (colored)

Load the SSL public/private keys in the parent process, then provide them
to the privsep process via imsg. This allows the keys to be moved out of
the chroot (now /etc/ssl/server.crt, /etc/ssl/private/server.key).

ok reyk@

Revision 1.19 / (download) - annotate - [select for diffs], Tue Aug 5 18:01:10 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.18: +5 -1 lines
Diff to previous 1.18 (colored)

Add configuration options for the most-important connection limits:
max requests (per connection) and timeout.  We don't want to add too
many button, and there are good defaults, but these ones are kind of
mandatory.

Revision 1.18 / (download) - annotate - [select for diffs], Tue Aug 5 15:36:59 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.17: +18 -2 lines
Diff to previous 1.17 (colored)

Improve logging to allow per- server/location log files.  The log
files can also be owned by root now: they're opened by the parent and
send to the logger process with fd passing.  This also works with reload.

ok deraadt@

Revision 1.17 / (download) - annotate - [select for diffs], Tue Aug 5 14:35:47 2014 UTC (9 years, 10 months ago) by deraadt
Branch: MAIN
Changes since 1.16: +2 -2 lines
Diff to previous 1.16 (colored)

spaces

Revision 1.16 / (download) - annotate - [select for diffs], Mon Aug 4 18:00:06 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.15: +4 -1 lines
Diff to previous 1.15 (colored)

Add HTTPS = on CGI variable.

Revision 1.15 / (download) - annotate - [select for diffs], Mon Aug 4 17:38:12 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.14: +2 -3 lines
Diff to previous 1.14 (colored)

Proxy commit for jsing@:
"Add TLS/SSL support to httpd, based on the recent ressl commits."

From jsing@
ok reyk@

Revision 1.14 / (download) - annotate - [select for diffs], Mon Aug 4 15:49:28 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.13: +16 -7 lines
Diff to previous 1.13 (colored)

Add initial support for log files in /var/www/logs/.  Logging with
syslog is still supported but disabled by default.

ok deraadt@

Revision 1.13 / (download) - annotate - [select for diffs], Mon Aug 4 11:09:25 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored)

httpd doesn't support SSL/TLS yet, remove the remaining bits.
The secrect plan is to add it later using the ressl wrapper library.

Revision 1.12 / (download) - annotate - [select for diffs], Sun Aug 3 11:16:10 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.11: +9 -10 lines
Diff to previous 1.11 (colored)

Split fastcgi socket path and document root option and add the
SCRIPT_FILENAME CGI param with a prepended root.  This fixes php-fpm
that expects SCRIPT_FILENAME and also works with slowcgi if you
configure the root correctly.  For example, if SCRIPT_NAME and
REQUEST_URI are /php/index.php, root is /htdocs, SCRIPT_FILENAME will
be /htdocs/php/index.php.  As tested and discussed with florian@

Revision 1.11 / (download) - annotate - [select for diffs], Sat Aug 2 21:21:47 2014 UTC (9 years, 10 months ago) by doug
Branch: MAIN
Changes since 1.10: +7 -1 lines
Diff to previous 1.10 (colored)

Locations now inherit access log settings from the server.

Add log to the server flags.

input/"Looks ok" reyk@

Revision 1.10 / (download) - annotate - [select for diffs], Thu Jul 31 14:18:38 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.9: +9 -1 lines
Diff to previous 1.9 (colored)

Allow to specify a non-default fastcgi socket.

Revision 1.9 / (download) - annotate - [select for diffs], Thu Jul 31 13:28:15 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.8: +5 -5 lines
Diff to previous 1.8 (colored)

Rename the "docroot" variable to "path" because it will be used for
either files or the fastcgi socket (and there's no need to use a union yet).

Revision 1.8 / (download) - annotate - [select for diffs], Thu Jul 31 09:34:57 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.7: +5 -1 lines
Diff to previous 1.7 (colored)

Add a configuration variable "fastcgi" to enable it per server or location.

Revision 1.7 / (download) - annotate - [select for diffs], Wed Jul 30 13:49:48 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.6: +6 -10 lines
Diff to previous 1.6 (colored)

Make "location" work with name-based virtual servers.

Revision 1.6 / (download) - annotate - [select for diffs], Wed Jul 30 10:05:14 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.5: +42 -6 lines
Diff to previous 1.5 (colored)

Add "location" keyword to specify path-specific configuration in
servers, for example auto index for a sub-directory only.  Internally,
a "location" is just a special type of a "virtual" server.

Revision 1.5 / (download) - annotate - [select for diffs], Fri Jul 25 23:30:58 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)

Differentiate servers by address and port, not just by address.

Revision 1.4 / (download) - annotate - [select for diffs], Fri Jul 25 16:23:19 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.3: +48 -5 lines
Diff to previous 1.3 (colored)

Add support for "virtual hosts" aka. server blocks aka. multiple
servers with the same or "overlapping" IP address but a different name.

ok beck@

Revision 1.3 / (download) - annotate - [select for diffs], Wed Jul 23 13:26:39 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.2: +3 -5 lines
Diff to previous 1.2 (colored)

Correctly shutdown the servers when the process is terminating;
prevents a crash on exit.  With debugging help from blambert@.

Revision 1.2 / (download) - annotate - [select for diffs], Sun Jul 13 14:17:37 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.1: +60 -2 lines
Diff to previous 1.1 (colored)

Add support for media types (aka. MIME types): the types section is
compatible to nginx' mime.types file which can be included directly.
If not present, use a few built-in defaults for html, css, txt, jpeg,
gif, png, and js.

Revision 1.1 / (download) - annotate - [select for diffs], Sat Jul 12 23:34:54 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN

Add httpd(8), an attempt to turn the relayd(8) codebase into a simple
web server.  It is not finished yet and I just started it today, but
the goal is to provide an HTTP server that a) provides minimal
features, b) serves static files, c) provides FastCGI support, and d)
follows common coding practices of OpenBSD.

It will neither support plugins, nor custom memory allocators, EBCDIC
support, PCRE or any other things that can be found elsewhere.
httpd(8) is not intended to provide a fully-featured replacement for
nginx(8) or the Apache, but it will provide enough functionality that
is needed in the OpenBSD base system.

ok deraadt@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.