From: Jim Jagielski <jim@apache.org>
Date: Thu, 23 Jan 2014 14:34:18 +0000 (+0000)
Subject: Merge r1559828 from trunk:
X-Git-Tag: 2.4.8~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5eabeb5bc4dea645669704aa335fb2c78c0c91e7;p=apache

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560698 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index c04f48f1d7..f86369648c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/STATUS b/STATUS
index 138027f89f..cf2c6cc057 100644
--- a/STATUS
+++ b/STATUS
@@ -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 ]
diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c
index 89c80747cf..48475c0725 100644
--- a/modules/session/mod_session.c
+++ b/modules/session/mod_session.c
@@ -62,16 +62,16 @@ static int session_included(request_rec * r, session_dir_conf * conf)
         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;
             }
         }