Several changes:

 - Fixed bug in WWebWidget: lower addedChildren_ count if an added widget is removed
 - More paranoid request handling (to catch rare ackId error that may be
   caused by a browser's strange behaviour)
 - Fixed conflicting definition of Dbo4Fixture (issue #5482)
 - WDialog: fixed escape event not properly processed on unfocused modal dialogs
 - WFileDropWidget: Added missing WT_API
 - Issue #5436: pass WServer config arguments to subprocess on Windows.
   Patch adapted from one provided by Trigve Siver.
 - Made it possible to configure appRoot() and docRoot() in WTestEnvironment
 - Fix issue #5479:
   - Need to set font description to preferred font before pango_itemize
   - WPdfImage: Fix font size change not being executed
 - enableAjax: rerender WTableView as Ajax-enabled WTableView (issue #5470)
 - fix WCalendar of WDateEdit getting partially hidden in WTableView
 - JSON serializer should serialize NaN and infinity to null
 - Use app.name for a WApplication's JSignals, prevents
   WApplication::setObjectName() from causing not exposed Wt-unload
   problems
 - Fix sorted map of indexes being inconsisten during removal

Author: RockinRoel

examples/widgetgallery/examples/FileDrop.cpp

@@ -26,27 +26,38 @@ dropWidget->drop().connect(std::bind([=] (const std::vector<Wt::WFileDropWidget:
 
 dropWidget->uploaded().connect(std::bind([=] (Wt::WFileDropWidget::File* file) {
   std::vector<Wt::WFileDropWidget::File*> uploads = dropWidget->uploads();
-  std::vector<Wt::WFileDropWidget::File*>::iterator it =
-    std::find(uploads.begin(), uploads.end(), file);
-  std::size_t idx = it - uploads.begin();
+  std::size_t idx = 0;
+  for (; idx != uploads.size(); ++idx)
+    if (uploads[idx] == file)
+      break;
   dropWidget->widget(idx)->removeStyleClass("spinner");
   dropWidget->widget(idx)->addStyleClass("ready");
 }, std::placeholders::_1));
 
+#ifndef WT_TARGET_JAVA
 dropWidget->tooLarge().connect(std::bind([=] (Wt::WFileDropWidget::File *file) {
+#else
+dropWidget->tooLarge().connect(std::bind([=] (Wt::WFileDropWidget::File *file, uint64_t size) {
+#endif
   std::vector<Wt::WFileDropWidget::File*> uploads = dropWidget->uploads();
-  std::vector<Wt::WFileDropWidget::File*>::iterator it =
-    std::find(uploads.begin(), uploads.end(), file);
-  std::size_t idx = it - uploads.begin();
+  std::size_t idx = 0;
+  for (; idx != uploads.size(); ++idx)
+    if (uploads[idx] == file)
+      break;
   dropWidget->widget(idx)->removeStyleClass("spinner");
   dropWidget->widget(idx)->addStyleClass("failed");
+#ifndef WT_TARGET_JAVA
 }, std::placeholders::_1));
+#else
+}, std::placeholders::_1, std::placeholders::_2));
+#endif
 
 dropWidget->uploadFailed().connect(std::bind([=] (Wt::WFileDropWidget::File *file) {
   std::vector<Wt::WFileDropWidget::File*> uploads = dropWidget->uploads();
-  std::vector<Wt::WFileDropWidget::File*>::iterator it =
-    std::find(uploads.begin(), uploads.end(), file);
-  std::size_t idx = it - uploads.begin();
+  std::size_t idx = 0;
+  for (; idx != uploads.size(); ++idx)
+    if (uploads[idx] == file)
+      break;
   dropWidget->widget(idx)->removeStyleClass("spinner");
   dropWidget->widget(idx)->addStyleClass("failed");
 }, std::placeholders::_1));

src/Wt/FontSupport.h

@@ -60,11 +60,12 @@ class FontSupport
   public:
 #ifdef HAVE_PANGO
 
-    FontMatch(PangoFont *font);
+    FontMatch(PangoFont *font, PangoFontDescription *desc);
 
     bool matched() const { return true; }
     std::string fileName() const;
     PangoFont *pangoFont() const { return font_; }
+    PangoFontDescription *pangoFontDescription() const { return desc_; }
 
 #else
 
@@ -84,6 +85,7 @@ class FontSupport
 
 #ifdef HAVE_PANGO
     mutable PangoFont *font_;
+    PangoFontDescription *desc_;
 #else
     std::string file_;
     double quality_;
@@ -170,9 +172,10 @@ class FontSupport
   struct Matched {
     WFont font;
     PangoFont *match;
+    PangoFontDescription *desc;
 
-    Matched() : font(), match(nullptr) { }
-    Matched(const WFont& f, PangoFont *m) : font(f), match(m) { }
+    Matched() : font(), match(nullptr), desc(nullptr) { }
+    Matched(const WFont& f, PangoFont *m, PangoFontDescription *d) : font(f), match(m), desc(d) { }
   };
 
   typedef std::list<Matched> MatchCache;

src/Wt/FontSupportPango.C

@@ -87,8 +87,8 @@ FontSupport::Bitmap::~Bitmap()
   delete[] buffer_;
 }
 
-FontSupport::FontMatch::FontMatch(PangoFont *font)
-  : font_(font)
+FontSupport::FontMatch::FontMatch(PangoFont *font, PangoFontDescription *desc)
+  : font_(font), desc_(desc)
 { }
 
 std::string FontSupport::FontMatch::fileName() const
@@ -196,7 +196,7 @@ FontSupport::FontMatch FontSupport::matchFont(const WFont& f) const
   for (MatchCache::iterator i = cache_.begin(); i != cache_.end(); ++i) {
     if (i->font == f) {
       cache_.splice(cache_.begin(), cache_, i); // implement LRU
-      return FontMatch(i->match);
+      return FontMatch(i->match, i->desc);
     }
   }
 
@@ -208,15 +208,16 @@ FontSupport::FontMatch FontSupport::matchFont(const WFont& f) const
 
   PangoFont *match = pango_font_map_load_font(pangoFontMap, context_, desc);
   pango_context_set_font_description(context_, desc); // for layoutText()
-  pango_font_description_free(desc);
 
-  if (cache_.back().match)
+  if (cache_.back().match) {
     g_object_unref(cache_.back().match);
+    pango_font_description_free(cache_.back().desc);
+  }
 
   cache_.pop_back();
-  cache_.push_front(Matched(f, match));
+  cache_.push_front(Matched(f, match, desc));
 
-  return FontMatch(match);
+  return FontMatch(match, desc);
 }
 
 void FontSupport::addFontCollection(const std::string& directory,
@@ -259,9 +260,10 @@ GList *FontSupport::layoutText(const WFont& font,
 
   enabledFontFormats = enabledFontFormats_;
 
-  matchFont(font);
+  FontMatch match = matchFont(font);
   PangoAttrList *attrs = pango_attr_list_new();
 
+  pango_context_set_font_description(context_, match.pangoFontDescription());
   GList *items
     = pango_itemize(context_, utf8.c_str(), 0, utf8.length(), attrs, nullptr);
 
@@ -345,7 +347,8 @@ void FontSupport::drawText(const WFont& font, const WRectF& rect,
      * is a pitty and possibly wrong if the device does not make the
      * same selection !
      */
-    WString s = WString::fromUTF8(utf8.substr(item->offset, item->length));
+    WString s = WString::fromUTF8(utf8.substr(item->offset,
+                                              item->length));
 
     device_->drawText(WRectF(x, rect.y(),
 			     1000, rect.height()),

src/Wt/Json/Serializer.C

@@ -7,6 +7,7 @@
 #include "EscapeOStream.h"
 #include "WebUtils.h"
 
+#include <limits>
 #include <set>
 #include "boost/lexical_cast.hpp"
 #include "boost/algorithm/string/replace.hpp"
@@ -46,8 +47,13 @@ void serialize(const Value& val, int indentation, EscapeOStream &result)
       double intpart;
       if (fabs(std::modf(val, &intpart)) == 0.0 && fabs(intpart) < 9.22E18)
 	result << (long long)intpart;
-      else 
-	result << Utils::round_js_str(static_cast<double>(val), 16, buf);
+      else {
+        double d = val;
+        if (Utils::isNaN(d) || fabs(d) == std::numeric_limits<double>::infinity())
+          result << ("null");
+        else
+          result << Utils::round_js_str(d, 16, buf);
+      }
       return;
     }
     break;

src/Wt/Test/WTestEnvironment

@@ -250,6 +250,20 @@ public:
    */
   void setInternalPath(const std::string& internalPath);
 
+#ifndef WT_TARGET_JAVA
+  /*! \brief Sets the server's appRoot
+   *
+   * \sa WServer::appRoot()
+   */
+  void setAppRoot(const std::string& appRoot);
+
+  /*! \brief Sets the docRoot
+   *
+   * \sa WApplication::docRoot()
+   */
+  void setDocRoot(const std::string& docRoot);
+#endif // WT_TARGET_JAVA
+
   /*! \brief %Signal used to test a dialog/messagebox reentrant event
    *         loop.
    *

src/Wt/Test/WTestEnvironment.C

@@ -226,6 +226,18 @@ void WTestEnvironment::setInternalPath(const std::string& internalPath)
   WEnvironment::setInternalPath(internalPath);
 }
 
+#ifndef WT_TARGET_JAVA
+void WTestEnvironment::setAppRoot(const std::string &appRoot)
+{
+  server_->setAppRoot(appRoot);
+}
+
+void WTestEnvironment::setDocRoot(const std::string &docRoot)
+{
+  session_->setDocRoot(docRoot);
+}
+#endif // WT_TARGET_JAVA
+
 void WTestEnvironment::setUserAgent(const std::string& userAgent)
 {
   WEnvironment::setUserAgent(userAgent);

src/Wt/WAbstractProxyModel

@@ -250,10 +250,13 @@ protected:
    * model has inserted or removed rows. When removing rows (count < 0),
    * items may possibly be removed and deleted.
    */
-  void shiftModelIndexes(const WModelIndex& sourceParent, int start, int count,
-			 ItemMap& items);
+  void startShiftModelIndexes(const WModelIndex& sourceParent, int start, int count,
+			      ItemMap& items);
+  void endShiftModelIndexes(const WModelIndex& sourceParent, int start, int count,
+			    ItemMap& items);
 
 private:
+  std::vector<BaseItem *> itemsToShift_;
   std::shared_ptr<WAbstractItemModel> sourceModel_;
 };
 

src/Wt/WAbstractProxyModel.C

@@ -92,9 +92,8 @@ WModelIndex WAbstractProxyModel::fromRawIndex(void *rawIndex) const
   return mapFromSource(sourceModel_->fromRawIndex(rawIndex));
 }
 
-WFlags<HeaderFlag> WAbstractProxyModel::headerFlags(int section, 
-						    Orientation orientation)
-  const
+WFlags<HeaderFlag> WAbstractProxyModel::headerFlags(int section,
+						    Orientation orientation) const
 {
   if (orientation == Wt::Orientation::Horizontal) {
     section = mapToSource(index(0, section, Wt::WModelIndex())).column();
@@ -121,26 +120,21 @@ WModelIndex WAbstractProxyModel::createSourceIndex(int row, int column,
   return sourceModel_->createIndex(row, column, ptr);
 }
 
-void WAbstractProxyModel::shiftModelIndexes(const WModelIndex& sourceParent,
-					    int start, int count,
-					    ItemMap& items)
+void WAbstractProxyModel::startShiftModelIndexes(const WModelIndex& sourceParent,
+						 int start, int count,
+						 ItemMap& items)
 {
   /*
    * We must shift all indexes within sourceParent >= start with count
    * and delete items when count < 0.
-   *
-   * If count > 0 : rows inserted, after insertion
-   * If count < 0 : rows to be removed, before removal
    */
-  std::vector<BaseItem *> shifted;
   std::vector<BaseItem *> erased;
 
   WModelIndex startIndex;
   if (sourceModel()->rowCount(sourceParent) == 0)
     startIndex = sourceParent;
   else if (start >= sourceModel()->rowCount(sourceParent))
-    startIndex = sourceModel()->index(sourceModel()->rowCount(sourceParent)-1,0,
-				     sourceParent);
+    return;
   else
     startIndex = sourceModel()->index(start, 0, sourceParent);
 
@@ -156,22 +150,27 @@ void WAbstractProxyModel::shiftModelIndexes(const WModelIndex& sourceParent,
     ++n;
 #endif
     WModelIndex i = it->first;
-    if (i == sourceParent)
+    if (i == sourceParent) {
+#ifndef WT_TARGET_JAVA
+      it = n;
+#endif      
       continue;
+    }
 
     if (i.isValid()) {
       WModelIndex p = i.parent();
       if (p != sourceParent && !WModelIndex::isAncestor(p, sourceParent))
 	break;
 
-      if (p == sourceParent) {
+      if (p == sourceParent) { /* Child of source parent: shift or remove */
 	if (count < 0 &&
 	    i.row() >= start &&
 	    i.row() < start + (-count))
 	  erased.push_back(it->second);
-	else
-	  shifted.push_back(it->second);
-      } else if (count < 0) {
+	else {
+	  itemsToShift_.push_back(it->second);
+	}
+      } else if (count < 0) { /* Other descendent: remove if necessary */
 	// delete indexes that are about to be deleted, if they are within
 	// the range of deleted indexes
 	do {
@@ -191,32 +190,35 @@ void WAbstractProxyModel::shiftModelIndexes(const WModelIndex& sourceParent,
 #endif
   }
 
+  for (unsigned i = 0; i < itemsToShift_.size(); ++i) {
+    BaseItem *item = itemsToShift_[i];
+    items.erase(item->sourceIndex_);
+    item->sourceIndex_ = sourceModel()->index
+      (item->sourceIndex_.row() + count,
+       item->sourceIndex_.column(),
+       sourceParent);
+  }
+
   for (unsigned i = 0; i < erased.size(); ++i) {
     items.erase(erased[i]->sourceIndex_);
     delete erased[i];
   }
 
-  for (unsigned i = 0; i < shifted.size(); ++i) {
-    BaseItem *item = shifted[i];
-    items.erase(item->sourceIndex_);
-
-    if (item->sourceIndex_.row() + count >= start) {
-      item->sourceIndex_ = sourceModel()->index
-	(item->sourceIndex_.row() + count,
-	 item->sourceIndex_.column(),
-	 sourceParent);
-    } else {
-      delete item;
-      shifted[i] = nullptr;
-    }
-  }
+  if (count > 0)
+    endShiftModelIndexes(sourceParent, start, count, items);
+}
+ 
+void WAbstractProxyModel::endShiftModelIndexes(const WModelIndex& sourceParent,
+					       int start, int count,
+					       ItemMap& items)
+{
+  for (unsigned i = 0; i < itemsToShift_.size(); ++i)
+    items[itemsToShift_[i]->sourceIndex_] = itemsToShift_[i];
 
-  for (unsigned i = 0; i < shifted.size(); ++i) {
-    if (shifted[i])
-      items[shifted[i]->sourceIndex_] = shifted[i];
-  }
+  itemsToShift_.clear();
 }
 
+
 #endif // DOXYGEN_ONLY
 
 }

src/Wt/WApplication.C

@@ -773,7 +773,7 @@ WApplication::decodeExposedSignal(const std::string& signalName) const
 std::string WApplication::encodeSignal(const std::string& objectId,
 				       const std::string& name) const
 {
-  return (objectId == "app" ? id() : objectId) + '.' + name;
+  return objectId + '.' + name;
 }
 
 std::string WApplication::resourceMapKey(WResource *resource)