Author: jorton
Date: Fri Nov 16 11:53:32 2012
New Revision: 1410314
URL: http://svn.apache.org/viewvc?rev=1410314&view=rev
Log:
Fix OPT_INCNOEXEC/OPT_INC_WITH_EXEC handling.
Obtained from: branches/httpd24
Modified:
perl/modperl/trunk/lib/ModPerl/Code.pm
perl/modperl/trunk/t/response/TestAPI/add_config.pm
perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm
Modified: perl/modperl/trunk/lib/ModPerl/Code.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/lib/ModPerl/Code.pm?rev=1410314&r1=1410313&r2=1410314&view=diff
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/Code.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Code.pm Fri Nov 16 11:53:32 2012
@@ -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;
Modified: perl/modperl/trunk/t/response/TestAPI/add_config.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestAPI/add_config.pm?rev=1410314&r1=1410313&r2=1410314&view=diff
==============================================================================
--- perl/modperl/trunk/t/response/TestAPI/add_config.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/add_config.pm Fri Nov 16 11:53:32 2012
@@ -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;
Modified: perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm?rev=1410314&r1=1410313&r2=1410314&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm Fri Nov 16
11:53:32 2012
@@ -53,6 +53,7 @@ $Apache2::ConstantsTable = {
'OPT_EXECCGI',
'OPT_UNSET',
'OPT_INCNOEXEC',
+ 'OPT_INC_WITH_EXEC',
'OPT_SYM_OWNER',
'OPT_MULTI',
'OPT_ALL'
