dgaudet 97/07/19 01:17:18
Modified: src Tag: APACHE_1_2_X mod_negotiation.c
Log:
Minor tweak to fix a problem with the fix to PR#94.
Reviewed by: Alexei Kosut, Randy Terbush
Submitted by: Paul Sutton
Revision Changes Path
No revision
No revision
1.40.2.2 +2 -0 apache/src/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_negotiation.c,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -C3 -r1.40.2.1 -r1.40.2.2
*** mod_negotiation.c 1997/06/27 02:20:19 1.40.2.1
--- mod_negotiation.c 1997/07/19 08:17:16 1.40.2.2
***************
*** 1443,1448 ****
--- 1443,1449 ----
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,1550 ****
--- 1546,1552 ----
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' ||
