From f8a1f7652651a4dd2067a09ae8b754b4f5eb1f05 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Thu, 22 Oct 2015 12:52:53 +0000 Subject: [PATCH] 2.59 git-svn-id: http://dev.catalyst.perl.org/repos/Config-General/trunk@106 be1acefe-a474-0410-9a34-9b3221f2030f --- Changelog | 5 +++++ General.pm | 10 ++++++---- README | 4 ++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index 611494f..7622ef9 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,8 @@ +2.59 - fix rt.cpan.org#107108 by adding support for IncludeOptional. + - clarified documentation on StoreDelimiter. + +2.58 - bumbp version + 2.57 - fix rt.cpan.org#104548, dont allow special chars like newline or < in keys, which leads to faile when saving. diff --git a/General.pm b/General.pm index 8ada92c..269a3eb 100644 --- a/General.pm +++ b/General.pm @@ -32,7 +32,7 @@ use Carp::Heavy; use Carp; use Exporter; -$Config::General::VERSION = "2.58"; +$Config::General::VERSION = "2.59"; use vars qw(@ISA @EXPORT_OK); use base qw(Exporter); @@ -1600,7 +1600,8 @@ values of the options will B lowercased. If set to a true value, the parser will consider "include ..." as valid include statement (just like the well known Apache include statement). - +It also supports apache's "IncludeOptional" statement with the same behavior, +that is, if the include file doesn't exist no error will be thrown. =item B<-IncludeRelative> @@ -1630,6 +1631,7 @@ include all matching files (e.g. <>). Also note that as with standard file patterns, * will not match dot-files, so <> is often more desirable than including a directory with B<-IncludeDirectories>. +An include option will not cause a parser error if the glob didn't return anything. =item B<-IncludeAgain> @@ -2743,7 +2745,7 @@ I recommend you to read the following documents, which are supplied with Perl: =head1 LICENSE AND COPYRIGHT -Copyright (c) 2000-2014 Thomas Linden +Copyright (c) 2000-2015 Thomas Linden This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. @@ -2772,7 +2774,7 @@ Thomas Linden =head1 VERSION -2.58 +2.59 =cut diff --git a/README b/README index a1baeb7..30c72f2 100644 --- a/README +++ b/README @@ -80,7 +80,7 @@ UPDATE COPYRIGHT Config::General Config::General::Extended - Copyright (c) 2000-2014 by Thomas Linden + Copyright (c) 2000-2015 by Thomas Linden Config::General::Interpolated Copyright (c) 2001 by Wei-Hon Chen @@ -104,4 +104,4 @@ AUTHOR VERSION - 2.58 + 2.59