httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_negotiation.c
Date Tue, 01 Jan 2002 19:09:05 GMT
wrowe       02/01/01 11:09:05

  Modified:    modules/mappers mod_negotiation.c
  Log:
    Need a null language_priority array for an either/or choice in the
    conf merge.  This does so.  The merges should be significantly quicker.
  
  Revision  Changes    Path
  1.89      +6 -3      httpd-2.0/modules/mappers/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- mod_negotiation.c	1 Jan 2002 19:01:39 -0000	1.88
  +++ mod_negotiation.c	1 Jan 2002 19:09:05 -0000	1.89
  @@ -106,7 +106,7 @@
       neg_dir_config *new = (neg_dir_config *) apr_palloc(p, sizeof(neg_dir_config));
   
       new->forcelangpriority = FLP_UNDEF;
  -    new->language_priority = apr_array_make(p, 4, sizeof(char *));
  +    new->language_priority = NULL;
       return new;
   }
   
  @@ -128,9 +128,12 @@
   					 const char *lang)
   {
       neg_dir_config *n = n_;
  -    apr_array_header_t *arr = n->language_priority;
  -    const char **langp = (const char **) apr_array_push(arr);
  +    const char **langp;
   
  +    if (!n->language_priority)
  +        n->language_priority = apr_array_make(cmd->pool, 4, sizeof(char *));
  +
  +    langp = (const char **) apr_array_push(n->language_priority);
       *langp = lang;
       return NULL;
   }
  
  
  

Mime
View raw message