You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/01/23 15:34:18 UTC
svn commit: r1560698 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/session/mod_session.c
Author: jim
Date: Thu Jan 23 14:34:18 2014
New Revision: 1560698
URL: http://svn.apache.org/r1560698
Log:
Merge r1559828 from trunk:
mod_session: Fix problems interpreting the SessionInclude and
SessionExclude configuration.
PR: 56038
Submitted by: Erik Pearson <erik adaptations.com>
Reviewed by: trawick
Submitted by: trawick
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/session/mod_session.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1559828
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1560698&r1=1560697&r2=1560698&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Jan 23 14:34:18 2014
@@ -2,6 +2,10 @@
Changes with Apache 2.4.8
+ *) mod_session: Fix problems interpreting the SessionInclude and
+ SessionExclude configuration. PR 56038. [Erik Pearson
+ <erik adaptations.com>]
+
*) mod_authn_core: Allow <AuthnProviderAlias>'es to be seen from auth
stanzas under virtual hosts. PR 55622. [Eric Covener]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1560698&r1=1560697&r2=1560698&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Jan 23 14:34:18 2014
@@ -99,13 +99,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_session: Fix problems interpreting the SessionInclude and
- SessionExclude configuration.
- trunk patch: http://svn.apache.org/r1559828
- 2.4.x patch: trunk patch works after resolving CHANGES conflicts
- +1: trawick, minfrin, jim
-
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/session/mod_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/session/mod_session.c?rev=1560698&r1=1560697&r2=1560698&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/session/mod_session.c (original)
+++ httpd/httpd/branches/2.4.x/modules/session/mod_session.c Thu Jan 23 14:34:18 2014
@@ -62,16 +62,16 @@ static int session_included(request_rec
included = 0;
for (i = 0; !included && i < conf->includes->nelts; i++) {
const char *include = includes[i];
- if (strncmp(r->uri, include, strlen(include))) {
+ if (strncmp(r->uri, include, strlen(include)) == 0) {
included = 1;
}
}
}
if (conf->excludes->nelts) {
- for (i = 0; included && i < conf->includes->nelts; i++) {
+ for (i = 0; included && i < conf->excludes->nelts; i++) {
const char *exclude = excludes[i];
- if (strncmp(r->uri, exclude, strlen(exclude))) {
+ if (strncmp(r->uri, exclude, strlen(exclude)) == 0) {
included = 0;
}
}