From owner-svn-ports-all@FreeBSD.ORG  Thu May 22 22:33:37 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B79C189D;
 Thu, 22 May 2014 22:33:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A505822CE;
 Thu, 22 May 2014 22:33:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MMXbUA036921;
 Thu, 22 May 2014 22:33:37 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4MMXbxS036918;
 Thu, 22 May 2014 22:33:37 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201405222233.s4MMXbxS036918@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 22 May 2014 22:33:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354894 - in head/www/dokuwiki: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 May 2014 22:33:37 -0000

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;