Skip to content

Commit d7813dd

Browse files
committed
Several changes:
- Merges from master: - add documentation and improved implementation for issue #5308 - fix WWebwidget::setId related issues #5684 - Wt 4 specific: - Adding h to to include file in doxygen
1 parent c79f64d commit d7813dd

File tree

255 files changed

+378
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+378
-357
lines changed

doc/main

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -558,10 +558,30 @@ appRoot=C:\Program Files\MyApplications\AppRoot
558558

559559
<dd>Every session is mapped a dedicated process, allowing maximal
560560
session isolation, but at an increased session cost. This is
561-
not supported by the ISAPI connector. Note: when using the
562-
<tt>wthttp</tt> adapter, this will create a listening socket
563-
on the loopback interface (<tt>127.0.0.1</tt>) for every session,
564-
with the parent process acting as a proxy.</dd>
561+
not supported by the ISAPI connector. Note: when using the
562+
<tt>wthttp</tt> adapter, this will create a listening socket
563+
on the loopback interface (<tt>127.0.0.1</tt>) for every session,
564+
with the parent process acting as a proxy. The following options
565+
can be put in the <b>&lt;dedicated-process&gt;</b> subsection.
566+
<dl>
567+
568+
<dt><strong>max-num-sessions</strong></dt>
569+
<dd>
570+
Limits the amount of session processes.
571+
</dd>
572+
573+
<dt><strong>num-session-threads</strong></dt>
574+
<dd>
575+
Usually the dedicated session processes uses the same amount
576+
of threads as the parent process. This option changes the
577+
amount of threads the session processes use independently of
578+
the parent process. When this option is set the
579+
<strong>num-threads</strong> configuration option and the <strong>-t</strong>
580+
command line argument will only affect the parent process.
581+
</dd>
582+
583+
</dl>
584+
</dd>
565585

566586
<dt><strong>shared-process</strong></dt>
567587

@@ -639,6 +659,12 @@ appRoot=C:\Program Files\MyApplications\AppRoot
639659
request will result in a WApplication::requestTooLarge() signal.
640660
</dd>
641661

662+
<dt><strong>num-threads</strong></dt>
663+
664+
<dd>Sets the number of threads to be used to handle %Wt traffic.
665+
Depending on your application, you may want to increase the
666+
default size of 10 threads. </dd>
667+
642668
<dt><strong>session-id-length</strong></dt>
643669

644670
<dd>The length (in number of characters) for the unique session ID.</dd>
@@ -918,14 +944,6 @@ Settings may be set in the configuration file /etc/wt/wthttpd
918944
are specified inside a <b>&lt;connector-isapi&gt;</b> subsection.
919945

920946
<dl>
921-
<dt><strong>num-threads</strong></dt>
922-
923-
<dd>Sets the number of threads to be used to handle %Wt traffic. The
924-
connector will never use IIS threads to do any processing, but will
925-
forward the requests to a thread pool of the size given in this variable.
926-
Depending on your application, you may want to increase the default size
927-
of 10 threads.</dd>
928-
929947
<dt><strong>max-memory-request-size</strong></dt>
930948

931949
<dd>Every HTTP request whose size is smaller than this parameter will

src/Wt/Auth/AbstractPasswordService

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ enum class PasswordResult {
3030
PasswordValid //!< The password is valid
3131
};
3232

33-
/*! \class AbstractPasswordService Wt/Auth/AbstractPasswordService
33+
/*! \class AbstractPasswordService Wt/Auth/AbstractPasswordService.h
3434
* \brief Abstract password authentication service
3535
*
3636
* This abstract class defines the interface for password authentication.

src/Wt/Auth/AbstractUserDatabase

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Wt {
2121
class IssuedToken;
2222
class OAuthClient;
2323

24-
/*! \class AbstractUserDatabase Wt/Auth/AbstractUserDatabase
24+
/*! \class AbstractUserDatabase Wt/Auth/AbstractUserDatabase.h
2525
* \brief Abstract interface for an authentication user database
2626
*
2727
* This class defines the interface for managing user data related to

src/Wt/Auth/AuthModel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AbstractUserDatabase;
2020
class Login;
2121
class OAuthService;
2222

23-
/*! \class AuthModel Wt/Auth/AuthModel
23+
/*! \class AuthModel Wt/Auth/AuthModel.h
2424
* \brief Model for implementing an authentication view.
2525
*
2626
* This model implements the logic for authenticating a user (the

src/Wt/Auth/AuthService

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ enum class AuthTokenState {
109109
Valid //!< The presented auth token was invalid
110110
};
111111

112-
/*! \class EmailTokenResult Wt/Auth/AuthService Wt/Auth/AuthService
112+
/*! \class EmailTokenResult Wt/Auth/AuthService.h Wt/Auth/AuthService.h
113113
* \brief The result of processing an email-sent token.
114114
*
115115
* An email token can be used for two purposes:
@@ -154,7 +154,7 @@ private:
154154
User user_;
155155
};
156156

157-
/*! \class AuthTokenResult Wt/Auth/AuthService Wt/Auth/AuthService
157+
/*! \class AuthTokenResult Wt/Auth/AuthService.h Wt/Auth/AuthService.h
158158
* \brief The result of processing an authentication token.
159159
*
160160
* An authentication token is usually taken from a browser cookie, and
@@ -214,7 +214,7 @@ private:
214214
int newTokenValidity_;
215215
};
216216

217-
/*! \class AuthService Wt/Auth/AuthService Wt/Auth/AuthService
217+
/*! \class AuthService Wt/Auth/AuthService.h Wt/Auth/AuthService.h
218218
* \brief Basic authentication service
219219
*
220220
* This class presents an basic authentication service, which offers

src/Wt/Auth/AuthWidget

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AuthModel;
2222
class Login;
2323
class User;
2424

25-
/*! \class AuthWidget Wt/Auth/AuthWidget
25+
/*! \class AuthWidget Wt/Auth/AuthWidget.h
2626
* \brief An authentication widget.
2727
*
2828
* The authentication widget is a widget that provides a login or

src/Wt/Auth/Dbo/AuthInfo

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Wt {
2424
template <class AuthInfoType> class AuthToken;
2525
template <class AuthIdentityType> class AuthIdentity;
2626

27-
/*! \class AuthInfo Wt/Auth/Dbo/AuthInfo
27+
/*! \class AuthInfo Wt/Auth/Dbo/AuthInfo.h
2828
* \brief A default implementation for authentication data in %Wt::%Dbo
2929
*
3030
* This class implements the requirements for use as a data type in
@@ -286,7 +286,7 @@ private:
286286
AuthIdentities authIdentities_;
287287
};
288288

289-
/*! \class AuthToken Wt/Auth/Dbo/AuthInfo
289+
/*! \class AuthToken Wt/Auth/Dbo/AuthInfo.h
290290
* \brief A default implementation for an authentication token in %Wt::%Dbo
291291
*
292292
* This class is used by AuthInfo, and stores authentication tokens.
@@ -340,7 +340,7 @@ private:
340340
Wt::WDateTime expires_;
341341
};
342342

343-
/*! \class AuthIdentity Wt/Auth/Dbo/AuthInfo
343+
/*! \class AuthIdentity Wt/Auth/Dbo/AuthInfo.h
344344
* \brief A default implementation for a authentication identity in %Wt::%Dbo
345345
*
346346
* This class is used by AuthInfo, and stores identities.

src/Wt/Auth/Dbo/UserDatabase

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Wt {
1616
namespace Auth {
1717
namespace Dbo {
1818

19-
/*! \class UserDatabase Wt/Auth/Dbo/UserDatabase
19+
/*! \class UserDatabase Wt/Auth/Dbo/UserDatabase.h
2020
* \brief A default implementation for an authentication user database.
2121
*
2222
* This is a template class, and needs as parameter the Dbo type which

src/Wt/Auth/FormBaseModel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AbstractPasswordService;
1717
class AbstractUserDatabase;
1818
class OAuthService;
1919

20-
/*! \class FormBaseModel Wt/Auth/FormBaseModel
20+
/*! \class FormBaseModel Wt/Auth/FormBaseModel.h
2121
* \brief A base model class for authentication-related forms
2222
*
2323
* This class manages the the auth services and the user database which

src/Wt/Auth/HashFunction

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Wt {
1414
namespace Auth {
1515

16-
/*! \class HashFunction Wt/Auth/HashFunction
16+
/*! \class HashFunction Wt/Auth/HashFunction.h
1717
* \brief An abstract cryptographic hash function interface.
1818
*
1919
* A cryptographic hash function computes a hash value from a message,
@@ -70,7 +70,7 @@ public:
7070
const std::string& hash) const;
7171
};
7272

73-
/*! \class MD5HashFunction Wt/Auth/HashFunction
73+
/*! \class MD5HashFunction Wt/Auth/HashFunction.h
7474
* \brief A cryptograhpic hash function implemented using MD5.
7575
*
7676
* This hash function is useful for creating token hashes, but
@@ -92,7 +92,7 @@ public:
9292
};
9393

9494
#ifndef WT_TARGET_JAVA
95-
/*! \class SHA1HashFunction Wt/Auth/HashFunction
95+
/*! \class SHA1HashFunction Wt/Auth/HashFunction.h
9696
* \brief A cryptographic hash function implemented using SHA1.
9797
*
9898
* This hash function is only available if %Wt was compiled with
@@ -117,7 +117,7 @@ public:
117117
};
118118
#endif
119119

120-
/*! \class BCryptHashFunction Wt/Auth/HashFunction
120+
/*! \class BCryptHashFunction Wt/Auth/HashFunction.h
121121
* \brief An cryptographic hash function that implements bcrypt.
122122
*
123123
* This hashing function is intended for password hashes. In addition

0 commit comments

Comments
 (0)