Author: jorton Date: Fri Nov 16 10:44:55 2012 New Revision: 1410291 URL: http://svn.apache.org/viewvc?rev=1410291&view=rev Log: * src/modules/perl/modperl_apache_compat.h: Fix definition of MP_HTTPD_OVERRIDE_OPTS_DEFAULT for 2.4.
Obtained from: branches/httpd24 Submitted by: torsten Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Modified: perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h?rev=1410291&r1=1410290&r2=1410291&view=diff ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h (original) +++ perl/modperl/trunk/src/modules/perl/modperl_apache_compat.h Fri Nov 16 10:44:55 2012 @@ -66,11 +66,22 @@ AP_DECLARE(const char *) ap_get_server_v #define MP_HTTPD_OVERRIDE_HTACCESS (OR_LIMIT|OR_OPTIONS|OR_FILEINFO|OR_AUTHCFG|OR_INDEXES) #define MP_HTTPD_OVERRIDE_OPTS_UNSET (-1) + +#if AP_SERVER_MAJORVERSION_NUMBER>2 || \ + (AP_SERVER_MINORVERSION_NUMBER == 2 && AP_SERVER_MINORVERSION_NUMBER>=3) +/* 2.4 API */ +#define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \ + OPT_ALL | \ + OPT_SYM_OWNER | \ + OPT_MULTI) +#else +/* 2.2 API */ #define MP_HTTPD_OVERRIDE_OPTS_DEFAULT (OPT_UNSET | \ OPT_ALL | \ OPT_INCNOEXEC | \ OPT_SYM_OWNER | \ OPT_MULTI) +#endif #ifndef PROXYREQ_RESPONSE #define PROXYREQ_RESPONSE (3)