trawick at apache
Jul 2, 2009, 2:30 PM
Views: 109
Permalink
|
|
svn commit: r790738 - in /httpd/httpd/branches/2.2.x: STATUS server/core.c
|
|
Author: trawick
Date: Thu Jul 2 21:30:36 2009
New Revision: 790738
URL: http://svn.apache.org/viewvc?rev=790738&view=rev
Log:
additional (mod_perl test suite) OPT_INCLUDES compatibility
Submitted by: jorton
Reviewed by: trawick, rpluem
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/core.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=790738&r1=790737&r2=790738&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Jul 2 21:30:36 2009
@@ -93,11 +93,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * additional (mod_perl test suite) OPT_INCLUDES compatibility
- trunk: N/A
- 2.2.x patch: http://people.apache.org/~trawick/mod_perl_more_compat.txt
- +1: trawick, jorton, rpluem
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[. New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/core.c?rev=790738&r1=790737&r2=790738&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Thu Jul 2 21:30:36 2009
@@ -665,7 +665,12 @@
* inverted, such that the exposed semantics match that of
* OPT_INCNOEXEC; i.e., the bit is only enabled if exec= is *not*
* permitted. */
- return conf->opts ^ OPT_INC_WITH_EXEC;
+ if (conf->opts & OPT_INCLUDES) {
+ return conf->opts ^ OPT_INC_WITH_EXEC;
+ }
+ else {
+ return conf->opts;
+ }
}
AP_DECLARE(int) ap_allow_overrides(request_rec *r)
|
svn commit: r790738 - in /httpd/httpd/branches/2.2.x: STATUS server/core.c