aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn2
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 611e51843..b50b515b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,10 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium
* Fix aspect ratio when scaling small images, and add support for
converting SVG and PDF graphics to PNG.
Thanks, chrysn
+ * In the CGI wrapper, incorporate $config{ENV} into the environment
+ before executing Perl code, so that PERL5LIB can point to a
+ non-system-wide installation of IkiWiki.
+ Thanks, Lafayette Chamber Singers Webmaster
-- Simon McVittie <smcv@debian.org> Fri, 12 Sep 2014 21:23:58 +0100
diff --git a/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn b/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn
index 59ca75435..140b487d1 100644
--- a/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn
+++ b/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn
@@ -55,6 +55,8 @@ As I am not sure that remembering `PERL5LIB` is a good idea, I think that a pret
Happy to make the escaping change, thanks for the sharp eye.
+> [[Merged|done]] with that change. --[[smcv]]
+
My thinking on `delete` is once it's handled, it's handled. The C code
is going to put this straight into the real environment and then do
a simple `exec` ... is there any way this hasn't been handled?