rse 97/07/31 01:50:05
Modified: src Tag: APACHE_1_2_X CHANGES mod_include.c
Log:
handle_else was being used to handle endif.
Submitted by: Howard Fear
Reviewed by: Ralf S. Engelschall, Jim Jagielski, Randy Terbush
Revision Changes Path
No revision
No revision
1.286.2.37 +4 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.36
retrieving revision 1.286.2.37
diff -u -r1.286.2.36 -r1.286.2.37
--- CHANGES 1997/07/31 08:43:13 1.286.2.36
+++ CHANGES 1997/07/31 08:50:01 1.286.2.37
@@ -1,5 +1,9 @@
Changes with Apache 1.2.2
+ *) mod_include cleanup showed that handle_else was being used to handle
+ endif. It didn't cause problems, but it was cleaned up too.
+ [Howard Fear]
+
*) Last official synchonisation of mod_rewrite with author version (because
mod_rewrite is now directly developed by the author at the Apache
Group):
o added diff between mod_rewrite 3.0.6+ and 3.0.9
1.33.2.5 +2 -2 apache/src/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -u -r1.33.2.4 -r1.33.2.5
--- mod_include.c 1997/07/20 18:24:25 1.33.2.4
+++ mod_include.c 1997/07/31 08:50:02 1.33.2.5
@@ -1589,6 +1589,7 @@
#ifdef DEBUG_INCLUDE
rvputs(r,"**** endif conditional_status=\"", *conditional_status ? "1" :
"0", "\"\n", NULL);
#endif
+ *printing = 1;
*conditional_status = 1;
return 0;
} else {
@@ -1704,8 +1705,7 @@
continue;
} else if(!strcmp(directive,"endif")) {
if (!if_nesting) {
- ret=handle_else(f, r, error, &conditional_status,
&printing);
- printing = 1;
+ ret = handle_endif(f, r, error, &conditional_status,
&printing);
} else {
if_nesting--;
}
