| 1 |
commit: 27591ef209318503ced0f9c421aa3d1dd84a3a6b |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 22 12:10:29 2014 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 22 12:10:29 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=27591ef2 |
| 7 |
|
| 8 |
Added some module dependencies to 00_apache_manual.conf |
| 9 |
|
| 10 |
--- |
| 11 |
2.2/conf/modules.d/00_apache_manual.conf | 4 ++++ |
| 12 |
2.4/conf/modules.d/00_apache_manual.conf | 6 +++++- |
| 13 |
2 files changed, 9 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/2.2/conf/modules.d/00_apache_manual.conf b/2.2/conf/modules.d/00_apache_manual.conf |
| 16 |
index 8825f84..1aaeceb 100644 |
| 17 |
--- a/2.2/conf/modules.d/00_apache_manual.conf |
| 18 |
+++ b/2.2/conf/modules.d/00_apache_manual.conf |
| 19 |
@@ -2,6 +2,8 @@ |
| 20 |
# http://yourserver.example.com/manual/ |
| 21 |
# The documentation is always available at |
| 22 |
# http://httpd.apache.org/docs/2.2/ |
| 23 |
+<IfModule negotiation_module> |
| 24 |
+<IfModule setenvif_module> |
| 25 |
<IfDefine MANUAL> |
| 26 |
AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-VERSION/manual$1" |
| 27 |
|
| 28 |
@@ -21,6 +23,8 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac |
| 29 |
LanguagePriority en de es fr ja ko pt-br |
| 30 |
ForceLanguagePriority Prefer Fallback |
| 31 |
</Directory> |
| 32 |
+</IfModule> |
| 33 |
+</IfModule> |
| 34 |
</IfDefine> |
| 35 |
|
| 36 |
# vim: ts=4 filetype=apache |
| 37 |
|
| 38 |
diff --git a/2.4/conf/modules.d/00_apache_manual.conf b/2.4/conf/modules.d/00_apache_manual.conf |
| 39 |
index 5388d96..5055405 100644 |
| 40 |
--- a/2.4/conf/modules.d/00_apache_manual.conf |
| 41 |
+++ b/2.4/conf/modules.d/00_apache_manual.conf |
| 42 |
@@ -1,7 +1,9 @@ |
| 43 |
# Provide access to the documentation on your server as |
| 44 |
# http://yourserver.example.com/manual/ |
| 45 |
# The documentation is always available at |
| 46 |
-# http://httpd.apache.org/docs/2.2/ |
| 47 |
+# http://httpd.apache.org/docs/2.4/ |
| 48 |
+<IfModule negotiation_module> |
| 49 |
+<IfModule setenvif_module> |
| 50 |
<IfDefine MANUAL> |
| 51 |
AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apache-VERSION/manual$1" |
| 52 |
|
| 53 |
@@ -20,6 +22,8 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br))?(/.*)?$ "/usr/share/doc/apac |
| 54 |
LanguagePriority en de es fr ja ko pt-br |
| 55 |
ForceLanguagePriority Prefer Fallback |
| 56 |
</Directory> |
| 57 |
+</IfModule> |
| 58 |
+</IfModule> |
| 59 |
</IfDefine> |
| 60 |
|
| 61 |
# vim: ts=4 filetype=apache |
Archives