RubyGems - passenger - Versions diffs - 5.3.3 → 5.3.4 - Mend

passenger 5.3.3 → 5.3.4

Files changed (1070) hide show

data/src/cxx_supportlib/vendor-modified/boost/core/ref.hpp CHANGED

@@ -8,8 +8,8 @@
 #endif
 #include <boost/config.hpp>
-#include <boost/utility/addressof.hpp>
-#include <boost/detail/workaround.hpp>
+#include <boost/config/workaround.hpp>
+#include <boost/core/addressof.hpp>
 //
 //  ref.hpp - ref/cref, useful helper functions

data/src/cxx_supportlib/vendor-modified/boost/cstdint.hpp CHANGED

@@ -34,6 +34,17 @@
 #endif
 #include <boost/config.hpp>
+//
+// For the following code we get several warnings along the lines of:
+//
+// boost/cstdint.hpp:428:35: error: use of C99 long long integer constant
+//
+// So we declare this a system header to suppress these warnings.
+// See also https://github.com/boostorg/config/issues/190
+//
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+#pragma GCC system_header
+#endif
 //
 // Note that GLIBC is a bit inconsistent about whether int64_t is defined or not
@@ -60,7 +71,7 @@
 #   include <stdint.h>
 // There is a bug in Cygwin two _C macros
-#   if defined(__STDC_CONSTANT_MACROS) && defined(__CYGWIN__)
+#   if defined(INTMAX_C) && defined(__CYGWIN__)
 #     undef INTMAX_C
 #     undef UINTMAX_C
 #     define INTMAX_C(c) c##LL
@@ -367,14 +378,11 @@ namespace boost
 #include <stddef.h>
 #endif
-// PGI seems to not support intptr_t/uintptr_t properly. BOOST_HAS_STDINT_H is not defined for this compiler by Boost.Config.
-#if !defined(__PGIC__)
 #if (defined(BOOST_WINDOWS) && !defined(_WIN32_WCE)) \
     || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__)) \
-    || defined(__CYGWIN__) \
+    || defined(__CYGWIN__) || defined(__VXWORKS__) \
     || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
-    || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(sun)
+    || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || (defined(sun) && !defined(BOOST_HAS_STDINT_H)) || defined(INTPTR_MAX)
 namespace boost {
     using ::intptr_t;
@@ -393,8 +401,6 @@ namespace boost {
 #endif
-#endif // !defined(__PGIC__)
 #endif // BOOST_CSTDINT_HPP
@@ -413,15 +419,19 @@ INT#_C macros if they're not already defined (John Maddock).
 #if !defined(BOOST__STDC_CONSTANT_MACROS_DEFINED) && \
    (!defined(INT8_C) || !defined(INT16_C) || !defined(INT32_C) || !defined(INT64_C))
 //
-// For the following code we get several warnings along the lines of:
-//
-// boost/cstdint.hpp:428:35: error: use of C99 long long integer constant
-//
-// So we declare this a system header to suppress these warnings.
+// Undef the macros as a precaution, since we may get here if <stdint.h> has failed
+// to define them all, see https://svn.boost.org/trac/boost/ticket/12786
 //
-#if defined(__GNUC__) && (__GNUC__ >= 4)
-#pragma GCC system_header
-#endif
+#undef INT8_C
+#undef INT16_C
+#undef INT32_C
+#undef INT64_C
+#undef INTMAX_C
+#undef UINT8_C
+#undef UINT16_C
+#undef UINT32_C
+#undef UINT64_C
+#undef UINTMAX_C
 #include <limits.h>
 # define BOOST__STDC_CONSTANT_MACROS_DEFINED

data/src/cxx_supportlib/vendor-modified/boost/date_time/adjust_functors.hpp CHANGED

@@ -2,7 +2,7 @@
 #define _DATE_TIME_ADJUST_FUNCTORS_HPP___
 /* Copyright (c) 2002,2003 CrystalClear Software, Inc.
- * Use, modification and distribution is subject to the
+ * Use, modification and distribution is subject to the
  * Boost Software License, Version 1.0. (See accompanying
  * file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
  * Author: Jeff Garland, Bart Garst
@@ -14,26 +14,21 @@
 namespace boost {
 namespace date_time {
   //! Functor to iterate a fixed number of days
   template<class date_type>
-  class day_functor
+  class day_functor
   {
   public:
     typedef typename date_type::duration_type duration_type;
     day_functor(int f) : f_(f) {}
-    duration_type get_offset(const date_type& d) const
+    duration_type get_offset(const date_type&) const
     {
-      // why is 'd' a parameter???
-      // fix compiler warnings
-      d.year();
       return duration_type(f_);
     }
-    duration_type get_neg_offset(const date_type& d) const
+    duration_type get_neg_offset(const date_type&) const
     {
-      // fix compiler warnings
-      d.year();
       return duration_type(-f_);
     }
   private:
@@ -43,7 +38,7 @@ namespace date_time {
   //! Provides calculation to find next nth month given a date
   /*! This adjustment function provides the logic for 'month-based'
-   *  advancement on a ymd based calendar.  The policy it uses
+   *  advancement on a ymd based calendar.  The policy it uses
    *  to handle the non existant end of month days is to back
    *  up to the last day of the month.  Also, if the starting
    *  date is the last day of a month, this functor will attempt
@@ -51,7 +46,7 @@ namespace date_time {
    */
   template<class date_type>
-  class month_functor
+  class month_functor
   {
   public:
     typedef typename date_type::duration_type duration_type;
@@ -60,7 +55,7 @@ namespace date_time {
     typedef typename cal_type::day_type day_type;
     month_functor(int f) : f_(f), origDayOfMonth_(0) {}
-    duration_type get_offset(const date_type& d) const
+    duration_type get_offset(const date_type& d) const
     {
       ymd_type ymd(d.year_month_day());
       if (origDayOfMonth_ == 0) {
@@ -71,11 +66,9 @@ namespace date_time {
         }
       }
       typedef date_time::wrapping_int2<short,1,12> wrap_int2;
-      typedef typename wrap_int2::int_type int_type;
       wrap_int2 wi(ymd.month);
       //calc the year wrap around, add() returns 0 or 1 if wrapped
-      int_type year = wi.add(static_cast<int_type>(f_));
-      year = static_cast<int_type>(year + ymd.year); //calculate resulting year
+      const typename ymd_type::year_type year(static_cast<typename ymd_type::year_type::value_type>(ymd.year + wi.add(f_)));
 //       std::cout << "trace wi: " << wi.as_int() << std::endl;
 //       std::cout << "trace year: " << year << std::endl;
       //find the last day for the new month
@@ -91,7 +84,7 @@ namespace date_time {
       return date_type(year, wi.as_int(), dayOfMonth) - d;
     }
     //! Returns a negative duration_type
-    duration_type get_neg_offset(const date_type& d) const
+    duration_type get_neg_offset(const date_type& d) const
     {
       ymd_type ymd(d.year_month_day());
       if (origDayOfMonth_ == 0) {
@@ -102,11 +95,9 @@ namespace date_time {
         }
       }
       typedef date_time::wrapping_int2<short,1,12> wrap_int2;
-      typedef typename wrap_int2::int_type int_type;
       wrap_int2 wi(ymd.month);
       //calc the year wrap around, add() returns 0 or 1 if wrapped
-      int_type year = wi.subtract(static_cast<int_type>(f_));
-      year = static_cast<int_type>(year + ymd.year); //calculate resulting year
+      const typename ymd_type::year_type year(static_cast<typename ymd_type::year_type::value_type>(ymd.year + wi.subtract(f_)));
       //find the last day for the new month
       day_type resultingEndOfMonthDay(cal_type::end_of_month_day(year, wi.as_int()));
       //original was the end of month -- force to last day of month
@@ -127,24 +118,19 @@ namespace date_time {
   //! Functor to iterate a over weeks
   template<class date_type>
-  class week_functor
+  class week_functor
   {
   public:
     typedef typename date_type::duration_type duration_type;
     typedef typename date_type::calendar_type calendar_type;
     week_functor(int f) : f_(f) {}
-    duration_type get_offset(const date_type& d) const
+    duration_type get_offset(const date_type&) const
     {
-      // why is 'd' a parameter???
-      // fix compiler warnings
-      d.year();
-      return duration_type(f_*calendar_type::days_in_week());
+      return duration_type(f_*static_cast<int>(calendar_type::days_in_week()));
     }
-    duration_type get_neg_offset(const date_type& d) const
+    duration_type get_neg_offset(const date_type&) const
     {
-      // fix compiler warnings
-      d.year();
-      return duration_type(-f_*calendar_type::days_in_week());
+      return duration_type(-f_*static_cast<int>(calendar_type::days_in_week()));
     }
   private:
     int f_;
@@ -152,17 +138,17 @@ namespace date_time {
   //! Functor to iterate by a year adjusting for leap years
   template<class date_type>
-  class year_functor
+  class year_functor
   {
   public:
     //typedef typename date_type::year_type year_type;
     typedef typename date_type::duration_type duration_type;
     year_functor(int f) : _mf(f * 12) {}
-    duration_type get_offset(const date_type& d) const
+    duration_type get_offset(const date_type& d) const
     {
       return _mf.get_offset(d);
     }
-    duration_type get_neg_offset(const date_type& d) const
+    duration_type get_neg_offset(const date_type& d) const
     {
       return _mf.get_neg_offset(d);
     }
@@ -170,7 +156,7 @@ namespace date_time {
     month_functor<date_type> _mf;
   };
 } }//namespace date_time

data/src/cxx_supportlib/vendor-modified/boost/date_time/c_local_time_adjustor.hpp CHANGED

@@ -17,6 +17,7 @@
 #include <boost/throw_exception.hpp>
 #include <boost/date_time/compiler_config.hpp>
 #include <boost/date_time/c_time.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 namespace boost {
 namespace date_time {
@@ -42,12 +43,14 @@ namespace date_time {
       }
       date_duration_type dd = t.date() - time_t_start_day;
       time_duration_type td = t.time_of_day();
-      std::time_t t2 = static_cast<std::time_t>(dd.days())*86400 +
-                       static_cast<std::time_t>(td.hours())*3600 +
-                       static_cast<std::time_t>(td.minutes())*60 +
-                       td.seconds();
+      uint64_t t2 = static_cast<uint64_t>(dd.days())*86400 +
+                    static_cast<uint64_t>(td.hours())*3600 +
+                    static_cast<uint64_t>(td.minutes())*60 +
+                    td.seconds();
+      // detect y2038 issue and throw instead of proceed with bad time
+      std::time_t tv = boost::numeric_cast<std::time_t>(t2);
       std::tm tms, *tms_ptr;
-      tms_ptr = c_time::localtime(&t2, &tms);
+      tms_ptr = c_time::localtime(&tv, &tms);
       date_type d(static_cast<unsigned short>(tms_ptr->tm_year + 1900),
                   static_cast<unsigned short>(tms_ptr->tm_mon + 1),
                   static_cast<unsigned short>(tms_ptr->tm_mday));

data/src/cxx_supportlib/vendor-modified/boost/date_time/date_duration.hpp CHANGED

@@ -52,6 +52,10 @@ namespace date_time {
     {
         return days_;
     }
+    special_values as_special() const
+    {
+        return days_.as_special();
+    }
     bool is_special()const
     {
         return days_.is_special();

data/src/cxx_supportlib/vendor-modified/boost/date_time/date_formatting.hpp CHANGED

@@ -11,6 +11,7 @@
 #include "boost/date_time/iso_format.hpp"
 #include "boost/date_time/compiler_config.hpp"
+#include <boost/io/ios_state.hpp>
 #include <string>
 #include <sstream>
 #include <iomanip>
@@ -51,6 +52,7 @@ namespace date_time {
         }
         case month_as_integer:
         {
+          boost::io::basic_ios_fill_saver<charT> ifs(os);
           os << std::setw(2) << std::setfill(os.widen('0')) << month.as_number();
           break;
         }

data/src/cxx_supportlib/vendor-modified/boost/date_time/date_formatting_locales.hpp CHANGED

@@ -17,6 +17,7 @@
 #include "boost/date_time/iso_format.hpp"
 #include "boost/date_time/date_names_put.hpp"
 #include "boost/date_time/parse_format_base.hpp"
+#include <boost/io/ios_state.hpp>
 //#include <string>
 #include <sstream>
 #include <iomanip>
@@ -56,8 +57,8 @@ namespace date_time {
         }
         case month_as_integer:
         {
-          charT fill_char = '0';
-          os << std::setw(2) << std::setfill(fill_char) << month.as_number();
+          boost::io::basic_ios_fill_saver<charT> ifs(os);
+          os << std::setw(2) << std::setfill(os.widen('0')) << month.as_number();
           break;
         }
@@ -132,8 +133,8 @@ namespace date_time {
                         ostream_type& os,
                         const facet_type& f)
     {
+      boost::io::basic_ios_fill_saver<charT> ifs(os);
       std::ostreambuf_iterator<charT> oitr(os);
-      charT fill_char = '0';
       switch (f.date_order()) {
         case ymd_order_iso: {
           os << ymd.year;
@@ -144,7 +145,7 @@ namespace date_time {
           if (f.has_date_sep_chars()) {
             f.day_sep_char(oitr);
           }
-          os  << std::setw(2) << std::setfill(fill_char)
+          os  << std::setw(2) << std::setfill(os.widen('0'))
               << ymd.day;
           break;
         }
@@ -153,7 +154,7 @@ namespace date_time {
           if (f.has_date_sep_chars()) {
           f.day_sep_char(oitr);
           }
-          os  << std::setw(2) << std::setfill(fill_char)
+          os  << std::setw(2) << std::setfill(os.widen('0'))
             << ymd.day;
           if (f.has_date_sep_chars()) {
             f.month_sep_char(oitr);
@@ -162,7 +163,7 @@ namespace date_time {
           break;
         }
         case ymd_order_dmy: {
-          os  << std::setw(2) << std::setfill(fill_char)
+          os  << std::setw(2) << std::setfill(os.widen('0'))
               << ymd.day;
           if (f.has_date_sep_chars()) {
             f.day_sep_char(oitr);

data/src/cxx_supportlib/vendor-modified/boost/date_time/dst_rules.hpp CHANGED

@@ -106,12 +106,12 @@ namespace boost {
                    const time_duration_type& dst_end_offset,
                    const time_duration_type& dst_length_minutes)
       {
-        unsigned int start_minutes =
-          dst_start_offset.hours() * 60 + dst_start_offset.minutes();
-        unsigned int end_minutes =
-          dst_end_offset.hours() * 60 + dst_end_offset.minutes();
-        long length_minutes =
-          dst_length_minutes.hours() * 60 + dst_length_minutes.minutes();
+        unsigned int start_minutes = static_cast<unsigned>(
+          dst_start_offset.hours() * 60 + dst_start_offset.minutes());
+        unsigned int end_minutes = static_cast<unsigned>(
+          dst_end_offset.hours() * 60 + dst_end_offset.minutes());
+        long length_minutes = static_cast<long>(
+          dst_length_minutes.hours() * 60 + dst_length_minutes.minutes());
         return local_is_dst(current_day, time_of_day,
                             dst_start_day, start_minutes,

data/src/cxx_supportlib/vendor-modified/boost/date_time/filetime_functions.hpp CHANGED

@@ -19,10 +19,6 @@
 #if defined(BOOST_HAS_FTIME) // skip this file if no FILETIME
-#if defined(BOOST_USE_WINDOWS_H)
-#  include <windows.h>
-#endif
 #include <boost/cstdint.hpp>
 #include <boost/date_time/time.hpp>
 #include <boost/date_time/date_defs.hpp>
@@ -31,85 +27,6 @@ namespace boost {
 namespace date_time {
-namespace winapi {
-#if !defined(BOOST_USE_WINDOWS_H)
-    extern "C" {
-        struct FILETIME
-        {
-            boost::uint32_t dwLowDateTime;
-            boost::uint32_t dwHighDateTime;
-        };
-        struct SYSTEMTIME
-        {
-            boost::uint16_t wYear;
-            boost::uint16_t wMonth;
-            boost::uint16_t wDayOfWeek;
-            boost::uint16_t wDay;
-            boost::uint16_t wHour;
-            boost::uint16_t wMinute;
-            boost::uint16_t wSecond;
-            boost::uint16_t wMilliseconds;
-        };
-        __declspec(dllimport) void __stdcall GetSystemTimeAsFileTime(FILETIME* lpFileTime);
-        __declspec(dllimport) int __stdcall FileTimeToLocalFileTime(const FILETIME* lpFileTime, FILETIME* lpLocalFileTime);
-        __declspec(dllimport) void __stdcall GetSystemTime(SYSTEMTIME* lpSystemTime);
-        __declspec(dllimport) int __stdcall SystemTimeToFileTime(const SYSTEMTIME* lpSystemTime, FILETIME* lpFileTime);
-    } // extern "C"
-#endif // defined(BOOST_USE_WINDOWS_H)
-    typedef FILETIME file_time;
-    typedef SYSTEMTIME system_time;
-    inline void get_system_time_as_file_time(file_time& ft)
-    {
-#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205))
-        // Some runtime library implementations expect local times as the norm for ctime.
-        file_time ft_utc;
-        GetSystemTimeAsFileTime(&ft_utc);
-        FileTimeToLocalFileTime(&ft_utc, &ft);
-#elif defined(BOOST_HAS_GETSYSTEMTIMEASFILETIME)
-        GetSystemTimeAsFileTime(&ft);
-#else
-        system_time st;
-        GetSystemTime(&st);
-        SystemTimeToFileTime(&st, &ft);
-#endif
-    }
-    /*!
-     * The function converts file_time into number of microseconds elapsed since 1970-Jan-01
-     *
-     * \note Only dates after 1970-Jan-01 are supported. Dates before will be wrapped.
-     *
-     * \note The function is templated on the FILETIME type, so that
-     *       it can be used with both native FILETIME and the ad-hoc
-     *       boost::date_time::winapi::file_time type.
-     */
-    template< typename FileTimeT >
-    inline boost::uint64_t file_time_to_microseconds(FileTimeT const& ft)
-    {
-        /* shift is difference between 1970-Jan-01 & 1601-Jan-01
-        * in 100-nanosecond intervals */
-        const uint64_t shift = 116444736000000000ULL; // (27111902 << 32) + 3577643008
-        union {
-            FileTimeT as_file_time;
-            uint64_t as_integer; // 100-nanos since 1601-Jan-01
-        } caster;
-        caster.as_file_time = ft;
-        caster.as_integer -= shift; // filetime is now 100-nanos since 1970-Jan-01
-        return (caster.as_integer / 10); // truncate to microseconds
-    }
-} // namespace winapi
 //! Create a time object from an initialized FILETIME struct.
 /*!
  * Create a time object from an initialized FILETIME struct.
@@ -119,7 +36,7 @@ namespace winapi {
  *
  * \note The function is templated on the FILETIME type, so that
  *       it can be used with both native FILETIME and the ad-hoc
- *       boost::date_time::winapi::file_time type.
+ *       boost::detail::winapi::FILETIME_ type.
  */
 template< typename TimeT, typename FileTimeT >
 inline
@@ -132,20 +49,17 @@ TimeT time_from_ftime(const FileTimeT& ft)
     // https://svn.boost.org/trac/boost/ticket/2523
     // Since this function can be called with arbitrary times, including ones that
     // are before 1970-Jan-01, we'll have to cast the time a bit differently,
-    // than it is done in the file_time_to_microseconds function. This allows to
+    // than it is done in the microsec_clock::file_time_to_microseconds function. This allows to
     // avoid integer wrapping for dates before 1970-Jan-01.
-    union {
-        FileTimeT as_file_time;
-        uint64_t as_integer; // 100-nanos since 1601-Jan-01
-    } caster;
-    caster.as_file_time = ft;
-    uint64_t sec = caster.as_integer / 10000000UL;
-    uint32_t sub_sec = (caster.as_integer % 10000000UL) // 100-nanoseconds since the last second
+    // 100-nanos since 1601-Jan-01
+    uint64_t ft_as_integer = (static_cast< uint64_t >(ft.dwHighDateTime) << 32) | static_cast< uint64_t >(ft.dwLowDateTime);
+    uint64_t sec = ft_as_integer / 10000000UL;
+    uint32_t sub_sec = static_cast< uint32_t >(ft_as_integer % 10000000UL) // 100-nanoseconds since the last second
 #if !defined(BOOST_DATE_TIME_POSIX_TIME_STD_CONFIG)
-        / 10; // microseconds since the last second
+        / 10U; // microseconds since the last second
 #else
-        * 100; // nanoseconds since the last second
+        * 100U; // nanoseconds since the last second
 #endif
     // split sec into usable chunks: days, hours, minutes, & seconds