diff options
| author | Scott Ostler <sostler@deathmachine.local> | 2010-02-24 08:05:07 -0500 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.local> | 2010-02-24 08:05:07 -0500 |
| commit | 49ef1a688025d9183452fe5f1dccf7802d64dc62 (patch) | |
| tree | e69c1b2a23c02ea639e47570220cbbfee489041e /src/cookie_login.clj | |
| parent | 10e5c6b24b63e5a83922058d47380577808b8d3e (diff) | |
| parent | 8003ba27e49a630b24090f3af01426f35e85af67 (diff) | |
Resolved cookie_login conflict
Diffstat (limited to 'src/cookie_login.clj')
| -rwxr-xr-x | src/cookie_login.clj | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/cookie_login.clj b/src/cookie_login.clj index e507876..8c948a6 100755 --- a/src/cookie_login.clj +++ b/src/cookie_login.clj @@ -38,7 +38,7 @@ "Middleware to support automatic cookie login. Must be placed after the with-session middleware. -Must be given three arguments: + Must be given three arguments: - process-login-token? Function to apply to request map to determine whether to process login token or not. If a false value is returned, @@ -56,8 +56,7 @@ Must be given three arguments: - *login-token-expiry* The number of milliseconds a login token is valid for. - Defaults to one week. -" + Defaults to one week." [handler process-login-token? token-maker token-reader] (let [login-token-key *login-token-key* login-token-expiry *login-token-expiry*] |