Several changes:

   - SessionProcess: close all file descriptors after fork()
   - ProxyReply: properly close sockets as soon as possible
   - Wt::Dbo: force loading of a ptr when reading its version
   - fix #4580 WTableView/WAbstractItemView keyWentDown() signal not firing
   - fix layout mgr + animation interference
   - trying to fix heuristic for config files (#4560)
   - Wt::Dbo: added QueryModel::indexOf()

Author: Koen Deforche

CMakeLists.txt

@@ -227,11 +227,19 @@ IF(WIN32)
 
 ELSE(WIN32)
 
-  SET(RUNDIR "${CMAKE_INSTALL_PREFIX}/var/run/wt" CACHE PATH
-    "Default path for wt session management (only used by FCGI connector; not relative to CMAKE_INSTALL_PREFIX)")
+  IF("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
+    SET(CONFIG_PREFIX "")
+  ELSEIF("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr/local")
+    SET(CONFIG_PREFIX "")
+  ELSE()
+    SET(CONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+  ENDIF()
+
+  SET(RUNDIR "${CONFIG_PREFIX}/var/run/wt" CACHE PATH
+    "Default path for wt session management (only used by FCGI connector)")
 
-  IF( NOT DEFINED CONFIGDIR )
-    SET(CONFIGDIR "${CMAKE_INSTALL_PREFIX}/etc/wt" CACHE STRING "Path for the configuration files")
+  IF(NOT DEFINED CONFIGDIR)
+    SET(CONFIGDIR "${CONFIG_PREFIX}/etc/wt" CACHE STRING "Path for the configuration files")
   ENDIF( NOT DEFINED CONFIGDIR )
 
   # If the user specifies the standard CMAKE_PREFIX_PATH to find packages,
@@ -292,6 +300,7 @@ SET(SKIA_PREFIX ${USERLIB_PREFIX} CACHE PATH
   "Prefix of skia library (overrides USERLIB_PREFIX)")
 
 OPTION(DEBUG "Support for debugging, must be enabled also in wt_config.xml" OFF)
+
 IF(CYGWIN)
   OPTION(BUILD_TESTS "Build Wt tests" OFF)
 ELSE(CYGWIN)

examples/wt-homepage/Home.C

@@ -355,12 +355,18 @@ void Home::readReleases(WTable *releaseTable)
 
       std::string fileName = *i;
       std::string description = *(++i);
-      releaseTable->elementAt(row, 0)->addWidget
-	(new WText(href("http://prdownloads.sourceforge.net/witty/" 
-			+ fileName + "?download", description)));
       releaseTable->elementAt(row, 1)->addWidget(new WText(*(++i)));
       releaseTable->elementAt(row, 2)->addWidget(new WText(*(++i)));
 
+      ++i;
+      std::string url = "http://prdownloads.sourceforge.net/witty/" 
+	+ fileName + "?download";
+      if (i != tok.end())
+	url = *i;
+	
+      releaseTable->elementAt(row, 0)->addWidget
+	(new WText(href(url, description)));
+
       ++row;
     }
   }

src/Wt/Dbo/QueryModel

@@ -195,6 +195,12 @@ public:
    */
   virtual Result& resultRow(int row);
 
+  /*! \brief Returns the index of row.
+   *
+   * If the row isn't contained in the model, returns -1.
+   */
+  int indexOf(const Result& row) const;
+
   /*! \brief Rereads the data from the database.
    *
    * This invalidates the current (cached) data and informs views that

src/Wt/Dbo/QueryModel_impl.h

@@ -255,6 +255,17 @@ Result& QueryModel<Result>::resultRow(int row)
   return cache_[row - cacheStart_];
 }
 
+template <class Result>
+int QueryModel<Result>::indexOf(const Result& result) const
+{
+  for (int i = 0; i < rowCount(); ++i) {
+    if (resultRow(i) == result)
+      return i;
+  }
+
+  return -1;
+}
+
 template <class Result>
 void QueryModel<Result>::cacheRow(int row) const
 {

src/Wt/Dbo/ptr

@@ -99,7 +99,7 @@ public:
   virtual void setAutogeneratedId(long long id) = 0;
 
   void setVersion(int version) { version_ = version; }
-  int version() const { return version_; }
+  virtual int version() const = 0;
   bool isTransient() const { return isNew() || isDeleted(); }
 
   void setSession(Session *session) { session_ = session; }
@@ -137,9 +137,9 @@ public:
 
 private:
   Session *session_;
-  int version_;
 
 protected:
+  int version_;
   int state_;
   int refCount_;
 
@@ -367,6 +367,8 @@ public:
   void setId(const IdType& id) { id_ = id; }
   IdType id() const { return id_; }
 
+  int version() const;
+
 private:
   C     *obj_;
   IdType id_;

src/Wt/Dbo/ptr_impl.h

@@ -216,6 +216,14 @@ C *MetaDbo<C>::obj()
   return obj_;
 }
 
+template <class C>
+int MetaDbo<C>::version() const
+{
+  const_cast<MetaDbo<C> *>(this)->obj(); // Load the object
+
+  return version_;
+}
+
 template <class C>
 MetaDbo<C>::MetaDbo(C *obj)
   : MetaDboBase(-1, New | NeedsSave, 0),

src/Wt/WRandom.C

@@ -45,6 +45,10 @@
 #include <boost/thread.hpp>
 #endif
 
+#ifndef USE_NDT_RANDOM_DEVICE
+#include <stdlib.h>
+#endif
+
 namespace {
   class RandomDevice
   {

src/Wt/WSvgImage.C

@@ -504,7 +504,7 @@ void WSvgImage::drawImage(const WRectF& rect, const std::string& imgUri,
   makeNewGroup();
 
   WApplication *app = WApplication::instance();
-  std::string imageUri;
+  std::string imageUri = imgUri;
   if (app)
     imageUri = app->resolveRelativeUrl(imgUri);
 

src/Wt/WTableView.C

@@ -763,6 +763,9 @@ void WTableView::defineJavaScript()
     /* Two-lines needed for WT_PORT */
     EventSignalBase& ccScrolled = contentsContainer_->scrolled();
     connectObjJS(ccScrolled, "onContentsContainerScroll");
+
+    EventSignalBase& cKeyDown = canvas_->keyWentDown();
+    connectObjJS(cKeyDown, "onkeydown");
   }
 }
 

src/http/ProxyReply.C

@@ -43,30 +43,29 @@ ProxyReply::ProxyReply(Request& request,
 
 ProxyReply::~ProxyReply()
 {
-  if (sessionProcess_ && sessionProcess_->sessionId().empty()) {
+  if (sessionProcess_ && sessionProcess_->sessionId().empty())
     sessionProcess_->stop();
-  }
-  
-  boost::system::error_code ignored_ec;
-  if(socket_.get()) {
-	socket_->shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
-	socket_->close();
-  }
 
+  closeClientSocket();
+}
+
+void ProxyReply::closeClientSocket()
+{
+  if (socket_.get()) {
+    boost::system::error_code ignored_ec;
+    socket_->shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
+    socket_->close();
+    socket_.reset();
+  }
 }
 
 void ProxyReply::reset(const Wt::EntryPoint *ep)
 {
-  if (sessionProcess_ && sessionProcess_->sessionId().empty()) {
+  if (sessionProcess_ && sessionProcess_->sessionId().empty())
     sessionProcess_->stop();
-  }
   sessionProcess_.reset();
-  boost::system::error_code ignored_ec;
-  if(socket_.get()) {
-	socket_->shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
-	socket_->close();
-  }
-  socket_.reset();
+
+  closeClientSocket();
   contentType_.clear();
   requestBuf_.consume(requestBuf_.size());
   responseBuf_.consume(responseBuf_.size());
@@ -118,8 +117,10 @@ bool ProxyReply::consumeData(Buffer::const_iterator begin,
 
   if (sessionProcess_) {
     // Connection with child already established, send request data
-    asio::async_write(*socket_, asio::buffer(beginRequestBuf_, endRequestBuf_ - beginRequestBuf_),
-	  boost::bind(&ProxyReply::handleDataWritten,
+    asio::async_write
+      (*socket_,
+       asio::buffer(beginRequestBuf_, endRequestBuf_ - beginRequestBuf_),
+       boost::bind(&ProxyReply::handleDataWritten,
 	    boost::dynamic_pointer_cast<ProxyReply>(shared_from_this()),
 	    asio::placeholders::error,
 	    asio::placeholders::bytes_transferred));
@@ -150,7 +151,8 @@ bool ProxyReply::consumeData(Buffer::const_iterator begin,
     }
   }
 
-  // Don't immediately consume more data, but do this when it has been sent to child
+  // Don't immediately consume more data, but do this when it has
+  // been sent to child
   return false;
 }
 
@@ -405,6 +407,8 @@ void ProxyReply::handleResponseRead(const boost::system::error_code &ec)
 	     || ec == boost::asio::error::shut_down
 	     || ec == boost::asio::error::operation_aborted
 	     || ec == boost::asio::error::connection_reset) {
+    closeClientSocket();
+
     more_ = false;
 
     if (request_.type != Request::TCP) {
@@ -465,6 +469,8 @@ bool ProxyReply::nextContentBuffers(std::vector<asio::const_buffer>& result)
 
 void ProxyReply::error(status_type status)
 {
+  closeClientSocket();
+
   if (request_.type == Request::HTTP) {
     setStatus(status);
     setCloseConnection();
@@ -490,6 +496,8 @@ bool ProxyReply::sendReload()
       "if (window.Wt) window.Wt._p_.quit(null); window.location.reload(true);";
     send();
 
+    closeClientSocket();
+
     return true;
   }