Commit Diff

Commit:
ee2597096652830f488428a76fe8eb91c92ac82d
From:
rsadowski <rsadowski@openbsd.org>
Date:
Message:
relayd: add support for the MKCALENDAR HTTP method relayd is missing this method from the WebDAV/CalDAV extensions. This causes issues when using relayd as a reverse proxy in front of CalDAV servers like Nextcloud. OK kirill@
Actions:
Patch | Tree
commit - b9e76932975f4713e0b9e49ed71f9c8e6c19c53e
commit + ee2597096652830f488428a76fe8eb91c92ac82d
blob - b9784ad55cebc1ffcf856cd7b86fe9799aa5be93
blob + 48d385af47e24f8fb78c618fb0c36dcfea5da66b
--- http.h
+++ http.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: http.h,v 1.12 2021/03/24 20:59:53 benno Exp $	*/
+/*	$OpenBSD: http.h,v 1.13 2026/05/19 05:06:41 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2012 - 2015 Reyk Floeter <reyk@openbsd.org>
@@ -72,6 +72,9 @@ enum httpmethod {
 	/* WebDAV Search, RFC 5323 */
 	HTTP_METHOD_SEARCH,
 
+	/* WebDAV Calendaring Extensions, RFC 4791 */
+	HTTP_METHOD_MKCALENDAR,
+
 	/* PATCH, RFC 5789 */
 	HTTP_METHOD_PATCH,
 
@@ -115,6 +118,7 @@ struct http_method {
 	{ HTTP_METHOD_MKREDIRECTREF,	"MKREDIRECTREF" }, \
 	{ HTTP_METHOD_UPDATEREDIRECTREF, "UPDATEREDIRECTREF" }, \
 	{ HTTP_METHOD_SEARCH,		"SEARCH" },	\
+	{ HTTP_METHOD_MKCALENDAR,	"MKCALENDAR" },	\
 	{ HTTP_METHOD_PATCH,		"PATCH" },	\
 	{ HTTP_METHOD_NONE,		NULL }		\
 }
blob - 2570940fbbab47edc60a7dc9d72bf35ff61b4e0a
blob + 5bd3259dec04240b34b8b577db66531444ffaa5b
--- relay_http.c
+++ relay_http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: relay_http.c,v 1.97 2026/05/16 15:25:28 kirill Exp $	*/
+/*	$OpenBSD: relay_http.c,v 1.98 2026/05/19 05:06:41 rsadowski Exp $	*/
 
 /*
  * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -532,6 +532,7 @@ relay_read_http(struct bufferevent *bev, void *arg)
 		case HTTP_METHOD_MKREDIRECTREF:
 		case HTTP_METHOD_UPDATEREDIRECTREF:
 		case HTTP_METHOD_SEARCH:
+		case HTTP_METHOD_MKCALENDAR:
 		case HTTP_METHOD_PATCH:
 			/* HTTP request payload */
 			if (cre->toread > 0) {
blob - cd370c15d2655405557ff5c0a3b722de6bc31832
blob + 6e95e9a52ba247fae9e168d48f7e6a4d24908431
--- relayd.conf.5
+++ relayd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: relayd.conf.5,v 1.217 2026/05/17 09:11:01 kirill Exp $
+.\"	$OpenBSD: relayd.conf.5,v 1.218 2026/05/19 05:06:41 rsadowski Exp $
 .\"
 .\" Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org>
 .\" Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 17 2026 $
+.Dd $Mdocdate: May 19 2026 $
 .Dt RELAYD.CONF 5
 .Os
 .Sh NAME
@@ -1237,6 +1237,7 @@ and can be either
 .Ic LOCK ,
 .Ic MERGE ,
 .Ic MKACTIVITY ,
+.Ic MKCALENDAR ,
 .Ic MKCOL ,
 .Ic MKREDIRECTREF ,
 .Ic MKWORKSPACE ,