cvs commit: apache/src mod_negotiation.c

[Paul Sutton]

pcs         96/10/25 07:58:43

  Modified:    src       mod_negotiation.c
  Log:
  Fixed bug in type-map processing which meant it was no longer ignoring
  any initial line giving the URI of the negotiable resource. Also
  stopping a Content-Type line on its own from being treated as a
  variant with no name.
  
  Revision  Changes    Path
  1.21      +2 -5      apache/src/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -C3 -r1.20 -r1.21
  *** mod_negotiation.c 1996/10/20 18:03:36     1.20
  --- mod_negotiation.c 1996/10/25 14:58:42     1.21
  ***************
  *** 241,247 ****
        mime_info->mime_stars = 0;
    
        mime_info->charset_quality = 1.0;
  !     mime_info->type_quality = 1.0;
        mime_info->encoding_quality = 1;
        mime_info->lang_quality = 1.0;
        mime_info->accept_type_quality = 1.0;
  --- 241,247 ----
        mime_info->mime_stars = 0;
    
        mime_info->charset_quality = 1.0;
  !     mime_info->type_quality = 0.0;
        mime_info->encoding_quality = 1;
        mime_info->lang_quality = 1.0;
        mime_info->accept_type_quality = 1.0;
  ***************
  *** 656,665 ****
                mime_info.description = get_token (neg->pool, &body, 0);
            }
        } else {
  ! #ifdef NOTDEF
  !         if (mime_info.quality > 0)
  ! #endif
  !         if (*mime_info.file_name)
                {
                    void *new_var = push_array (neg->avail_vars);
                    memcpy (new_var, (void *)&mime_info, sizeof (var_rec));
  --- 656,662 ----
                mime_info.description = get_token (neg->pool, &body, 0);
            }
        } else {
  !         if (mime_info.type_quality > 0 && *mime_info.file_name)
                {
                    void *new_var = push_array (neg->avail_vars);
                    memcpy (new_var, (void *)&mime_info, sizeof (var_rec));