Commit 9afc0130 authored by dgaudet's avatar dgaudet
Browse files

Minor tweak to fix a problem with the fix to PR#94. 

Reviewed by:	Alexei Kosut, Randy Terbush
Submitted by:	Paul Sutton
Obtained from:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78663 13f79535-47bb-0310-9956-ffa450edef68
parent 111c65f0

APACHE_1_2_X/src/modules/standard/mod_negotiation.c

+2 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,7 @@ int is_variant_better_na(negotiation_state *neg, var_rec *variant, var_rec *best 
           the same charset quality, then we prefer this variant */

        if (variant->charset_quality == best->charset_quality &&

            (variant->content_charset != NULL &&

             *variant->content_charset != '\0' &&

             strcmp(variant->content_charset, "iso-8859-1") != 0) &&

            (best->content_charset == NULL ||

             *best->content_charset == '\0' ||
@@ -1545,6 +1546,7 @@ float is_variant_better(negotiation_state *neg, var_rec *variant, var_rec *best, 
       the same charset quality, then we prefer this variant */

    if (variant->charset_quality > best->charset_quality ||

	((variant->content_charset != NULL &&

          *variant->content_charset != '\0' &&

	  strcmp(variant->content_charset, "iso-8859-1") != 0) &&

	 (best->content_charset == NULL ||

	  *best->content_charset == '\0' ||