httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_headers.c
Date Wed, 02 Aug 2000 02:30:24 GMT
trawick     00/08/01 19:30:24

  Modified:    src/modules/standard mod_headers.c
  Log:
  Use the AP_INIT_TAKE23() macro to clean up a maintainer-mode warning,
  then fix the warnings resulting from AP_INIT_TAKE23() :)
  
  Revision  Changes    Path
  1.11      +8 -4      apache-2.0/src/modules/standard/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_headers.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_headers.c	2000/05/27 22:40:36	1.10
  +++ mod_headers.c	2000/08/02 02:30:23	1.11
  @@ -102,6 +102,7 @@
    *
    */
   
  +#include "apr_strings.h"
   #include "httpd.h"
   #include "http_config.h"
   #include "http_request.h"
  @@ -116,7 +117,7 @@
   typedef struct {
       hdr_actions action;
       char *header;
  -    char *value;
  +    const char *value;
   } header_entry;
   
   /*
  @@ -155,8 +156,11 @@
   }
   
   
  -static const char *header_cmd(cmd_parms *cmd, headers_conf * dirconf, char *action, char
*hdr, char *value)
  +static const char *header_cmd(cmd_parms *cmd, void *indirconf,
  +                              const char *action, const char *inhdr, const char *value)
   {
  +    headers_conf *dirconf = indirconf;
  +    char *hdr = ap_pstrdup(cmd->pool, inhdr);
       header_entry *new;
       server_rec *s = cmd->server;
       headers_conf *serverconf =
  @@ -199,8 +203,8 @@
   
   static const command_rec headers_cmds[] =
   {
  -    {"Header", header_cmd, NULL, OR_FILEINFO, TAKE23,
  -     "an action, header and value"},
  +    AP_INIT_TAKE23("Header", header_cmd, NULL, OR_FILEINFO,
  +                   "an action, header and value"),
       {NULL}
   };
   
  
  
  

Mime
View raw message