Several changes:

 - Wt 4 specific:
   - Remove old throwing getCookie and rename getCookieValue to getCookie
   - Require CMake 3.1 or higher
   - Use CMAKE_CXX_STANDARD instead of WT_CPP_11_MODE
   - Use .h files in includes in WFileUpload.C
   - WLocale can be globally set (threadlocal)
   - Utils::st* casts now use std::invalid_argument exceptions so we use the
     same exception for when nothing can be converted
   - use std::invalid_argument for string to int conversion in blog example
 - Merges from master:
   - Fixed crash on missing err parameter in jserror request
   - WebSockets frame size integer overflow check
   - Fix #5597: iOS does not detect click events on
     non-clickable objects, detect 'clicks' with
     touchevents instead
   - Removed obsolete WtSoundManager.as
   - for wtisapi static library create named PDB files
   - SessionProcessManager: sessionsMutex_ should be mutable for use in sessions()
   - Generate documentation for WFlags
   - Only retrigger click on document when object is a WPopupWidget,
     fixes issue with WPopupMenu
   - Added missing lock in SessionProcessManager::sessions()
   - Fixed WTableView data disappearing with column resizes bug
   - Clearer exception for collection<C>::iterator::operator*
   - Added missing WT_API for Wt::utf8
   - Omit default ports for corresponding protocols (Suggestion of issue #2018)
   - Added documentation that submenu of popup menu should be a popup menu
   - Charts: create paint device (if there is none) before font metrics check
   - Updated overview with latest command line arguments, clarified
     --http(s)address (issue #5586)
   - Fixed single touch without rubberband effect causing series select
   - Updated sqlite to 3.17.0
   - Issue #5574: more documentation for font selection of WPdfRenderer
   - more space for text in wide legend columns

Author: RockinRoel

CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 
 SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE true)
 
@@ -109,12 +109,11 @@ OPTION(ENABLE_LIBWTDBO "Build Wt::Dbo" ON)
 OPTION(WT_NO_STD_LOCALE "Build Wt to run on a system without std::locale support" OFF)
 OPTION(WT_NO_STD_WSTRING "Build Wt to run on a system without std::wstring support" OFF)
 OPTION(ENABLE_OPENGL "Build Wt with support for server-side opengl rendering" ON)
+OPTION(WT_WARN_HEADER_MISSING_H "Output a warning if a Wt header without .h extension is included (deprecated since Wt 4.0.0)" ON)
 
-IF(NOT MSVC)
-  #MSVC always enables its c++11 features by default
-  SET(WT_CPP_11_MODE "-std=c++11" CACHE STRING "C++ mode to compile Wt in (defaults to -std=c++11, you can set it to -std=c++11, -std=c++0x, -std=c++14,...)")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WT_CPP_11_MODE}")
-ENDIF(NOT MSVC)
+IF(NOT CMAKE_CXX_STANDARD)
+  SET(CMAKE_CXX_STANDARD 11)
+ENDIF(NOT CMAKE_CXX_STANDARD)
 
 IF(MSVC)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
@@ -417,7 +416,7 @@ ENDIF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick")
 
 SET(WT_CPP17_ANY_DEFAULT_IMPLEMENTATION "thelink2012")
 SET(WT_CPP17_ANY_IMPLEMENTATION ${WT_CPP17_ANY_DEFAULT_IMPLEMENTATION} CACHE STRING
-"Implementation for Wt::cpp17::any. Defaults to \"thelink2012\": an included implementation of any by GitHub user thelink2012. Use \"std\" for std::any, or \"experimental\" for std::experimental::any, if compiler support is available. You may have to change WT_CPP_11_MODE to enable C++17 support in the compiler.")
+  "Implementation for Wt::cpp17::any. Defaults to \"thelink2012\": an included implementation of any by GitHub user thelink2012. Use \"std\" for std::any, or \"experimental\" for std::experimental::any, if compiler support is available. You may have to change CMAKE_CXX_STANDARD to enable C++17 support in the compiler.")
 
 IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
   MESSAGE(STATUS "Informational: WT_CPP17_ANY_IMPLEMENTATION should be thelink2012, experimental, or std")

Doxyfile

@@ -138,7 +138,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        = /home/dietrich/project/wt/git/wt
+STRIP_FROM_PATH        = /home/roel/project/wt/git/wt
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells

WConfig.h.in

@@ -42,6 +42,8 @@
 #cmakedefine WT_ASIO_IS_BOOST_ASIO
 #cmakedefine WT_ASIO_IS_STANDALONE_ASIO
 
+#cmakedefine WT_WARN_HEADER_MISSING_H
+
 // our win32: WIN32 (gcc) or _WIN32 (MSC)
 #if defined(WIN32) || defined(_WIN32)
 #define WT_WIN32 1

doc/main

@@ -818,56 +818,96 @@ The configuration file syntax is line based:
 Allowed options:
 
 General options:
-  -h [ --help ]                 produce help message
-  -t [ --threads ] arg (=10)    number of threads
-  --servername arg (=vierwerf)  servername (IP address or DNS name)
-  --docroot arg                 document root for static files, optionally 
-                                followed by a comma-separated list of paths 
-                                with static files (even if they are within a 
-                                deployment path), after a ';' 
-                                
-                                e.g. --docroot=".;/favicon.ico,/resources,/style"
-
-   --approot arg                application root for private support files; if 
-                                unspecified, the value of the environment 
-                                variable $WT_APP_ROOT is used, or else the 
-                                current working directory
-  --docroot-static arg          comma-separated list of paths that correspond 
-                                to static files, even if they are within a 
-                                deployment path
-  --errroot arg                 root for error pages
-  --accesslog arg               access log file (defaults to stdout)
-  --no-compression              do not use compression
-  --deploy-path arg (=/)        location for deployment
-  --session-id-prefix arg       prefix for session-id's (overrides 
-                                wt_config.xml setting)
-  -p [ --pid-file ] arg         path to pid file (optional)
-  -c [ --config ] arg           location of wt_config.xml; if unspecified, the 
-                                value of the environment variable 
-                                $WT_CONFIG_XML is used, or else the built-in 
-                                default (/etc/wt/wt_config.xml) is tried, or 
-                                else built-in defaults are used
-  --max-memory-request-size arg threshold for request size (bytes), for 
-                                spooling the entire request to disk to avoid, 
-                                to avoid DoS
-  --gdb                         do not shutdown when receiving Ctrl-C (and let 
-                                gdb break instead)
+  -h [ --help ]                         produce help message
+  -t [ --threads ] arg (=-1)            number of threads (-1 indicates that
+                                        num_threads from wt_config.xml is to be
+                                        used, which defaults to 10)
+  --servername arg                      servername (IP address or DNS name)
+  --docroot arg                         document root for static files,
+                                        optionally followed by a
+                                        comma-separated list of paths with
+                                        static files (even if they are within a
+                                        deployment path), after a ';'
+
+                                        e.g. --docroot=".;/favicon.ico,/resourc
+                                        es,/style"
+
+  --approot arg                         application root for private support
+                                        files; if unspecified, the value of the
+                                        environment variable $WT_APP_ROOT is
+                                        used, or else the current working
+                                        directory
+  --errroot arg                         root for error pages
+  --accesslog arg                       access log file (defaults to stdout),
+                                        to disable access logging completely,
+                                        use --accesslog=-
+  --no-compression                      do not use compression
+  --deploy-path arg (=/)                location for deployment
+  --session-id-prefix arg               prefix for session IDs (overrides
+                                        wt_config.xml setting)
+  -p [ --pid-file ] arg                 path to pid file (optional)
+  -c [ --config ] arg                   location of wt_config.xml; if
+                                        unspecified, the value of the
+                                        environment variable $WT_CONFIG_XML is
+                                        used, or else the built-in default
+                                        (/etc/wt/wt_config.xml) is tried,
+                                        or else built-in defaults are used
+  --max-memory-request-size arg (=131072)
+                                        threshold for request size (bytes), for
+                                        spooling the entire request to disk, to
+                                        avoid DoS
+  --gdb                                 do not shutdown when receiving Ctrl-C
+                                        (and let gdb break instead)
 
 HTTP/WebSocket server options:
-  --http-address arg    IPv4 (e.g. 0.0.0.0) or IPv6 Address (e.g. 0::0)
-  --http-port arg (=80) HTTP port (e.g. 80)
+  --http-address arg                    IPv4 (e.g. 0.0.0.0) or IPv6 Address
+                                        (e.g. 0::0). You must specify either
+                                        this option or --https-address (or
+                                        both)
+  --http-port arg (=80)                 HTTP port (e.g. 80)
 
 HTTPS/Secure WebSocket server options:
-  --https-address arg     IPv4 (e.g. 0.0.0.0) or IPv6 Address (e.g. 0::0)
-  --https-port arg (=443) HTTPS port (e.g. 443)
-  --ssl-certificate arg   SSL server certificate chain file
-                          e.g. "/etc/ssl/certs/vsign1.pem"
-  --ssl-private-key arg   SSL server private key file
-                          e.g. "/etc/ssl/private/company.pem"
-  --ssl-tmp-dh arg        File for temporary Diffie-Hellman parameters
-                          e.g. "/etc/ssl/dh512.pem"
-  --ssl-client-verification arg (=none)	Enable SSL Client Certificate verification.
-										Can be required, once, optional or none
+  --https-address arg                   IPv4 (e.g. 0.0.0.0) or IPv6 Address
+                                        (e.g. 0::0). You must specify either
+                                        this option or --http-address (or both)
+  --https-port arg (=443)               HTTPS port (e.g. 443)
+  --ssl-certificate arg                 SSL server certificate chain file
+                                        e.g. "/etc/ssl/certs/vsign1.pem"
+  --ssl-private-key arg                 SSL server private key file
+                                        e.g. "/etc/ssl/private/company.pem"
+  --ssl-tmp-dh arg                      File for temporary Diffie-Hellman
+                                        parameters
+                                        e.g. "/etc/ssl/dh512.pem"
+  --ssl-enable-v3                       Switch on SSLv3 support (not
+                                        recommended; disabled by default)
+  --ssl-client-verification arg (=none) The verification mode for client
+                                        certificates.
+                                        This is either 'none', 'optional' or
+                                        'required'. When 'none', the server
+                                        will not request a client certificate.
+                                        When 'optional', the server will
+                                        request a certificate, but the client
+                                        does not have to supply one. With
+                                        'required', the connection will be
+                                        terminated if the client does not
+                                        provide a valid certificate.
+  --ssl-verify-depth arg (=1)           Specifies the maximum length of the
+                                        server certificate chain.
+
+  --ssl-ca-certificates arg             Path to a file containing the
+                                        concatenated trusted CA certificates,
+                                        which can be used to authenticate the
+                                        client. The file should contains a a
+                                        number of PEM-encoded certificates.
+
+  --ssl-cipherlist arg                  List of acceptable ciphers for SSL.
+                                        This list is passed as-is to the SSL
+                                        layer, so see openssl for the proper
+                                        syntax. When empty, the default
+                                        acceptable cipher list will be used.
+                                        Example cipher list string:
+                                        "TLSv1+HIGH:!SSLv2"
+
 
 Settings may be set in the configuration file /etc/wt/wthttpd
 \endcode

examples/CMakeLists.txt

@@ -31,7 +31,7 @@ IF("${CMAKE_CURRENT_LIST_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
   IF(WIN32)
     # preamble to make this a toplevel CMakeLists.txt for Windows, intended
     # for being used 
-    CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+    CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 
     Project(WtExamples)
 

examples/Doxyfile

@@ -24,7 +24,7 @@ ABBREVIATE_BRIEF       = "The $name class" \
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = /home/kdforc0/project/wt/examples
+STRIP_FROM_PATH        = /home/roel/project/wt/examples
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO

examples/blog/view/BlogView.C

@@ -35,15 +35,12 @@
 namespace dbo = Wt::Dbo;
 
 namespace {
-  struct ConversionException : public std::exception {
-  };
-
   static int try_stoi(const std::string &v)
   {
     std::size_t pos;
     auto result = std::stoi(v, &pos);
     if (pos != v.length())
-      throw ConversionException{};
+      throw std::invalid_argument("stoi() of " + v + " failed");
     return result;
   }
 }
@@ -403,7 +400,7 @@ private:
         lower.setDate(year, 1, 1);
         upper = lower.addYears(1);
       }
-    } catch (ConversionException &) {
+    } catch (std::invalid_argument &) {
       showError(tr("blog-no-post"));
       return;
     }

src/Wt/Auth/AuthModel.C

@@ -230,7 +230,7 @@ User AuthModel::processAuthToken()
 
   if (baseAuth()->authTokensEnabled()) {
     const std::string *token =
-      env.getCookieValue(baseAuth()->authTokenCookieName());
+      env.getCookie(baseAuth()->authTokenCookieName());
 
     if (token) {
       AuthTokenResult result = baseAuth()->processAuthToken(*token, users());

src/Wt/Chart/WCartesianChart.C

@@ -2430,9 +2430,16 @@ bool WCartesianChart::initLayout(const WRectF& rectangle, WPaintDevice *device)
   for (int i = 0; i < 3; ++i)
     location_[i] = AxisValue::Minimum;
 
+  std::unique_ptr<WPaintDevice> created;
+  WPaintDevice *d = device;
+  if (!d) {
+    created = createPaintDevice();
+    d = created.get();
+  }
+
   bool autoLayout = isAutoLayoutEnabled();
-  if (autoLayout && 
-      (!device || (device->features() & PaintDeviceFeatureFlag::FontMetrics).empty())) {
+  if (autoLayout &&
+      ((d->features() & PaintDeviceFeatureFlag::FontMetrics).empty())) {
     LOG_ERROR("setAutoLayout(): device does not have font metrics "
       "(not even server-side font metrics).");
     autoLayout = false;
@@ -2456,13 +2463,6 @@ bool WCartesianChart::initLayout(const WRectF& rectangle, WPaintDevice *device)
       return false;
     }
 
-    std::unique_ptr<WPaintDevice> created;
-    WPaintDevice *d = device;
-    if (!d) {
-      created = createPaintDevice();
-      d = created.get();
-    }
-
     {
       WMeasurePaintDevice md(d);
       WPainter painter(&md);
@@ -2493,6 +2493,8 @@ bool WCartesianChart::initLayout(const WRectF& rectangle, WPaintDevice *device)
     }
   }
 
+  created.reset();
+
   calcChartArea();
 
   bool result = chartArea_.width() > 5 && chartArea_.height() > 5 && prepareAxes();
@@ -2660,7 +2662,10 @@ void WCartesianChart::renderLegendItem(WPainter& painter,
 #else
   painter.setPen(fontPen);
 #endif
-  painter.drawText(pos.x() + 23, pos.y() - 9, 100, 20,
+  int width = (int)legendColumnWidth().toPixels();
+  if (width < 100)
+    width = 100;
+  painter.drawText(pos.x() + 23, pos.y() - 0, width, 20,
 		   AlignmentFlag::Left | AlignmentFlag::Middle,
 		   series.model()->headerData(series.modelColumn()));
 }