Received: by taz.hyperreal.com (8.7.5/V2.0) id NAA10012;
 Thu, 15 Aug 1996 13:15:48 -0700 (PDT)
Received: by taz.hyperreal.com (8.7.5/V2.0) id NAA09994;
 Thu, 15 Aug 1996 13:15:45 -0700 (PDT)
Date: Thu, 15 Aug 1996 13:15:45 -0700 (PDT)
From: Alexei Kosut <akosut@hyperreal.com>
Message-Id: <199608152015.NAA09994@taz.hyperreal.com>
To: apache-cvs@hyperreal.com
Subject: cvs commit: apache/src mod_negotiation.c
Sender: owner-apache-cvs@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com

akosut      96/08/15 13:15:44

  Modified:    src       mod_negotiation.c
  Log:
  In the absense of other considerations, cause Apache to send the smallest
  variant, even if the types are different (Accept-header order should not
  make a difference - the client would have sent us a q-value if it cared).
  
  Revision  Changes    Path
  1.16      +1 -3      apache/src/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -C3 -r1.15 -r1.16
  *** mod_negotiation.c	1996/08/15 20:12:10	1.15
  --- mod_negotiation.c	1996/08/15 20:15:42	1.16
  ***************
  *** 1026,1036 ****
    			    || (variant->lang_index == best->lang_index
    				&& ((levcmp = level_cmp (variant, best)) == 1
    				    || (levcmp == 0
  - 					&& !strcmp (variant->type_name,
  - 						    best->type_name)
    					&& (find_content_length(neg, variant)
    					    <
  ! 				find_content_length(neg, best)))))))))
    	    {
    		best = variant;
    		best_quality = q;
  --- 1026,1034 ----
    			    || (variant->lang_index == best->lang_index
    				&& ((levcmp = level_cmp (variant, best)) == 1
    				    || (levcmp == 0
    					&& (find_content_length(neg, variant)
    					    <
  ! 				         find_content_length(neg, best)))))))))
    	    {
    		best = variant;
    		best_quality = q;