Date: Thu, 22 May 2014 22:33:37 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354894 - in head/www/dokuwiki: . files Message-ID: <201405222233.s4MMXbxS036918@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Thu May 22 22:33:36 2014 New Revision: 354894 URL: http://svnweb.freebsd.org/changeset/ports/354894 QAT: https://qat.redports.org/buildarchive/r354894/ Log: Revert upstream changeset 446b5b5 as it would break the case when dokuwiki is properly configured to split out savedir from the wiki itself and when Nginx's X-Accel-Redirect header is being used. Added: head/www/dokuwiki/files/patch-wrong-2388-fix (contents, props changed) Modified: head/www/dokuwiki/Makefile Modified: head/www/dokuwiki/Makefile ============================================================================== --- head/www/dokuwiki/Makefile Thu May 22 21:56:52 2014 (r354893) +++ head/www/dokuwiki/Makefile Thu May 22 22:33:36 2014 (r354894) @@ -3,7 +3,7 @@ PORTNAME= dokuwiki PORTVERSION= ${DIST_VER:S/${PORTNAME}//:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://download.dokuwiki.org/src/dokuwiki/ DISTNAME= ${DIST_VER} Added: head/www/dokuwiki/files/patch-wrong-2388-fix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/dokuwiki/files/patch-wrong-2388-fix Thu May 22 22:33:36 2014 (r354894) @@ -0,0 +1,11 @@ +--- ./inc/httputils.php.orig 2014-05-05 13:53:23.000000000 -0700 ++++ ./inc/httputils.php 2014-05-22 15:24:54.000000000 -0700 +@@ -80,8 +80,6 @@ + ob_end_clean(); + exit; + }elseif($conf['xsendfile'] == 3){ +- // FS#2388 nginx just needs the relative path. +- $file = DOKU_REL.substr($file, strlen(fullpath(DOKU_INC)) + 1); + header("X-Accel-Redirect: $file"); + ob_end_clean(); + exit;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405222233.s4MMXbxS036918>