Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Apr 2020 19:09:53 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r533389 - in head/net-im/prosody: . files
Message-ID:  <202004291909.03TJ9riX024286@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Wed Apr 29 19:09:53 2020
New Revision: 533389
URL: https://svnweb.freebsd.org/changeset/ports/533389

Log:
  net-im/prosody: Fix http files download
  
  net-im/prosody: fix ETag creation
  
  * Include patch from upstream to fix crash in mod_http_files
    when encountering large device- or inode-numbers [1]
  
  [1] https://issues.prosody.im/1498
  
  PR:		244618
  Submitted by:	Thomas Morper <thomas@beingboiled.info> (maintainer)
  Reported by:	rozhuk.im@gmail.com

Added:
  head/net-im/prosody/files/patch-plugins_mod__http__files.lua   (contents, props changed)
Modified:
  head/net-im/prosody/Makefile

Modified: head/net-im/prosody/Makefile
==============================================================================
--- head/net-im/prosody/Makefile	Wed Apr 29 19:09:39 2020	(r533388)
+++ head/net-im/prosody/Makefile	Wed Apr 29 19:09:53 2020	(r533389)
@@ -3,6 +3,7 @@
 
 PORTNAME=	prosody
 PORTVERSION=	0.11.5
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://prosody.im/downloads/source/
 

Added: head/net-im/prosody/files/patch-plugins_mod__http__files.lua
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/prosody/files/patch-plugins_mod__http__files.lua	Wed Apr 29 19:09:53 2020	(r533389)
@@ -0,0 +1,11 @@
+--- plugins/mod_http_files.lua.orig	2020-01-19 15:50:32 UTC
++++ plugins/mod_http_files.lua
+@@ -112,7 +112,7 @@ function serve(opts)
+ 		local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
+ 		response_headers.last_modified = last_modified;
+ 
+-		local etag = ('"%02x-%x-%x-%x"'):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0);
++		local etag = ('"%x-%x-%x"'):format(attr.change or 0, attr.size or 0, attr.modification or 0);
+ 		response_headers.etag = etag;
+ 
+ 		local if_none_match = request_headers.if_none_match



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004291909.03TJ9riX024286>