see Changelog

Author: Koen Deforche

Changelog

@@ -1,3 +1,7 @@
+08-11-2010:
+	* WebSession: landed Web Sockets support, must be enabled in the
+	configuration file
+
 05-11-2010:
 	* Wt.js: fix opera script loading indicating failure when loading from
 	cache

src/CMakeLists.txt

@@ -215,6 +215,7 @@ web/XSSUtils.C
 web/WebRequest.C
 web/WebStream.C
 web/WebSession.C
+web/WebSocketMessage.C
 web/WebRenderer.C
 web/WebController.C
 web/WtException.C

src/Wt/Dbo/Session_impl.h

@@ -43,6 +43,9 @@ void Session::mapClass(const char *tableName)
   if (schemaInitialized_)
     throw std::logic_error("Cannot map tables after schema was initialized.");
 
+  if (classRegistry_.find(&typeid(C)) != classRegistry_.end())
+    return;
+
   Mapping<C> *mapping = new Mapping<C>();
   mapping->tableName = tableName;
 

src/Wt/Http/ResponseContinuation

@@ -67,7 +67,6 @@ private:
 
   void         stop();
   WebResponse *response() { return response_; }
-  static void  callBack(void *callbackData);
 
   friend class Wt::WResource;
   friend class Wt::WebSession;

src/Wt/Http/ResponseContinuation.C

@@ -21,21 +21,12 @@ void ResponseContinuation::setData(const boost::any& data)
 
 void ResponseContinuation::doContinue()
 {
-  resource_->doContinue(this);
-}
-
-void ResponseContinuation::callBack(void *callbackData)
-{
-  ResponseContinuation *continuation
-    = static_cast<ResponseContinuation *>(callbackData);
-
   // We are certain that the continuation is still "alive" because it is
   // protected by a mutex, and thus a simultaneous change with
   // WebResponse::flush() is not possible: ResponseContinuation::stop(),
   // called before destruction together with the resource, will thus
   // block while we are here.
-
-  continuation->doContinue();
+  resource_->doContinue(this);
 }
 
 ResponseContinuation::ResponseContinuation(WResource *resource,

src/Wt/WContainerWidget.C

@@ -702,8 +702,8 @@ void WContainerWidget::createDomChildren(DomElement& parent, WApplication *app)
 
     /*
      * Take the hint: if the container is relative, then we can use an absolute
-     * layout for its contents, under the assumption that also the width
-     * is handled using JavaScript (like in WTreeView, WTableView)
+     * layout for its contents, under the assumption that a .wtResize or
+     * auto-javascript sets the width too (like in WTreeView, WTableView)
      */
     if (positionScheme() == Relative || positionScheme() == Absolute) {
       c->setProperty(PropertyStylePosition, "absolute");

src/Wt/WDllDefs.h

@@ -63,6 +63,8 @@
 #ifdef _MSC_VER
 typedef __int64 int64_t;            /* 64 bit signed */
 typedef unsigned __int64 uint64_t;  /* 64 bit unsigned */
+typedef __int32 int32_t;            /* 64 bit signed */
+typedef unsigned __int32 uint32_t;  /* 32 bit unsigned */
 #else // _MSC_VER
 #include <stdint.h>
 #endif // _MSC_VER

src/Wt/WResource.C

@@ -126,9 +126,9 @@ void WResource::handle(WebRequest *webRequest, WebResponse *webResponse,
     }
     webResponse->flush(WebResponse::ResponseDone);
   } else
-    webResponse->flush(WebResponse::ResponseCallBack,
-		       Http::ResponseContinuation::callBack,
-		       response.continuation_);
+    webResponse->flush(WebResponse::ResponseFlush,
+		       boost::bind(&Http::ResponseContinuation::doContinue,
+				   response.continuation_));
 }
 
 void WResource::suggestFileName(const std::string& name)

src/Wt/WScrollArea.C

@@ -89,7 +89,6 @@ void WScrollArea::updateDom(DomElement& element, bool all)
 {
   if (all)
     if (isInLayout() && WApplication::instance()->environment().ajax()) {
-      setPositionScheme(Absolute);
       setJavaScriptMember("wtResize",
 			  "function(s, w, h) {"
 			  "s.style.width=w+'px';"

src/fcgi/FCGIStream.C

@@ -51,15 +51,13 @@ namespace {
       delete request_;
     }
 
-    virtual void flush(ResponseState state,
-		       CallbackFunction callback,
-		       void *callbackData) {
+    virtual void flush(ResponseState state, CallbackFunction callback) {
       out_->flush();
 
-      if (state == ResponseCallBack) {
-        setAsyncCallback(boost::bind(callback, callbackData));
+      if (state == ResponseFlush) {
+        setAsyncCallback(callback);
       } else {
-        setAsyncCallback(boost::function<void(void)>());
+        setAsyncCallback(0);
       }
       emulateAsync(state);
     }