[interchange-cvs] interchange - kwalsh modified 3 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Mon Aug 5 15:23:00 2002


User:      kwalsh
Date:      2002-08-05 19:22:54 GMT
Modified:  dist/src/mod_interchange mod_interchange.c
Modified:           mod_interchange.html README
Log:
	* Fixed a bug reported by John Young.  Mod_interchange was not
	  decoding entities in the REQUEST_URI, which caused Interchange
	  searches (scan) with encoded spaces to fail.

Revision  Changes    Path
2.2       +8 -2      interchange/dist/src/mod_interchange/mod_interchange.c


rev 2.2, prev_rev 2.1
Index: mod_interchange.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/src/mod_interchange/mod_interchange.c,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- mod_interchange.c	24 Jun 2002 11:51:35 -0000	2.1
+++ mod_interchange.c	5 Aug 2002 19:22:53 -0000	2.2
@@ -1,10 +1,10 @@
 /*
- *	$Id: mod_interchange.c,v 2.1 2002/06/24 11:51:35 kwalsh Exp $
+ *	$Id: mod_interchange.c,v 2.2 2002/08/05 19:22:53 kwalsh Exp $
  *
  *	Apache Module implementation of the Interchange application server
  *	link programs.
  *
- *	Version: 1.21
+ *	Version: 1.22
  *
  *	Author: Kevin Walsh <kevin@cursor.biz>
  *	Based on original code by Francis J. Lacoste <francis.lacoste@iNsu.COM>
@@ -524,6 +524,12 @@
 			*rurip =3D '\0';
 			break;
 		}
+	}
+	switch (ap_unescape_url(request_uri)){
+	case BAD_REQUEST:
+	case NOT_FOUND:
+		ap_log_reason("Bad URI entities found",r->uri,r);
+		return HTTP_INTERNAL_SERVER_ERROR;
 	}
=20
 	/*



2.2       +18 -4     interchange/dist/src/mod_interchange/mod_interchange.h=
tml


rev 2.2, prev_rev 2.1
Index: mod_interchange.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/src/mod_interchange/mod_interchange.htm=
l,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- mod_interchange.html	24 Jun 2002 11:51:35 -0000	2.1
+++ mod_interchange.html	5 Aug 2002 19:22:53 -0000	2.2
@@ -1,23 +1,24 @@
-<!-- $Id: mod_interchange.html,v 2.1 2002/06/24 11:51:35 kwalsh Exp $ -->
+<!-- $Id: mod_interchange.html,v 2.2 2002/08/05 19:22:53 kwalsh Exp $ -->
 <html>
 <head>
    <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Diso-8=
859-1">
-   <title>Apache module: mod_interchange (version 1.21)</title>
+   <title>Apache module: mod_interchange (version 1.22)</title>
 </head>
 <body bgcolor=3D"#FFFFFF" text=3D"#000000">
-    <h1>Apache module: mod_interchange (version 1.21)</h1>
+    <h1>Apache module: mod_interchange (version 1.22)</h1>
     <h2>Apache link module for Interchange</h2>
     <p>
 	This module replaces the <i>tlink</i> and <i>vlink</i> programs
 	that come with <a href=3D"http://www.icdevgroup.org/">Interchange</a>.&nb=
sp;
 	It has been tested with all Interchange versions up to and
-	including 4.9.0.&nbsp;
+	including 4.9.2.&nbsp;
 	Although this module is known to have worked with MiniVend versions 3
 	and 4, its current compatibility has not been tested.
     </p>
     <p>
 	This module has been tested with Apache versions 1.3.6
-	through 1.3.20.
+	through 1.3.26.&nbsp;
+	Note that this module is not compatible with Apache 2.
     </p>
=20
     <h2>Contents</h2>
@@ -222,6 +223,19 @@
     <h2><a name=3D"changelog">Change Log</a></h2>
     <ul>
 	<li>
+	    1.22
+	    (Mon 05 Aug 2002)
+	    Kevin Walsh &lt;kevin@cursor.biz&gt;<br>
+	    <ul>
+		<li>
+		    Fixed a bug reported by John Young.&nbsp;
+		    Mod_interchange was not decoding entities in the
+		    REQUEST_URI, which caused Interchange searches (scan)
+		    with encoded spaces to fail.
+		</li>
+	    </ul>
+	    <br>
+	</li><li>
 	    1.21
 	    (Mon 01 Apr 2002)
 	    Kevin Walsh &lt;kevin@cursor.biz&gt;<br>



2.2       +1 -1      interchange/dist/src/mod_interchange/README


rev 2.2, prev_rev 2.1
Index: README
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/src/mod_interchange/README,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- README	24 Jun 2002 11:51:35 -0000	2.1
+++ README	5 Aug 2002 19:22:53 -0000	2.2
@@ -1,9 +1,9 @@
 mod_interchange
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
-$Id: README,v 2.1 2002/06/24 11:51:35 kwalsh Exp $
+$Id: README,v 2.2 2002/08/05 19:22:53 kwalsh Exp $
=20
-Version: 1.21
+Version: 1.22
=20
 Description
 -----------