summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/dokuwiki/Makefile2
-rw-r--r--www/dokuwiki/files/patch-wrong-2388-fix11
2 files changed, 12 insertions, 1 deletions
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index e50055707e71..5c7973e36f66 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -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}
diff --git a/www/dokuwiki/files/patch-wrong-2388-fix b/www/dokuwiki/files/patch-wrong-2388-fix
new file mode 100644
index 000000000000..b3c076040658
--- /dev/null
+++ b/www/dokuwiki/files/patch-wrong-2388-fix
@@ -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;