Attachment 179564 Details for Bug 216752 – www___obhttpd.diff

[patch] www___obhttpd.diff

www___obhttpd.diff (text/plain), 1.78 KB, created by Tobias Kortkamp on 2017-02-03 11:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-02-03 11:49:31 UTC

Size: 1.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 433221)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	obhttpd
> PORTVERSION=	6.0.20161006
>+PORTREVISION=	1
> CATEGORIES=	www
> 
> MAINTAINER=	koue@chaosophia.net
>Index: files/patch-usr.sbin_httpd_server__file.c
>===================================================================
>--- files/patch-usr.sbin_httpd_server__file.c	(nonexistent)
>+++ files/patch-usr.sbin_httpd_server__file.c	(working copy)
>@@ -0,0 +1,30 @@
>+OpenBSD 6.0 errata 17, Jan 31, 2017
>+
>+A bug in the processing of range headers in httpd can lead to memory
>+exhaustion. This patch disables range header processing.
>+
>+--- usr.sbin/httpd/server_file.c.orig	2016-10-17 10:49:16 UTC
>++++ usr.sbin/httpd/server_file.c
>+@@ -66,7 +66,6 @@ server_file_access(struct httpd *env, st
>+ 	struct http_descriptor	*desc = clt->clt_descreq;
>+ 	struct server_config	*srv_conf = clt->clt_srv_conf;
>+ 	struct stat		 st;
>+-	struct kv		*r, key;
>+ 	char			*newpath, *encodedpath;
>+ 	int			 ret;
>+ 
>+@@ -146,13 +145,7 @@ server_file_access(struct httpd *env, st
>+ 		goto fail;
>+ 	}
>+ 
>+-	key.kv_key = "Range";
>+-	r = kv_find(&desc->http_headers, &key);
>+-	if (r != NULL)
>+-		return (server_partial_file_request(env, clt, path, &st,
>+-		    r->kv_value));
>+-	else
>+-		return (server_file_request(env, clt, path, &st));
>++	return (server_file_request(env, clt, path, &st));
>+ 
>+  fail:
>+ 	switch (errno) {
>
>Property changes on: files/patch-usr.sbin_httpd_server__file.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tobik: maintainer-approval? (koue)

Actions: View | Diff

Attachments on bug 216752: 179563 | 179564