From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 5 Oct 2008 09:47:34 +0000 (+1300)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_2_0_1~1386^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65a15248e5ab38a62fad8b64eeac3f5748789ca8;p=thirdparty%2Fsquid.git

Merge from trunk
---

65a15248e5ab38a62fad8b64eeac3f5748789ca8
diff --cc errors/Makefile.am
index 593abf3b1a,6c53194645..79839d25aa
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@@ -72,15 -70,7 +72,15 @@@ install-data-local
  			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
  		done; \
  	  fi \
 -	done
 +	done; \
-         $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
-         @if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
-                 echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
++        $(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET).default; \
++        @if test -f $(DEFAULT_STYLESHEET) ; then \
++                echo "$@ will not overwrite existing $(DEFAULT_STYLESHEET)" ; \
 +        else \
-                 echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
-                 $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
++                echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET)"; \
++                $(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET); \
 +        fi
 +
  
  uninstall-local:
  	@ for l in $(LANGUAGES); do \
diff --cc src/cf.data.pre
index e5655511ed,452e0c5910..79775c4226
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@@ -4786,16 -4800,20 +4800,30 @@@ DOC_STAR
  	http://wiki.squid-cache.org/Translations
  DOC_END
  
+ NAME: error_log_languages
+ IFDEF: USE_ERR_LOCALES
+ TYPE: onoff
+ LOC: Config.errorLogMissingLanguages
+ DEFAULT: on
+ DOC_START
+ 	Log to cache.log what languages users are attempting to
+ 	auto-negotiate for translations.
+ 
+ 	Successful negotiations are not logged. Only failures
+ 	have meaning to indicate that Squid may need an upgrade
+ 	of is error page translations.
+ DOC_END
+ 
 +NAME: err_page_stylesheet
 +TYPE: string
 +LOC: Config.errorStylesheet
 +DEFAULT: @DEFAULT_CONFIG_DIR@/errorpage.css
 +DOC_START
 +	CSS Stylesheet to pattern the display of Squid default error pages.
 +
 +	For information on CSS see http://www.w3.org/Style/CSS/
 +DOC_END
 +
  NAME: err_html_text
  TYPE: eol
  LOC: Config.errHtmlText
diff --cc src/structs.h
index 77b905b66a,6057b4ba42..03d12d298a
--- a/src/structs.h
+++ b/src/structs.h
@@@ -550,8 -550,8 +550,9 @@@ struct SquidConfi
      char *errorDirectory;
  #if USE_ERR_LOCALES
      char *errorDefaultLanguage;
+     int errorLogMissingLanguages;
  #endif
 +    char *errorStylesheet;
  
      struct
      {