rse 00/01/15 08:40:42
Modified: src CHANGES
src/main http_config.c
Log:
Fixed parsing of TAKE13-based configuration directives.
Submitted by: Steffen Roller <[EMAIL PROTECTED]>
Reviewed by: Ralf S. Engelschall
PR: 5550
Revision Changes Path
1.1499 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1498
retrieving revision 1.1499
diff -u -r1.1498 -r1.1499
--- CHANGES 2000/01/14 09:15:22 1.1498
+++ CHANGES 2000/01/15 16:40:40 1.1499
@@ -1,5 +1,8 @@
Changes with Apache 1.3.10
+ *) Fixed parsing of TAKE13-based configuration directives.
+ [Steffen Roller <[EMAIL PROTECTED]>] PR#5550
+
*) rename the lookup() function to hashTableLookup() (in expat-lite)
to prevent name clashes with modules / third-party software.
[Ralf S. Engelschall, Greg Stein]
1.150 +1 -1 apache-1.3/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- http_config.c 2000/01/01 17:07:34 1.149
+++ http_config.c 2000/01/15 16:40:42 1.150
@@ -881,7 +881,7 @@
w2 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
w3 = *args ? ap_getword_conf(parms->pool, &args) : NULL;
- if (*w == '\0' || (*w2 && !w3) || *args != 0)
+ if (*w == '\0' || (w2 && *w2 && !w3) || *args != 0)
return ap_pstrcat(parms->pool, cmd->name,
" takes one or three arguments",
cmd->errmsg ? ", " : NULL, cmd->errmsg, NULL);
