Permalink
Browse files

Fix OPT_INCNOEXEC/OPT_INC_WITH_EXEC handling.

Obtained from: branches/httpd24


git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1410314 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent d1d1ac8 commit 2d341e3e46d6a4e36c72f7493a41f92dd2df0600 @notroj notroj committed Nov 16, 2012
Showing with 5 additions and 2 deletions.
  1. +2 −1 lib/ModPerl/Code.pm
  2. +2 −1 t/response/TestAPI/add_config.pm
  3. +1 −0 xs/tables/current/Apache2/ConstantsTable.pm
View
@@ -825,7 +825,8 @@ my %ifdef = map { $_, 1 }
qw(AP_MPMQ_STARTING AP_MPMQ_RUNNING AP_MPMQ_STOPPING
AP_MPMQ_MPM_STATE), # added in 2.0.49
qw(APR_FPROT_USETID APR_FPROT_GSETID
- APR_FPROT_WSTICKY APR_FOPEN_LARGEFILE); # added in 2.0.50?
+ APR_FPROT_WSTICKY APR_FOPEN_LARGEFILE), # added in 2.0.50?
+ qw(OPT_INCNOEXEC OPT_INC_WITH_EXEC); # added/removed in 2.4
sub constants_ifdef {
my $name = shift;
@@ -100,7 +100,8 @@ sub handler : method {
my $expect = Apache2::Const::OPT_ALL |
Apache2::Const::OPT_UNSET |
- Apache2::Const::OPT_INCNOEXEC |
+ (defined &Apache2::Const::OPT_INCNOEXEC
+ ? Apache2::Const::OPT_INCNOEXEC() : 0) |
Apache2::Const::OPT_MULTI |
Apache2::Const::OPT_SYM_OWNER;
@@ -53,6 +53,7 @@ $Apache2::ConstantsTable = {
'OPT_EXECCGI',
'OPT_UNSET',
'OPT_INCNOEXEC',
+ 'OPT_INC_WITH_EXEC',
'OPT_SYM_OWNER',
'OPT_MULTI',
'OPT_ALL'

0 comments on commit 2d341e3

Please sign in to comment.