Skip to content

Commit 3612958

Browse files
author
Koen Deforche
committed
improved documentation
1 parent 412cae7 commit 3612958

File tree

7 files changed

+165
-90
lines changed

7 files changed

+165
-90
lines changed

doc/main

Lines changed: 133 additions & 77 deletions
Large diffs are not rendered by default.

src/Wt/WException

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
namespace Wt {
1414

15-
/*! \class WException Wt/Exception
15+
/*! \class WException Wt/WException
1616
* \brief Base class for exceptions thrown by %Wt.
1717
*/
1818
class WT_API WException : public std::exception

src/Wt/WLogger

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,22 @@ private:
325325
friend class WLogger;
326326
};
327327

328+
#ifdef DOXYGEN_ONLY
329+
/*! \file */
330+
/*! \brief Logging function
331+
*
332+
* This creates a new log entry, e.g.:
333+
*
334+
* \code
335+
* Wt::log("info") << "Doing something interesting now with " << appleCount() << " apples.";
336+
* \endcode
337+
*
338+
* \relates WLogger
339+
*/
340+
extern WLogEntry log(const std::string& type);
341+
#else
328342
WT_API extern WLogEntry log(const std::string& type);
343+
#endif
329344

330345
}
331346

src/fcgi/WServer.C

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include <iostream>
1111
#include <string>
12+
#include <signal.h>
1213

1314
#include "Configuration.h"
1415
#include "FCGIStream.h"

src/web/WebRenderer.C

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,6 +1139,7 @@ void WebRenderer::serveMainAjax(WebResponse& response)
11391139

11401140
void WebRenderer::setJSSynced(bool invisibleToo)
11411141
{
1142+
LOG_DEBUG("setJSSynced: " << invisibleToo);
11421143
collectedJS1_.str("");
11431144
collectedJS2_.str("");
11441145

src/web/WebSession.C

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,8 +1567,10 @@ std::string WebSession::ajaxCanonicalUrl(const WebResponse& request) const
15671567

15681568
void WebSession::pushUpdates()
15691569
{
1570-
if (!renderer_.isDirty() || state_ == Dead)
1570+
if (!renderer_.isDirty() || state_ == Dead) {
1571+
LOG_DEBUG("pushUpdates(): nothing to do");
15711572
return;
1573+
}
15721574

15731575
updatesPending_ = true;
15741576

@@ -1868,7 +1870,8 @@ void WebSession::notify(const WEvent& event)
18681870
*/
18691871
const std::string *ackIdE = request.getParameter("ackId");
18701872
bool invalidAckId = env_->ajax() && !request.isWebSocketMessage();
1871-
if (ackIdE) {
1873+
1874+
if (invalidAckId && ackIdE) {
18721875
try {
18731876
if (renderer_.ackUpdate(boost::lexical_cast<unsigned>(*ackIdE)))
18741877
invalidAckId = false;

wt_config.xml.in

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337

338338
<!-- Enables web socket.
339339

340-
By default AJAX and long polling are used to communicate
340+
By default Ajax and long polling are used to communicate
341341
between server and browser.
342342

343343
By enabling web socket support, if the browser supports
@@ -351,9 +351,8 @@
351351
for this protocol.
352352

353353
This feature is still experimental: the Web Sockets RFC is
354-
still a draft with ongoing changes to the framing protocol,
355-
and the current implementation is based on
356-
http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00
354+
still a draft. Wt implements up to version 17 of the draft
355+
(latest as of November 2011).
357356
-->
358357
<web-sockets>false</web-sockets>
359358

@@ -400,21 +399,21 @@
400399
<!-- Ajax user agent list
401400

402401
Wt considers three types of sessions:
403-
- AJAX sessions: use AJAX and JavaScript
402+
- Ajax sessions: use Ajax and JavaScript
404403
- plain HTML sessions: use plain old server GETs and POSTs
405404
- bots: have clean internal paths and no persistent sessions
406405

407406
By default, Wt does a browser detection to distinguish between
408407
the first two: if a browser supports JavaScript (and has it
409-
enabled), and has an AJAX DOM API, then AJAX sessions are chosen,
408+
enabled), and has an Ajax DOM API, then Ajax sessions are chosen,
410409
otherwise plain HTML sessions.
411410

412411
Here, you may indicate which user agents should or should
413-
not receive an AJAX session regardless of what they report as
412+
not receive an Ajax session regardless of what they report as
414413
capabilities.
415414

416415
Possible values for 'mode' or "white-list" or "black-list". A
417-
white-list will only treat the listed agents as supporting AJAX,
416+
white-list will only treat the listed agents as supporting Ajax,
418417
all other agents will be served plain HTML sessions. A black-list
419418
will always server plain HTML sessions to listed agents and
420419
otherwise rely on browser capability detection.
@@ -444,11 +443,11 @@
444443

445444
<!-- Whether the progressive bootstrap is used.
446445

447-
The default bootstrap method first senses whether there is AJAX
446+
The default bootstrap method first senses whether there is Ajax
448447
support, and only then creates the application.
449448

450449
The progressive bootstrap method first renders a plain HTML
451-
version and later upgrades to an AJAX version.
450+
version and later upgrades to an Ajax version.
452451
-->
453452
<progressive-bootstrap>false</progressive-bootstrap>
454453

0 commit comments

Comments
 (0)