You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2002/11/04 19:31:57 UTC
cvs commit: httpd-2.0/modules/metadata mod_headers.c
stoddard 2002/11/04 10:31:57
Modified: modules/metadata mod_headers.c
Log:
Detabbify
Revision Changes Path
1.42 +46 -46 httpd-2.0/modules/metadata/mod_headers.c
Index: mod_headers.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mod_headers.c 17 Jul 2002 16:08:53 -0000 1.41
+++ mod_headers.c 4 Nov 2002 18:31:57 -0000 1.42
@@ -192,7 +192,7 @@
static const char *header_request_env_var(request_rec *r, char *a)
{
const char *s = apr_table_get(r->subprocess_env,a);
-
+
if (s)
return s;
else
@@ -237,7 +237,7 @@
s = *sa;
while (*s && *s != '%') {
- s++;
+ s++;
}
/*
* This might allocate a few chars extra if there's a backslash
@@ -248,39 +248,39 @@
d = tag->arg;
s = *sa;
while (*s && *s != '%') {
- if (*s != '\\') {
- *d++ = *s++;
- }
- else {
- s++;
- switch (*s) {
- case '\\':
- *d++ = '\\';
- s++;
- break;
- case 'r':
- *d++ = '\r';
- s++;
- break;
- case 'n':
- *d++ = '\n';
- s++;
- break;
- case 't':
- *d++ = '\t';
- s++;
- break;
- default:
- /* copy verbatim */
- *d++ = '\\';
- /*
- * Allow the loop to deal with this *s in the normal
- * fashion so that it handles end of string etc.
- * properly.
- */
- break;
- }
- }
+ if (*s != '\\') {
+ *d++ = *s++;
+ }
+ else {
+ s++;
+ switch (*s) {
+ case '\\':
+ *d++ = '\\';
+ s++;
+ break;
+ case 'r':
+ *d++ = '\r';
+ s++;
+ break;
+ case 'n':
+ *d++ = '\n';
+ s++;
+ break;
+ case 't':
+ *d++ = '\t';
+ s++;
+ break;
+ default:
+ /* copy verbatim */
+ *d++ = '\\';
+ /*
+ * Allow the loop to deal with this *s in the normal
+ * fashion so that it handles end of string etc.
+ * properly.
+ */
+ break;
+ }
+ }
}
*d = '\0';
@@ -292,7 +292,7 @@
{
const char *s = *sa;
const char * (*tag_handler)(request_rec *,char *);
-
+
/* Handle string literal/conditionals */
if (*s != '%') {
return parse_misc_string(p, tag, sa);
@@ -410,14 +410,14 @@
if (inout != hdr_out) {
return "error: envclause (env=...) only valid on Header directive";
}
- if (strncasecmp(envclause, "env=", 4) != 0) {
- return "error: envclause should be in the form env=envar";
- }
- if ((envclause[4] == '\0')
- || ((envclause[4] == '!') && (envclause[5] == '\0'))) {
- return "error: missing environment variable name. envclause should be in the form env=envar ";
- }
- condition_var = apr_pstrdup(cmd->pool, &envclause[4]);
+ if (strncasecmp(envclause, "env=", 4) != 0) {
+ return "error: envclause should be in the form env=envar";
+ }
+ if ((envclause[4] == '\0')
+ || ((envclause[4] == '!') && (envclause[5] == '\0'))) {
+ return "error: missing environment variable name. envclause should be in the form env=envar ";
+ }
+ condition_var = apr_pstrdup(cmd->pool, &envclause[4]);
}
if ((colon = strchr(hdr, ':')))
@@ -549,7 +549,7 @@
&headers_module);
if (serverconf->fixup_out->nelts || dirconf->fixup_out->nelts) {
- ap_add_output_filter("FIXUP_HEADERS_OUT", NULL, r, r->connection);
+ ap_add_output_filter("FIXUP_HEADERS_OUT", NULL, r, r->connection);
}
}
@@ -562,7 +562,7 @@
&headers_module);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, f->r->server,
- "headers: ap_headers_output_filter()");
+ "headers: ap_headers_output_filter()");
/* do the fixup */
do_headers_fixup(f->r, hdr_out, serverconf->fixup_out);