/[mod_ua_charset]/mod_ua_charset.c

This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!

Diff of /mod_ua_charset.c

Parent Directory | Revision Log | View Patch Patch

-revision 1.1 by dpavlin,
Mon Apr  3 13:39:00 2000 UTC
+revision 1.3 by dpavlin,
Tue Apr 18 06:56:17 2000 UTC
 Line 1
  /* ====================================================================
   * Copyright (c) 1995-1998 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *    software must display the following acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * 4. The names "Apache Server" and "Apache Group" must not be used to
   *    endorse or promote products derived from this software without
   *    prior written permission. For written permission, please contact
   *    apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *    acknowledgment:
   *    "This product includes software developed by the Apache Group
   *    for use in the Apache HTTP server project (http://www.apache.org/)."
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group and was originally based
   * on public domain software written at the National Center for
   * Supercomputing Applications, University of Illinois, Urbana-Champaign.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see <http://www.apache.org/>.
   *
   */
  /* charset module
   *
   */
  #include "httpd.h"
- #include "http_config.h"
+ #include "http_core.h"
- #include "http_core.h"
+ #include "http_config.h"
  module MODULE_VAR_EXPORT ua_charset_module;
- static int add_charset_header(request_rec *r)
+ static int add_charset_header(request_rec * r)
  {
-     char *ua,*ct;
+         const char *ua, *ct;
-         if (ua = ap_table_get(r->headers_in, "User-Agent")) {
+         ua = ap_table_get(r->headers_in, "User-Agent");
-                 ap_table_setn(r->headers_out, "X-User-Agent", ua);
+         /*ct = ap_table_get(r->headers_in, "Content-Type"); */
-         }
+         /**** Isn't this better? */
+         ct = r->content_type;
- #if 0
+         if (ua != NULL)
-         if (ct = ap_table_get(r->headers_in, "Content-type")) {
+                 ap_table_setn(r->headers_out, "X-User-Agent", ua);
-                 ap_table_setn(r->headers_out, "X-Content-type", ct);
+         else
-         }
+                 ua = "<unknown>";
-         if (strstr(ct,"text/html")) {
+ #if 1
-                 return DECLINED;        /* don't mess with other types */
+         if (ct != NULL)
-         }
+                 ap_table_setn(r->headers_out, "X-Content-Type", ct);
+         if (strstr(ct, "text/html") == NULL)
-         if (strstr(ua,"Mac")) {
+                 return DECLINED;        /* Don't mess with other types */
-                 if (strstr(ua,"MSIE")) {
+         if (strstr(ua, "Mac") != NULL) {
-                         r->content_type = "text/html; charset=x-mac-roman";
+                 if (strstr(ua, "MSIE") != NULL)
-                 } else {
+                         r->content_type = "text/html; charset=x-mac-roman";
-                         r->content_type = "text/html; charset=MacCE";
+                 else
-                 }
+                         r->content_type = "text/html; charset=MacCE";
-         } else {
+         } else
                  r->content_type = "text/html; charset=iso-8859-2";
-         }
+ #endif
- #endif
+         return OK;
-         return OK;
+ }
-         return DECLINED;
+ module MODULE_VAR_EXPORT ua_charset_module = {
- }
+         STANDARD_MODULE_STUFF,
+         NULL,                   /* initializer */
- module MODULE_VAR_EXPORT ua_charset_module = {
+         NULL,                   /* dir config creater */
-     STANDARD_MODULE_STUFF,
+         NULL,                   /* dir merger --- default is to override */
-     NULL,                       /* initializer */
+         NULL,                   /* server config */
-     NULL,                       /* dir config creater */
+         NULL,                   /* merge server configs */
-     NULL,                       /* dir merger --- default is to override */
+         NULL,                   /* command table */
-     NULL,                       /* server config */
+         NULL,                   /* handlers */
-     NULL,                       /* merge server configs */
+         NULL,                   /* filename translation */
-     NULL,                       /* command table */
+         NULL,                   /* check_user_id */
-     NULL,                       /* handlers */
+         NULL,                   /* check auth */
-     NULL,                       /* filename translation */
+         NULL,                   /* check access */
-     NULL,                       /* check_user_id */
+         NULL,                   /* type_checker */
-     NULL,                       /* check auth */
+         add_charset_header,     /* fixups */
-     NULL,                       /* check access */
+         NULL,                   /* logger */
-     NULL,                       /* type_checker */
+         NULL,                   /* header parser */
-     add_charset_header,         /* fixups */
+         NULL,                   /* child_init */
-     NULL,                       /* logger */
+         NULL,                   /* child_exit */
-     NULL,                       /* header parser */
+         NULL                    /* post read-request */
-     NULL,                       /* child_init */
+ };
-     NULL,                       /* child_exit */
-     NULL                        /* post read-request */
- };

 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.3
 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.3
-Removed from v.1.1
+Added in v.1.3

	ViewVC Help
Powered by ViewVC 1.1.26