Merge from trunk

diff --cc configure.in
Simple merge

diff --cc src/Makefile.am
index c737da8846e34826d297c9635b7c4f4b5bb3683b,56b7071b05e6fbd88bd3d058ffaeb321071d403d..9131f2aca0b4f000edf4b6404bad0d50a9f08e8a
mode 100644,100755..100755
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am

diff --cc src/cache_cf.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/main.cc
index 73543e97be337470dfe4fa93f380da2065ac3e1a,006a9e6e98f271151663504ed6b42439d6fe1634..28693e0183e9aec16ac60a86e15e7752fb90a039
--- 1/src/main.cc
--- 2/src/main.cc
+++ b/src/main.cc
@@@ -1152,30 -1150,7 +1153,29 @@@ extern "C" void WINAP
  int
  main(int argc, char **argv)
  #endif
 +{
 +    SquidMainSafe(argc, argv);
 +}
 +
 +static int
 +SquidMainSafe(int argc, char **argv)
 +{
 +    try {
 +        return SquidMain(argc, argv);
 +      }
 +    catch (const TextException &e) {
 +              // XXX: add TextException::print
 +        std::cerr << "dying from unhandled exception: " << e.message << std::endl;
 +      }
 +    catch (...) {
 +        std::cerr << "dying from unhandled exception." << std::endl;
 +      }
 +      return -1;
 +}
 +
 +static int
 +SquidMain(int argc, char **argv)
  {
-     mode_t oldmask;
  #ifdef _SQUID_WIN32_
  
      int WIN32_init_err;