[interchange-cvs] interchange - kwalsh modified 3 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Mon Oct 21 15:21:02 2002


User:      kwalsh
Date:      2002-10-21 19:20:44 GMT
Modified:  dist/src/mod_interchange mod_interchange.c
Modified:           mod_interchange.html README
Log:
	* Fixed a bug reported by Shawn Mathews.  The URILevels directive
	  was not taken into account when munging the PATH_INFO HTTP
	  environment variable.

Revision  Changes    Path
2.4       +8 -5      interchange/dist/src/mod_interchange/mod_interchange.c


rev 2.4, prev_rev 2.3
Index: mod_interchange.c
===================================================================
RCS file: /var/cvs/interchange/dist/src/mod_interchange/mod_interchange.c,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- mod_interchange.c	2 Oct 2002 02:00:16 -0000	2.3
+++ mod_interchange.c	21 Oct 2002 19:20:43 -0000	2.4
@@ -1,10 +1,10 @@
 /*
- *	$Id: mod_interchange.c,v 2.3 2002/10/02 02:00:16 kwalsh Exp $
+ *	$Id: mod_interchange.c,v 2.4 2002/10/21 19:20:43 kwalsh Exp $
  *
  *	Apache Module implementation of the Interchange application server
  *	link programs.
  *
- *	Version: 1.23
+ *	Version: 1.24
  *
  *	Author: Kevin Walsh <kevin@cursor.biz>
  *	Based on original code by Francis J. Lacoste <francis.lacoste@iNsu.COM>
@@ -42,7 +42,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-#define	MODULE_VERSION	"mod_interchange/1.23"
+#define	MODULE_VERSION	"mod_interchange/1.24"
 
 #ifdef	OSX
 typedef long socklen_t;
@@ -158,7 +158,7 @@
 	for (i = 1; i < IC_MAX_SERVERS; i++)
 		conf_rec->server[i] = (ic_socket_rec *)NULL;
 
-	conf_rec->levels = 1;
+	conf_rec->levels = IC_DEFAULT_LEVELS;
 	conf_rec->connect_tries = IC_DEFAULT_CONNECT_TRIES;
 	conf_rec->connect_retry_delay = IC_DEFAULT_CONNECT_RETRY_DELAY;
 	conf_rec->droplist_no = 0;
@@ -529,8 +529,11 @@
 	}
 	while (*rurip == '/')
 		rurip++;
-	while (*rurip != '\0' && *rurip != '/')
+
+	level = conf_rec->levels;
+	while (*rurip != '\0' && (*rurip != '/' || --level))
 		rurip++;
+
 	strcpy(request_uri,rurip);
 	for (rurip = request_uri; *rurip != '\0'; rurip++){
 		if (*rurip == '?'){



2.4       +14 -2     interchange/dist/src/mod_interchange/mod_interchange.html


rev 2.4, prev_rev 2.3
Index: mod_interchange.html
===================================================================
RCS file: /var/cvs/interchange/dist/src/mod_interchange/mod_interchange.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- mod_interchange.html	2 Oct 2002 02:00:16 -0000	2.3
+++ mod_interchange.html	21 Oct 2002 19:20:44 -0000	2.4
@@ -1,11 +1,11 @@
-<!-- $Id: mod_interchange.html,v 2.3 2002/10/02 02:00:16 kwalsh Exp $ -->
+<!-- $Id: mod_interchange.html,v 2.4 2002/10/21 19:20:44 kwalsh Exp $ -->
 <html>
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <title>Apache module: mod_interchange (version 1.23)</title>
+   <title>Apache module: mod_interchange (version 1.24)</title>
 </head>
 <body bgcolor="#FFFFFF" text="#000000">
-    <h1>Apache module: mod_interchange (version 1.23)</h1>
+    <h1>Apache module: mod_interchange (version 1.24)</h1>
     <h2>Apache link module for Interchange</h2>
     <p>
 	This module replaces the <i>tlink</i> and <i>vlink</i> programs
@@ -223,6 +223,18 @@
     <h2><a name="changelog">Change Log</a></h2>
     <ul>
 	<li>
+	    1.24
+	    (Mon 31 Oct 2002)
+	    Kevin Walsh &lt;kevin@cursor.biz&gt;<br>
+	    <ul>
+		<li>
+		    Fixed a bug reported by Shawn Mathews.&nbsp;
+		    The URILevels directive was not taken into account when
+		    munging the PATH_INFO HTTP environment variable.
+		</li>
+	    </ul>
+	    <br>
+	</li><li>
 	    1.23
 	    (Wed 02 Oct 2002)
 	    Kevin Walsh &lt;kevin@cursor.biz&gt;<br>



2.3       +2 -2      interchange/dist/src/mod_interchange/README


rev 2.3, prev_rev 2.2
Index: README
===================================================================
RCS file: /var/cvs/interchange/dist/src/mod_interchange/README,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- README	5 Aug 2002 19:22:53 -0000	2.2
+++ README	21 Oct 2002 19:20:44 -0000	2.3
@@ -1,9 +1,9 @@
 mod_interchange
 ===============
 
-$Id: README,v 2.2 2002/08/05 19:22:53 kwalsh Exp $
+$Id: README,v 2.3 2002/10/21 19:20:44 kwalsh Exp $
 
-Version: 1.22
+Version: 1.24
 
 Description
 -----------