From ef0bf8170c69d4b6f9eb83bbdbe64a8e550825f8 Mon Sep 17 00:00:00 2001 From: dgaudet Date: Sat, 19 Jul 1997 08:17:16 +0000 Subject: [PATCH] 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 --- APACHE_1_2_X/src/modules/standard/mod_negotiation.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/APACHE_1_2_X/src/modules/standard/mod_negotiation.c b/APACHE_1_2_X/src/modules/standard/mod_negotiation.c index 22645b66a42..474b408792f 100644 --- a/APACHE_1_2_X/src/modules/standard/mod_negotiation.c +++ b/APACHE_1_2_X/src/modules/standard/mod_negotiation.c @@ -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' || -- 2.47.2