diff options
| author | Xin LI <delphij@FreeBSD.org> | 2014-05-22 22:33:36 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2014-05-22 22:33:36 +0000 |
| commit | 9a77f083acc539cadbad8201cfbf943d5787bf54 (patch) | |
| tree | 51bb7786dd519652bd80882f3bc6dec64d1b5881 /www/dokuwiki | |
| parent | 91d099f3c6034f607b5b94c98f2e6f17b96a22d8 (diff) | |
| download | ports-9a77f083acc539cadbad8201cfbf943d5787bf54.tar.gz ports-9a77f083acc539cadbad8201cfbf943d5787bf54.zip | |
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.
Notes
Notes:
svn path=/head/; revision=354894
Diffstat (limited to 'www/dokuwiki')
| -rw-r--r-- | www/dokuwiki/Makefile | 2 | ||||
| -rw-r--r-- | www/dokuwiki/files/patch-wrong-2388-fix | 11 |
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; |