You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by br...@apache.org on 2002/01/06 07:53:25 UTC
cvs commit: httpd-2.0/modules/filters mod_include.c
brianp 02/01/05 22:53:25
Modified: modules/filters mod_include.c
Log:
Cleaned up a couple of ap_ssi_parse_string calls that I missed
in the last commit
Revision Changes Path
1.184 +12 -12 httpd-2.0/modules/filters/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- mod_include.c 6 Jan 2002 06:41:30 -0000 1.183
+++ mod_include.c 6 Jan 2002 06:53:25 -0000 1.184
@@ -2213,8 +2213,8 @@
if (!current->left->done) {
switch (current->left->token.type) {
case token_string:
- ap_ssi_parse_string(r, ctx, current->left->token.value,
- buffer, sizeof(buffer), 0);
+ buffer = ap_ssi_parse_string(r, ctx, current->left->token.value,
+ NULL, MAX_STRING_LEN, 0);
apr_cpystrn(current->left->token.value, buffer,
sizeof(current->left->token.value));
current->left->value =
@@ -2229,8 +2229,8 @@
if (!current->right->done) {
switch (current->right->token.type) {
case token_string:
- ap_ssi_parse_string(r, ctx, current->right->token.value,
- buffer, sizeof(buffer), 0);
+ buffer = ap_ssi_parse_string(r, ctx, current->right->token.value,
+ NULL, MAX_STRING_LEN, 0);
apr_cpystrn(current->right->token.value, buffer,
sizeof(current->right->token.value));
current->right->value =
@@ -2280,12 +2280,12 @@
*was_error = 1;
goto RETURN;
}
- ap_ssi_parse_string(r, ctx, current->left->token.value,
- buffer, sizeof(buffer), 0);
+ buffer = ap_ssi_parse_string(r, ctx, current->left->token.value,
+ NULL, MAX_STRING_LEN, 0);
apr_cpystrn(current->left->token.value, buffer,
sizeof(current->left->token.value));
- ap_ssi_parse_string(r, ctx, current->right->token.value,
- buffer, sizeof(buffer), 0);
+ buffer = ap_ssi_parse_string(r, ctx, current->right->token.value,
+ NULL, MAX_STRING_LEN, 0);
apr_cpystrn(current->right->token.value, buffer,
sizeof(current->right->token.value));
if (current->right->token.type == token_re) {
@@ -2339,12 +2339,12 @@
*was_error = 1;
goto RETURN;
}
- ap_ssi_parse_string(r, ctx, current->left->token.value,
- buffer, sizeof(buffer), 0);
+ buffer = ap_ssi_parse_string(r, ctx, current->left->token.value,
+ NULL, MAX_STRING_LEN, 0);
apr_cpystrn(current->left->token.value, buffer,
sizeof(current->left->token.value));
- ap_ssi_parse_string(r, ctx, current->right->token.value,
- buffer, sizeof(buffer), 0);
+ buffer = ap_ssi_parse_string(r, ctx, current->right->token.value,
+ NULL, MAX_STRING_LEN, 0);
apr_cpystrn(current->right->token.value, buffer,
sizeof(current->right->token.value));
#ifdef DEBUG_INCLUDE